Source /tmp/session_bus_address.user before invoking dbus-send in postinst script

[harmattan/cameraplus] / src / mountprotector.cpp

diff --git a/src/mountprotector.cpp b/src/mountprotector.cpp
index 05ce4ba..c9c8402 100644 (file)
--- a/src/mountprotector.cpp
+++ b/src/mountprotector.cpp
@@ -1,7 +1,7 @@
 /*!
  * This file is part of CameraPlus.
  *
- * Copyright (C) 2012 Mohammed Sameer <msameer@foolab.org>
+ * Copyright (C) 2012-2013 Mohammed Sameer <msameer@foolab.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,53 +21,57 @@
 #include "mountprotector.h"
 #include <QDir>
 #include <QTemporaryFile>
+#if defined(QT4)
 #include <QDeclarativeInfo>
+#elif defined(QT5)
+#include <QQmlInfo>
+#endif
 
 MountProtector::MountProtector(QObject *parent) :
-  QObject(parent), m_file(0) {
+  QObject(parent) {
 
 }
 
 MountProtector::~MountProtector() {
-  unlock();
+  unlockAll();
 }
 
-QString MountProtector::path() const {
-  return m_path;
-}
-
-void MountProtector::setPath(const QString& path) {
-  if (m_path != path) {
-    m_path = path;
-    emit pathChanged();
+bool MountProtector::lock(const QString& path) {
+  if (path.isEmpty()) {
+    qmlInfo(this) << "Cannot lock an empty path";
+    return false;
   }
-}
 
-bool MountProtector::lock() {
-  if (m_file) {
-    return true;
-  }
+  QString p = QString("%1%2.cameraplus_tmp_XXXXXX").arg(path).arg(QDir::separator());
+  QTemporaryFile *file = new QTemporaryFile(p);
+  file->setAutoRemove(true);
 
-  if (m_path.isEmpty()) {
+  if (!file->open()) {
+    qmlInfo(this) << "Failed to lock" << file->errorString();
+    delete file;
+    file = 0;
     return false;
   }
 
-  QString path = QString("%1%2.cameraplus_tmp_XXXXXX").arg(m_path).arg(QDir::separator());
-  m_file = new QTemporaryFile(path);
-  m_file->setAutoRemove(true);
-  if (!m_file->open()) {
-    qmlInfo(this) << "Failed to lock" << m_file->errorString();
-    delete m_file;
-    m_file = 0;
-    return false;
+  if (!QFile::remove(file->fileName())) {
+    qmlInfo(this) << "Failed to remove temporarily file" << file->fileName();
   }
 
+  m_locks.insert(path, file);
+
   return true;
 }
 
-void MountProtector::unlock() {
-  if (m_file) {
-    delete m_file;
-    m_file = 0;
+void MountProtector::unlock(const QString& path) {
+  QTemporaryFile *file = m_locks.take(path);
+
+  if (file) {
+    delete file;
   }
 }
+
+void MountProtector::unlockAll() {
+  qDeleteAll(m_locks);
+
+  m_locks.clear();
+}