refactor: simplify archive path parsing

Eliminate needing to call parseArchivePath directly:
- make dirPath() return the archive path
- add containerPath()
- optimize and unit test Media path helpers

Replace remaining occurances of archivePaths()

Author: scrubbbbs

src/database.cpp

@@ -1230,28 +1230,12 @@ bool Database::filterMatch(const SearchParams& params, MediaGroup& match) {
 
   // remove match if in the same directory/zip as needle
   if (params.filterParent && match.count() > 1) {
-    if (match[0].isArchived()) {
-      QString parent;
-      match[0].archivePaths(&parent);
-      for (int i = 1; i < match.count(); ++i)
-        if (match[i].isArchived()) {
-          QString p;
-          match[i].archivePaths(&p);
-          if (p == parent) {
-            match.remove(i);
-            --i;
-          }
-        }
-    } else {
-      auto parent = match[0].path().split("/");
-      parent.pop_back();
-      for (int i = 1; i < match.count(); ++i) {
-        auto tmp = match[i].path().split("/");
-        tmp.pop_back();
-        if (tmp == parent) {
-          match.remove(i);
-          --i;
-        }
+    const QString parent = match[0].dirPath();
+    for (int i = 1; i < match.count(); ++i) {
+      const QString tmp = match[i].dirPath();
+      if (tmp == parent) {
+        match.remove(i);
+        --i;
       }
     }
   }

src/engine.cpp

@@ -147,13 +147,18 @@ void Engine::update(bool wait, const QString& dirPath) {
     // updating correctly
     // FIXME: this can take a long time, figure out where
     //        the invalid paths actually come from
-    QStringList paths = indexedFiles.values(); // sort to reduce random access
-    paths.sort();
+    const QStringList paths = ([&indexedFiles] {
+      auto list = indexedFiles.values(); // sort to reduce random access
+      list.sort();
+      return list;
+    })();
     QSet<QString> checked;
     int progress = 0;
-    for (int i = 0; i < paths.count(); ++i) {
-      auto& path = paths[i];
-      if (Media::isArchived(path)) Media::archivePaths(path, &path);
+    int i = 0;
+    for (auto path : paths) {
+      if (auto archive = Media::parseArchivePath(path)) {
+        path = QString(archive->parentPath);
+      }
 
       if (checked.contains(path)) continue;  // skip zip members
       checked.insert(path);
@@ -171,6 +176,7 @@ void Engine::update(bool wait, const QString& dirPath) {
           relPath.contains("//"))
         qCritical("invalid path in database:\n\tcanonical=%s\n\tdatabase =%s",
                   qUtf8Printable(canRelPath), qUtf8Printable(relPath));
+      i++;
       if (progress++ == 10) {
         progress = 0;
         qInfo("<NC>%s: validating index <PL> %d/%lld", qUtf8Printable(db->path()), i,

src/gui/mediabrowser.cpp

@@ -136,9 +136,7 @@ int MediaBrowser::showFolders(const MediaGroupList& list, const MediaWidgetOptio
     if (!key.isEmpty()) key = key.split(qq("==")).back();  // don't display -group-by expression
 
     if (key.isEmpty()) {
-      if (first.isArchived())
-        first.archivePaths(&key);
-      else if (first.type() == Media::TypeVideo)  // don't group videos TODO: option
+      if (first.type() == Media::TypeVideo) // don't group videos TODO: option
         key = first.path();
       else
         key = first.dirPath();
@@ -209,11 +207,7 @@ int MediaBrowser::showSets(const MediaGroupList& list, const MediaWidgetOptions&
   for (const MediaGroup& g : list) {
     QStringList dirPaths;
     for (const Media& m : g) {
-      QString path;
-      if (m.isArchived())
-        m.archivePaths(&path);
-      else
-        path = m.dirPath();
+      QString path = m.dirPath();
       if (!dirPaths.contains(path)) dirPaths.append(path);
     }
 
@@ -315,8 +309,7 @@ void MediaBrowser::showIndex(const MediaGroup& index,
       // if we opened the folder and modified the path
       // we will not see it here, check if it still exists
       const Media& m = group.at(_groupIndex);
-      QString filePath = m.path();
-      if (m.isArchived()) m.archivePaths(&filePath);
+      const QString filePath = m.containerPath();
       if (!QFile::exists(filePath)) return;
 
       QImage img = loadThumb(group.at(_groupIndex), _options);

src/gui/mediagrouplistwidget.cpp

@@ -759,20 +759,20 @@ QMenu* MediaGroupListWidget::dirMenu(const char* slot) {
   const QModelIndex index = currentIndex();
   if (index.isValid()) selectedIndex = index.row();
 
-  for (int i = 0; i < group.count(); ++i)
-    if (i != selectedIndex) {
-      const auto& m = group.at(i);
-      if (!MediaPage::isAnalysis(m)) {
-        QString path = m.dirPath();
-        if (m.isArchived()) {
-          m.archivePaths(&path);
-          auto list = path.split(lc('/'));
-          list.removeLast();
-          path = list.join(lc('/'));
-        }
-        groupDirs.insert(path);
-      }
+  for (int i = 0; i < group.count(); ++i) {
+    const Media& m = group.at(i);
+    if (i == selectedIndex) continue;
+    if (MediaPage::isAnalysis(m)) continue;
+
+    QString path = m.dirPath();
+    if (m.isArchived()) {
+      int index = path.lastIndexOf(u'/'); // parent dir of zipfile
+      if (index >= 0) path = path.mid(0, index);
+    }
+    if (!path.isEmpty()) {
+      groupDirs.insert(path);
     }
+  }
 
   const auto& keys = groupDirs.values();
   QList<QAction*> actions;
@@ -964,9 +964,6 @@ void MediaGroupListWidget::removeSelection(bool deleteFiles, bool replace) {
     Q_ASSERT(index >=0 && index < groupCount);
     const Media& m = page->group[index];
 
-    QString path = m.path();
-    if (m.isArchived()) m.archivePaths(&path);
-
     if (!deleteFiles) {
       removedIndices.insert(index);
       if (m.isValid())
@@ -987,6 +984,7 @@ void MediaGroupListWidget::removeSelection(bool deleteFiles, bool replace) {
       continue;
     }
 
+    QString path = m.containerPath();
     {
       static bool skipDeleteConfirmation = false;
       int button = 0;
@@ -1206,12 +1204,7 @@ void MediaGroupListWidget::renameFileAction() {
 
     // names of matches
     for (auto& m2 : group) {
-      if (m2.isArchived()) {
-        QString fileName;
-        m2.archivePaths(nullptr, &fileName);
-        maybeAppend(completions, fileName);
-      } else
-        maybeAppend(completions, m2.name());
+      maybeAppend(completions, m2.name());
     }
 
     // also files in same directory
@@ -1265,13 +1258,7 @@ void MediaGroupListWidget::copyNameAction() {
   }
 
   const QFileInfo info(selected->path());
-  QString otherName;
-  if (other->isArchived())
-    other->archivePaths(nullptr, &otherName);
-  else
-    otherName = other->name();  // TODO: should name() work with archives?
-
-  QString newName = QFileInfo(otherName).completeBaseName() + "." + info.suffix();
+  const QString newName = other->completeBaseName() + u'.' + info.suffix();
   const QString oldPath = selected->path();
   if (_options.db) {
     if (_options.db->rename(*selected, newName))
@@ -1351,16 +1338,11 @@ void MediaGroupListWidget::moveFolderAction() {
   QSet<QString> moved;
 
   for (Media& m : selectedMedia()) {
-    QString srcPath;
-    if (m.isArchived())
-      m.archivePaths(&srcPath);
-    else
-      srcPath = m.dirPath();
-
+    const QString srcPath = m.dirPath();
     if (moved.contains(srcPath))  // already moved
       continue;
 
-    const QString dstPath = dirPath + "/" + QFileInfo(srcPath).fileName();
+    const QString dstPath = dirPath + u'/' + QFileInfo(srcPath).fileName();
     moveDatabaseDir(m, dstPath);
     moved += srcPath;
   }
@@ -1881,11 +1863,7 @@ void MediaGroupListWidget::browseParentAction() {
   }
 
   const Media& m = g.first();
-  QString path;
-  if (m.isArchived())
-    m.archivePaths(&path);
-  else
-    path = m.dirPath();
+  const QString path = m.dirPath();
 
   MediaGroup siblings = _options.db->mediaWithPathLike(path + lc('%'));
   Media::sortGroup(siblings, {qq("path")});
@@ -2002,17 +1980,15 @@ void MediaGroupListWidget::updateItems() {
     }
 
     int fileCount = 0;
-    if (m.isArchived()) {
+    if (auto archive = m.parseArchivePath()) {
       // can be slow for large archives, we can cache since
       // archives are immutable here
-      QString archivePath;
-      m.archivePaths(&archivePath);
-      auto it = _archiveFileCount.find(archivePath);
+      auto it = _archiveFileCount.find(archive->parentPath);
       if (it != _archiveFileCount.end())
         fileCount = *it;
       else {
         fileCount = m.archiveCount();
-        _archiveFileCount.insert(archivePath, fileCount);
+        _archiveFileCount.insert(archive->parentPath.toString(), fileCount);
       }
     } else if (fileInfo.isFile()) {
       const auto key = fileInfo.absolutePath();

src/main.cpp

@@ -564,9 +564,8 @@ static void nuke(const MediaGroup& group) {
   bool yesAll = false;  // don't ask again
   for (auto& m : std::as_const(group)) {
     QString path = m.path();
-    if (m.isArchived()) {
-      m.archivePaths(&path);
-
+    if (auto archive = m.parseArchivePath()) {
+      path = archive->parentPath.toString();
       if (zips.contains(path)) continue;
       zips.insert(path);
 
@@ -1347,13 +1346,13 @@ int main(int argc, char** argv) {
       MediaGroup moveable;
       QStringList movedZips;
       for (auto& m : selection) {
-        if (!m.isArchived()) {
+        auto archive = m.parseArchivePath();
+        if (!archive) {
           moveable.append(m);
           continue;
         }
 
-        QString zipPath;
-        m.archivePaths(&zipPath);
+        QString zipPath(archive->parentPath);
         if (movedZips.contains(zipPath)) continue;
 
         const QFileInfo info(zipPath);
@@ -1679,7 +1678,7 @@ int main(int argc, char** argv) {
         if (selection.count() && !selection.first().attributes().contains("sort"))
           Media::sortGroup(selection, {"path"});
 
-        auto getProp = Media::propertyFunc("parentPath");
+        auto getProp = Media::propertyFunc("dirPath");
 
         qDebug("make groups of %d", widgetOptions.maxPerPage);
         MediaGroupList list;