Added a hidden setting (fileNaming/useUtc) to disable UTC usage for file names

[harmattan/cameraplus] / src / filenaming.cpp

diff --git a/src/filenaming.cpp b/src/filenaming.cpp
index f165c8d..fa64a6c 100644 (file)
--- a/src/filenaming.cpp
+++ b/src/filenaming.cpp
@@ -21,107 +21,118 @@
 #include "filenaming.h"
 #include <QDir>
 #include <QDate>
+#include <QDateTime>
 #include <QFile>
+#include "settings.h"
+#if defined(QT4)
 #include <QDeclarativeInfo>
-
-#define PATH QString("%1%2MyDocs%2cameraplus%2").arg(QDir::homePath()).arg(QDir::separator())
-#define TEMP_PATH QString("%1%2MyDocs%2.cameraplus%2").arg(QDir::homePath()).arg(QDir::separator())
+#elif defined(QT5)
+#include <QQmlInfo>
+#endif
 
 FileNaming::FileNaming(QObject *parent) :
-  QObject(parent), m_index(-1) {
+  QObject(parent),
+  m_settings(0),
+  m_index(0) {
 
 }
 
 FileNaming::~FileNaming() {
-
+  delete m_index; m_index = 0;
 }
 
 QString FileNaming::imageSuffix() const {
-  return m_image;
+  return m_imageSuffix;
 }
 
 void FileNaming::setImageSuffix(const QString& suffix) {
-  if (m_image != suffix) {
-    m_image = suffix;
+  if (m_imageSuffix != suffix) {
+    m_imageSuffix = suffix;
     emit imageSuffixChanged();
   }
 }
 
 QString FileNaming::videoSuffix() const {
-  return m_video;
+  return m_videoSuffix;
 }
 
 void FileNaming::setVideoSuffix(const QString& suffix) {
-  if (m_video != suffix) {
-    m_video = suffix;
+  if (m_videoSuffix != suffix) {
+    m_videoSuffix = suffix;
     emit videoSuffixChanged();
   }
 }
 
 QString FileNaming::imageFileName() {
-  return fileName(m_image);
+  return fileName(m_imagePath, m_imageSuffix, Image);
 }
 
 QString FileNaming::videoFileName() {
-  return fileName(m_video);
+  return fileName(m_videoPath, m_videoSuffix, Video);
 }
 
-QString FileNaming::fileName(const QString& suffix) {
-  QString path = FileNaming::path();
-  QString date = QDate::currentDate().toString("yyyyMMdd");
-  QDir dir(path);
+QString FileNaming::fileName(const QString& path, const QString& suffix, const Type& type) {
+  FileIndex::Type indexType = (FileIndex::Type) type;
+
+  if (!m_settings) {
+    qmlInfo(this) << "settings has not been set";
+    return QString();
+  }
 
   if (suffix.isEmpty()) {
+    qmlInfo(this) << "called with empty suffix";
     return QString();
   }
 
   if (path.isEmpty()) {
+    qmlInfo(this) << "called with empty path";
     return QString();
   }
 
-  if (date != m_date) {
-    m_index = -1;
-    m_date = date;
+  QString date;
+  if (m_settings && !m_settings->isUtcForFileNamingUsed()) {
+    date = QDate::currentDate().toString("yyyyMMdd");
+  }
+  else {
+    date = QDateTime::currentDateTime().toUTC().date().toString("yyyyMMdd");
+  }
+  QDir dir(path);
+
+  // index is the last used index
+  int index = 0;
+
+  if (m_index->stamp(indexType) != date) {
+    m_index->setStamp(indexType, date);
+  }
+  else {
+    index = m_index->counter(indexType);
   }
 
-  if (m_index == -1) {
+  if (index == 0) {
     QStringList filters(QString("*%1_*").arg(date));
     QStringList entries = dir.entryList(filters, QDir::Files, QDir::Name);
-    if (entries.isEmpty()) {
-      m_index = 0;
-    }
-    else {
+    if (!entries.isEmpty()) {
       QString name = QFile(entries.last()).fileName();
-      m_index = name.section('_', 1, 1).section('.', 0, 0).toInt();
+      index = name.section('_', 1, 1).section('.', 0, 0).toInt();
     }
   }
 
-  ++m_index;
+  while (index < INT_MAX) {
+    ++index;
 
-  QString name = QString("%1%2_%3.%4").arg(path).arg(date).arg(QString().sprintf("%03i", m_index)).
-    arg(suffix);
+    QString name = QString("%1%2_%3.%4")
+      .arg(path).arg(date).arg(QString().sprintf("%03i", index)).arg(suffix);
 
-  if (QFile(name).exists()) {
-    return QString();
-  }
-
-  return name;
-}
+    if (!QFile(name).exists()) {
+      m_index->setCounter(indexType, index);
+      return name;
+    }
 
-QString FileNaming::path() {
-  if (m_path.isEmpty()) {
-    m_path = canonicalPath(PATH);
   }
 
-  return m_path;
-}
+  qmlInfo(this) << "Failed to guess a file name";
 
-QString FileNaming::temporaryPath() {
-  if (m_temp.isEmpty()) {
-    m_temp = canonicalPath(TEMP_PATH);
-  }
-
-  return m_temp;
+  return QString();
 }
 
 QString FileNaming::canonicalPath(const QString& path) {
@@ -144,11 +155,73 @@ QString FileNaming::canonicalPath(const QString& path) {
 }
 
 QString FileNaming::temporaryVideoFileName() {
-  QString path = temporaryPath();
+  if (m_temporaryVideoPath.isEmpty()) {
+    return QString();
+  }
 
-  if (path.isEmpty()) {
-    return path;
+  return QString("%1.cameraplus_video.tmp").arg(m_temporaryVideoPath);
+}
+
+QString FileNaming::imagePath() const {
+  return m_imagePath;
+}
+
+void FileNaming::setImagePath(const QString& path) {
+  QString p = canonicalPath(path);
+
+  if (m_imagePath != p) {
+    m_imagePath = p;
+    emit imagePathChanged();
+  }
+}
+
+QString FileNaming::videoPath() const {
+  return m_videoPath;
+}
+
+void FileNaming::setVideoPath(const QString& path) {
+  QString p = canonicalPath(path);
+
+  if (m_videoPath != p) {
+    m_videoPath = p;
+    emit videoPathChanged();
+  }
+}
+
+QString FileNaming::temporaryVideoPath() const {
+  return m_temporaryVideoPath;
+}
+
+void FileNaming::setTemporaryVideoPath(const QString& path) {
+  QString p = canonicalPath(path);
+
+  if (m_temporaryVideoPath != p) {
+    m_temporaryVideoPath = p;
+    emit temporaryVideoPathChanged();
   }
+}
 
-  return QString("%1.cameraplus_video.tmp").arg(path);
+Settings *FileNaming::settings() const {
+  return m_settings;
+}
+
+void FileNaming::setSettings(Settings *settings) {
+  if (m_settings != settings) {
+    m_settings = settings;
+
+    emit settingsChanged();
+  }
+}
+
+void FileNaming::classBegin() {
+  // Nothing
+}
+
+void FileNaming::componentComplete() {
+  if (QDir(m_imagePath).canonicalPath() == QDir(m_videoPath).canonicalPath()) {
+    m_index = new SingleFileIndex(m_settings);
+  }
+  else {
+    m_index = new MultiFileIndex(m_settings);
+  }
 }