removed hashes from diskmanager

app/render/diskmanager.cpp

@@ -61,7 +61,7 @@ DiskManager::DiskManager()
     GetOpenFolder(GetDefaultDiskCachePath());
   }
 
-  QFile disk_cache_index(QDir(FileFunctions::GetConfigurationLocation()).filePath(QStringLiteral("diskcache")));
+  QFile disk_cache_index(QDir(FileFunctions::GetConfigurationLocation()).filePath(QStringLiteral("diskcache2")));
 
   if (disk_cache_index.open(QFile::ReadOnly)) {
     QTextStream stream(&disk_cache_index);
@@ -103,18 +103,18 @@ DiskManager *DiskManager::instance()
   return instance_;
 }
 
-void DiskManager::Accessed(const QString &cache_folder, const QByteArray &hash)
+void DiskManager::Accessed(const QString &cache_folder, const QString &filename)
 {
   DiskCacheFolder* f = GetOpenFolder(cache_folder);
 
-  f->Accessed(hash);
+  f->Accessed(filename);
 }
 
-void DiskManager::CreatedFile(const QString &cache_folder, const QString &file_name, const QByteArray &hash)
+void DiskManager::CreatedFile(const QString &cache_folder, const QString &filename)
 {
   DiskCacheFolder* f = GetOpenFolder(cache_folder);
 
-  f->CreatedFile(file_name, hash);
+  f->CreatedFile(filename);
 }
 
 void DiskManager::DeleteSpecificFile(const QString &filename)
