Qt: refactor thumbnail path creation.

ui/drivers/qt/qt_playlist.cpp

@@ -130,18 +130,25 @@ void PlaylistModel::setThumbnailCacheLimit(int limit)
 
 QString PlaylistModel::getThumbnailPath(const QModelIndex &index, QString type) const
 {
+   return getThumbnailPath(m_contents.at(index.row()), type);
+}
+
+QString PlaylistModel::getPlaylistThumbnailsDir(const QString playlistName) const
+{
+   return QDir::cleanPath(QString(config_get_ptr()->paths.directory_thumbnails)) + "/" + playlistName;
+}
+
+bool PlaylistModel::isSupportedImage(const QString path) const
+{
+   int lastIndex = -1;
    QByteArray extension;
    QString extensionStr;
 
-   QString thumbnailFileNameNoExt;
+   lastIndex = path.lastIndexOf('.');
-   int lastIndex = -1;
-
-   const QHash<QString, QString> &hash = m_contents.at(index.row());
-   lastIndex = hash["path"].lastIndexOf('.');
 
    if (lastIndex >= 0)
    {
-      extensionStr = hash["path"].mid(lastIndex + 1);
+      extensionStr = path.mid(lastIndex + 1);
 
       if (!extensionStr.isEmpty())
       {
@@ -150,15 +157,26 @@ QString PlaylistModel::getThumbnailPath(const QModelIndex &index, QString type)
    }
 
    if (!extension.isEmpty() && m_imageFormats.contains(extension))
+      return true;
+
+   return false;
+}
+
+QString PlaylistModel::getSanitizedThumbnailName(QString label) const
+{
+   return label.replace(m_fileSanitizerRegex, "_") + ".png";
+}
+
+QString PlaylistModel::getThumbnailPath(const QHash<QString, QString> &hash, QString type) const
+{   
+   if (isSupportedImage(hash["path"]))
    {
       /* use thumbnail widgets to show regular image files */
       return hash["path"];
    }
    else
    {
-      thumbnailFileNameNoExt = hash["label_noext"];
+      return getPlaylistThumbnailsDir(hash.value("db_name")) + "/" + type + "/" + getSanitizedThumbnailName(hash["label_noext"]);
-      thumbnailFileNameNoExt.replace(m_fileSanitizerRegex, "_");
-      return QDir::cleanPath(QString(config_get_ptr()->paths.directory_thumbnails)) + "/" + hash.value("db_name") + "/" + type + "/" + thumbnailFileNameNoExt + ".png";
    }
 }
 

ui/drivers/qt/ui_qt_window.cpp

@@ -303,7 +303,6 @@ MainWindow::MainWindow(QWidget *parent) :
    ,m_thumbnailPixmap(NULL)
    ,m_thumbnailPixmap2(NULL)
    ,m_thumbnailPixmap3(NULL)
-   ,m_fileSanitizerRegex("[&*/:`<>?\\|]")
    ,m_settings(NULL)
    ,m_viewOptionsDialog(NULL)
    ,m_coreInfoDialog(new CoreInfoDialog(this, NULL))
@@ -1269,9 +1268,8 @@ void MainWindow::changeThumbnailType(ThumbnailType type)
 QString MainWindow::changeThumbnail(const QImage &image, QString type)
 {
    QHash<QString, QString> hash = getCurrentContentHash();
-   QString label = hash["label_noext"];
+   QString dirString = m_playlistModel->getPlaylistThumbnailsDir(hash["db_name"]) + "/" + type;
-   QString dirString = QDir::cleanPath(QString(config_get_ptr()->paths.directory_thumbnails)) + "/" + hash["db_name"] + "/" + type;
+   QString thumbPath = dirString + "/" + m_playlistModel->getSanitizedThumbnailName(hash["label_noext"]);
-   QString thumbPath = dirString + "/" + label.replace(m_fileSanitizerRegex, "_") + ".png";
    QByteArray dirArray = QDir::toNativeSeparators(dirString).toUtf8();
    const char *dirData = dirArray.constData();
    QByteArray thumbArray = QDir::toNativeSeparators(thumbPath).toUtf8();
@@ -2514,29 +2512,7 @@ void MainWindow::onCurrentFileChanged(const QModelIndex &index)
 
 void MainWindow::onCurrentItemChanged(const QHash<QString, QString> &hash)
 {
-   settings_t *settings = config_get_ptr();
+   QString path = hash["path"];
-   QString label;
-   QString playlist_name;
-   QByteArray extension;
-   QString extensionStr;
-   int lastIndex = -1;
-
-   label = hash["label_noext"];
-   label.replace(m_fileSanitizerRegex, "_");
-
-   lastIndex = hash["path"].lastIndexOf('.');
-
-   if (lastIndex >= 0)
-   {
-      extensionStr = hash["path"].mid(lastIndex + 1);
-
-      if (!extensionStr.isEmpty())
-      {
-         extension = extensionStr.toLower().toUtf8();
-      }
-   }
-
-   playlist_name = hash["db_name"];
 
    if (m_thumbnailPixmap)
       delete m_thumbnailPixmap;
@@ -2545,10 +2521,10 @@ void MainWindow::onCurrentItemChanged(const QHash<QString, QString> &hash)
    if (m_thumbnailPixmap3)
       delete m_thumbnailPixmap3;
 
-   if (!extension.isEmpty() && m_imageFormats.contains(extension))
+   if (m_playlistModel->isSupportedImage(path))
    {
       /* use thumbnail widgets to show regular image files */
-      m_thumbnailPixmap = new QPixmap(hash["path"]);
+      m_thumbnailPixmap = new QPixmap(path);
       m_thumbnailPixmap2 = new QPixmap(*m_thumbnailPixmap);
       m_thumbnailPixmap3 = new QPixmap(*m_thumbnailPixmap);
 
@@ -2556,9 +2532,12 @@ void MainWindow::onCurrentItemChanged(const QHash<QString, QString> &hash)
    }
    else
    {
-      m_thumbnailPixmap = new QPixmap(QString(settings->paths.directory_thumbnails) + "/" + playlist_name + "/" + THUMBNAIL_BOXART + "/" + label + ".png");
+      QString thumbnailsDir = m_playlistModel->getPlaylistThumbnailsDir(hash["db_name"]);
-      m_thumbnailPixmap2 = new QPixmap(QString(settings->paths.directory_thumbnails) + "/" + playlist_name + "/" + THUMBNAIL_TITLE + "/" + label + ".png");
+      QString thumbnailName = m_playlistModel->getSanitizedThumbnailName(hash["label_noext"]);
-      m_thumbnailPixmap3 = new QPixmap(QString(settings->paths.directory_thumbnails) + "/" + playlist_name + "/" + THUMBNAIL_SCREENSHOT + "/" + label + ".png");
+
+      m_thumbnailPixmap = new QPixmap(thumbnailsDir + "/" + THUMBNAIL_BOXART + "/" + thumbnailName);
+      m_thumbnailPixmap2 = new QPixmap(thumbnailsDir + "/" + THUMBNAIL_TITLE + "/" + thumbnailName);
+      m_thumbnailPixmap3 = new QPixmap(thumbnailsDir + "/" + THUMBNAIL_SCREENSHOT + "/" + thumbnailName);
 
       if (m_currentBrowser == BROWSER_TYPE_PLAYLISTS)
       {

ui/drivers/ui_qt.h

@@ -142,6 +142,9 @@ public:
    void reloadThumbnailPath(const QString path);
    void reloadSystemThumbnails(const QString system);
    void setThumbnailCacheLimit(int limit);
+   bool isSupportedImage(const QString path) const;
+   QString getPlaylistThumbnailsDir(const QString playlistName) const;
+   QString getSanitizedThumbnailName(QString label) const;
 
 signals:
    void imageLoaded(const QImage image, const QModelIndex &index, const QString &path);
@@ -157,6 +160,7 @@ private:
    QRegularExpression m_fileSanitizerRegex;
    ThumbnailType m_thumbnailType = THUMBNAIL_TYPE_BOXART;
    QString getThumbnailPath(const QModelIndex &index, QString type) const;
+   QString getThumbnailPath(const QHash<QString, QString> &hash, QString type) const;
    QString getCurrentTypeThumbnailPath(const QModelIndex &index) const;
    void getPlaylistItems(QString path);
    void loadImage(const QModelIndex &index, const QString &path);
@@ -579,7 +583,6 @@ private:
    QPixmap *m_thumbnailPixmap;
    QPixmap *m_thumbnailPixmap2;
    QPixmap *m_thumbnailPixmap3;
-   QRegularExpression m_fileSanitizerRegex;
    QSettings *m_settings;
    ViewOptionsDialog *m_viewOptionsDialog;
    CoreInfoDialog *m_coreInfoDialog;