Fix media deletion of animated files

Nheko-Reborn · Oct 9, 2024 · 27683be · 27683be
1 parent 80a39cc
commit 27683be
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 16 deletions.
diff --git a/src/MxcImageProvider.cpp b/src/MxcImageProvider.cpp
@@ -32,23 +32,42 @@ MxcImageProvider::MxcImageProvider()
     timer->setInterval(std::chrono::hours(1));
     connect(timer, &QTimer::timeout, this, [] {
         QThreadPool::globalInstance()->start([] {
+            nhlog::net()->debug("Running media purge");
             QDir dir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) +
                        "/media_cache",
                      "",
                      QDir::SortFlags(QDir::Name | QDir::IgnoreCase),
-                     QDir::Filter::Writable | QDir::Filter::NoDotAndDotDot | QDir::Filter::Files);
+                     QDir::Filter::Writable | QDir::Filter::NoDotAndDotDot | QDir::Filter::Files |
+                       QDir::Filter::Dirs);
 
-            auto files = dir.entryInfoList();
-            for (const auto &fileInfo : std::as_const(files)) {
+            auto handleFile = [](const QFileInfo &fileInfo) {
                 if (fileInfo.fileTime(QFile::FileTime::FileAccessTime)
-                      .daysTo(QDateTime::currentDateTime()) > 30) {
+                      .daysTo(QDateTime::currentDateTime()) > 14) {
                     if (QFile::remove(fileInfo.absoluteFilePath()))
                         nhlog::net()->debug("Deleted stale media '{}'",
                                             fileInfo.absoluteFilePath().toStdString());
                     else
                         nhlog::net()->warn("Failed to delete stale media '{}'",
                                            fileInfo.absoluteFilePath().toStdString());
                 }
+            };
+
+            auto files = dir.entryInfoList();
+            for (const auto &fileInfo : std::as_const(files)) {
+                if (fileInfo.isDir()) {
+                    // handle one level of legacy directories
+                    auto nestedDir = QDir(fileInfo.absoluteFilePath(),
+                                          "",
+                                          QDir::SortFlags(QDir::Name | QDir::IgnoreCase),
+                                          QDir::Filter::Writable | QDir::Filter::NoDotAndDotDot |
+                                            QDir::Filter::Files)
+                                       .entryInfoList();
+                    for (const auto &nestedFile : std::as_const(nestedDir)) {
+                        handleFile(nestedFile);
+                    }
+                } else {
+                    handleFile(fileInfo);
+                }
             }
         });
     });

diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
@@ -2073,10 +2073,12 @@ TimelineModel::cacheMedia(const QString &eventId,
 
     const auto url  = mxcUrl.toStdString();
     const auto name = QString(mxcUrl).remove(QStringLiteral("mxc://"));
-    QFileInfo filename(
-      QStringLiteral("%1/media_cache/%2.%3")
-        .arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation), name, suffix));
-    if (QDir::cleanPath(name) != name) {
+    QFileInfo filename(QStringLiteral("%1/media_cache/%2.%3")
+                         .arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation),
+                              QString::fromUtf8(name.toUtf8().toBase64(
+                                QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals)),
+                              suffix));
+    if (QDir::cleanPath(filename.filePath()) != filename.filePath()) {
         nhlog::net()->warn("mxcUrl '{}' is not safe, not downloading file", url);
         return;
     }

diff --git a/src/ui/MxcAnimatedImage.cpp b/src/ui/MxcAnimatedImage.cpp
@@ -53,10 +53,12 @@ MxcAnimatedImage::startDownload()
 
     const auto url  = mxcUrl.toStdString();
     const auto name = QString(mxcUrl).remove(QStringLiteral("mxc://"));
-    QFileInfo filename(
-      QStringLiteral("%1/media_cache/media/%2.%3")
-        .arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation), name, suffix));
-    if (QDir::cleanPath(name) != name) {
+    QFileInfo filename(QStringLiteral("%1/media_cache/media/%2.%3")
+                         .arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation),
+                              QString::fromUtf8(name.toUtf8().toBase64(
+                                QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals)),
+                              suffix));
+    if (QDir::cleanPath(filename.filePath()) != filename.filePath()) {
         nhlog::net()->warn("mxcUrl '{}' is not safe, not downloading file", url);
         return;
     }

diff --git a/src/ui/MxcMediaProxy.cpp b/src/ui/MxcMediaProxy.cpp
@@ -96,10 +96,12 @@ MxcMediaProxy::startDownload(bool onlyCached)
 
     const auto url  = mxcUrl.toStdString();
     const auto name = QString(mxcUrl).remove(QStringLiteral("mxc://"));
-    QFileInfo filename(
-      QStringLiteral("%1/media_cache/media/%2.%3")
-        .arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation), name, suffix));
-    if (QDir::cleanPath(name) != name) {
+    QFileInfo filename(QStringLiteral("%1/media_cache/media/%2.%3")
+                         .arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation),
+                              QString::fromUtf8(name.toUtf8().toBase64(
+                                QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals)),
+                              suffix));
+    if (QDir::cleanPath(filename.filePath()) != filename.filePath()) {
         nhlog::net()->warn("mxcUrl '{}' is not safe, not downloading file", url);
         return;
     }