@@ -214,13 +214,13 @@ bool DiskCacheFolder::ClearCache()
 
   while (i != disk_data_.end()) {
     // We return a false result if any of the files fail to delete, but still try to delete as many as we can
-    const HashTime& ht = i.value();
+    const QString &filename = i.key();
 
-    if (QFile::remove(ht.file_name) || !QFileInfo::exists(ht.file_name)) {
+    if (QFile::remove(filename) || !QFileInfo::exists(filename)) {
       emit DeletedFrame(path_, i.key());
       i = disk_data_.erase(i);
     } else {
-      qWarning() << "Failed to delete" << i->file_name;
+      qWarning() << "Failed to delete" << filename;
       deleted_files = false;
       i++;
     }
@@ -229,20 +229,20 @@ bool DiskCacheFolder::ClearCache()
   return deleted_files;
 }
 
-void DiskCacheFolder::Accessed(const QByteArray &hash)
+void DiskCacheFolder::Accessed(const QString &filename)
 {
-  if (!disk_data_.contains(hash)) {
+  if (!disk_data_.contains(filename)) {
     return;
   }
 
-  disk_data_[hash].access_time = QDateTime::currentMSecsSinceEpoch();
+  disk_data_[filename].access_time = QDateTime::currentMSecsSinceEpoch();
 }
 
-void DiskCacheFolder::CreatedFile(const QString &file_name, const QByteArray &hash)
+void DiskCacheFolder::CreatedFile(const QString &filename)
 {
-  qint64 file_size = QFile(file_name).size();
+  qint64 file_size = QFile(filename).size();
 
-  disk_data_.insert(hash, {file_name, file_size, QDateTime::currentMSecsSinceEpoch()});
+  disk_data_.insert(filename, {file_size, QDateTime::currentMSecsSinceEpoch()});
 
   consumption_ += file_size;
 
@@ -288,17 +288,16 @@ void DiskCacheFolder::SetPath(const QString &path)
     ds >> clear_on_close_;
 
     while (!cache_index_file.atEnd()) {
-      QByteArray hash;
+      QString filename;
       HashTime h;
 
-      ds >> h.file_name;
-      ds >> hash;
+      ds >> filename;
       ds >> h.file_size;
       ds >> h.access_time;
 
-      if (QFileInfo::exists(h.file_name)) {
+      if (QFileInfo::exists(filename)) {
         consumption_ += h.file_size;
-        disk_data_.insert(hash, h);
+        disk_data_.insert(filename, h);
       }
     }
 
@@ -306,24 +305,21 @@ void DiskCacheFolder::SetPath(const QString &path)
   }
 }
 
-bool DiskCacheFolder::DeleteFileInternal(QMap<QByteArray, HashTime>::iterator hash_to_delete)
+bool DiskCacheFolder::DeleteFileInternal(QMap<QString, HashTime>::iterator hash_to_delete)
 {
   // Cache HashTime object
-  QByteArray hash = hash_to_delete.key();
+  const QString &filename = hash_to_delete.key();
   HashTime ht = hash_to_delete.value();
 
   // Remove from disk
-  if (QFile::remove(ht.file_name)) {
+  if (QFile::remove(filename)) {
     // Remove from internal map
     disk_data_.erase(hash_to_delete);
 
     // Reduce consumption
     consumption_ -= ht.file_size;
 
-    if (!hash.isEmpty()) {
-      emit DeletedFrame(path_, hash);
-    }
-
+    emit DeletedFrame(path_, filename);
     return true;
   }
 
@@ -333,7 +329,7 @@ bool DiskCacheFolder::DeleteFileInternal(QMap<QByteArray, HashTime>::iterator ha
 bool DiskCacheFolder::DeleteSpecificFile(const QString &f)
 {
   for (auto it=disk_data_.begin(); it!=disk_data_.end(); it++) {
-    if (it->file_name == f) {
+    if (it.key() == f) {
       // Break out of this loop, assuming we'll only have one instance of each filename
       return DeleteFileInternal(it);
     }
@@ -384,7 +380,6 @@ void DiskCacheFolder::SaveDiskCacheIndex()
     for (auto it=disk_data_.cbegin(); it!=disk_data_.cend(); it++) {
       const HashTime& ht = it.value();
 
-      ds << ht.file_name;
       ds << it.key();
       ds << ht.file_size;
       ds << ht.access_time;

app/render/diskmanager.h

@@ -41,9 +41,9 @@ public:
 
   bool ClearCache();
 
-  void Accessed(const QByteArray& hash);
+  void Accessed(const QString& filename);
 
-  void CreatedFile(const QString& file_name, const QByteArray& hash);
+  void CreatedFile(const QString& filename);
 
   const QString& GetPath() const
   {
@@ -75,16 +75,15 @@ public:
   bool DeleteSpecificFile(const QString &f);
 
 signals:
-  void DeletedFrame(const QString& path, const QByteArray& hash);
+  void DeletedFrame(const QString& path, const QString& filename);
 
 private:
   struct HashTime {
-    QString file_name;
     qint64 file_size;
     qint64 access_time;
   };
 
-  bool DeleteFileInternal(QMap<QByteArray, HashTime>::iterator hash_to_delete);
+  bool DeleteFileInternal(QMap<QString, HashTime>::iterator hash_to_delete);
 
   bool DeleteLeastRecent();
 
@@ -94,7 +93,7 @@ private:
 
   QString index_path_;
 
-  QMap<QByteArray, HashTime> disk_data_;
+  QMap<QString, HashTime> disk_data_;
 
   qint64 consumption_;
 
@@ -149,14 +148,14 @@ public:
   void ShowDiskCacheSettingsDialog(const QString& path, QWidget* parent);
 
 public slots:
-  void Accessed(const QString& cache_folder, const QByteArray& hash);
+  void Accessed(const QString& cache_folder, const QString& filename);
 
-  void CreatedFile(const QString& cache_folder, const QString& file_name, const QByteArray& hash);
+  void CreatedFile(const QString& cache_folder, const QString& filename);
 
   void DeleteSpecificFile(const QString &filename);
 
 signals:
-  void DeletedFrame(const QString& path, const QByteArray& hash);
+  void DeletedFrame(const QString& path, const QString& filename);
 
   void InvalidateProject(Project* p);