cue plugin: added cover support

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1330 90c681e8-e032-0410-971d-27865f9a5e38

9 files changed, 163 insertions, 28 deletions

diff --git a/src/plugins/General/mpris/playerobject.cpp b/src/plugins/General/mpris/playerobject.cpp
index fbdd9c854..894b68617 100644
--- a/src/plugins/General/mpris/playerobject.cpp
+++ b/src/plugins/General/mpris/playerobject.cpp
@@ -128,13 +128,11 @@ QVariantMap PlayerObject::GetMetadata()
 {
     QVariantMap map;
 
-    if (QFile::exists(m_core->metaData(Qmmp::URL)))
-    {
-        map.insert("location", "file://" + m_core->metaData(Qmmp::URL));
-        map.insert("arturl", MetaDataManager::instance()->getCoverPath(m_core->metaData(Qmmp::URL)));
-    }
-    else
+    if (m_core->metaData(Qmmp::URL).contains("://"))
         map.insert("location", m_core->metaData(Qmmp::URL));
+    else
+        map.insert("location", "file://" + m_core->metaData(Qmmp::URL));
+    map.insert("arturl", MetaDataManager::instance()->getCoverPath(m_core->metaData(Qmmp::URL)));
     map.insert("title", m_core->metaData(Qmmp::TITLE));
     map.insert("artist", m_core->metaData(Qmmp::ARTIST));
     map.insert("album", m_core->metaData(Qmmp::ALBUM));
diff --git a/src/plugins/Input/cue/CMakeLists.txt b/src/plugins/Input/cue/CMakeLists.txt
index 3c1e032ad..27541b9e0 100644
--- a/src/plugins/Input/cue/CMakeLists.txt
+++ b/src/plugins/Input/cue/CMakeLists.txt
@@ -32,6 +32,7 @@ SET(libcue_SRCS
   decodercuefactory.cpp
   settingsdialog.cpp
   cueparser.cpp
+  cuemetadatamodel.cpp
 )
 
 SET(libcue_MOC_HDRS
@@ -39,6 +40,7 @@ SET(libcue_MOC_HDRS
   decoder_cue.h
   settingsdialog.h
   cueparser.h
+  cuemetadatamodel.h
 )
 
 SET(libcue_RCCS translations/translations.qrc)
diff --git a/src/plugins/Input/cue/cuemetadatamodel.cpp b/src/plugins/Input/cue/cuemetadatamodel.cpp
new file mode 100644
index 000000000..e370d168b
--- /dev/null
+++ b/src/plugins/Input/cue/cuemetadatamodel.cpp
@@ -0,0 +1,54 @@
+/***************************************************************************
+ *   Copyright (C) 2009 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include <qmmp/metadatamanager.h>
+#include "cueparser.h"
+#include "cuemetadatamodel.h"
+
+CUEMetaDataModel::CUEMetaDataModel(const QString &url, QObject *parent) : MetaDataModel(parent)
+{
+    QString p = QUrl(url).path();
+    p.replace(QString(QUrl::toPercentEncoding("#")), "#");
+    p.replace(QString(QUrl::toPercentEncoding("?")), "?");
+    p.replace(QString(QUrl::toPercentEncoding("%")), "%");
+    m_parser = new CUEParser(p);
+    if (m_parser->count() == 0)
+    {
+        qWarning("CUEMetaDataModel: invalid cue file");
+        return;
+    }
+    int track = url.section("#", -1).toInt();
+    m_path = m_parser->filePath(track);
+}
+
+CUEMetaDataModel::~CUEMetaDataModel()
+{
+    delete m_parser;
+}
+
+QPixmap CUEMetaDataModel::cover()
+{
+    return MetaDataManager::instance()->getCover(m_path);
+}
+
+QString CUEMetaDataModel::coverPath()
+{
+    return MetaDataManager::instance()->getCoverPath(m_path);
+}
diff --git a/src/plugins/Input/cue/cuemetadatamodel.h b/src/plugins/Input/cue/cuemetadatamodel.h
new file mode 100644
index 000000000..8ad6e7c6e
--- /dev/null
+++ b/src/plugins/Input/cue/cuemetadatamodel.h
@@ -0,0 +1,42 @@
+/***************************************************************************
+ *   Copyright (C) 2009 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef CUEMETADATAMODEL_H
+#define CUEMETADATAMODEL_H
+
+#include <qmmp/metadatamodel.h>
+
+class CUEParser;
+
+class CUEMetaDataModel : public MetaDataModel
+{
+Q_OBJECT
+public:
+    CUEMetaDataModel(const QString &url, QObject *parent);
+    ~CUEMetaDataModel();
+    QPixmap cover();
+    QString coverPath();
+
+private:
+    CUEParser *m_parser;
+    QString m_path;
+};
+
+#endif // CUEMETADATAMODEL_H
diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp
index 0a33b87ec..b57d46679 100644
--- a/src/plugins/Input/cue/decodercuefactory.cpp
+++ b/src/plugins/Input/cue/decodercuefactory.cpp
@@ -20,6 +20,7 @@
 #include <QtGui>
 
 #include "decoder_cue.h"
+#include "cuemetadatamodel.h"
 #include "cueparser.h"
 #include "settingsdialog.h"
 #include "decodercuefactory.h"
@@ -68,9 +69,7 @@ QList<FileInfo *> DecoderCUEFactory::createPlayList(const QString &fileName, boo
 
 MetaDataModel* DecoderCUEFactory::createMetaDataModel(const QString &path, QObject *parent)
 {
-    Q_UNUSED(path);
-    Q_UNUSED(parent);
-    return 0;
+    return path.startsWith("cue://") ? new CUEMetaDataModel(path, parent) : 0;
 }
 
 void DecoderCUEFactory::showSettings(QWidget *parent)
diff --git a/src/qmmp/metadatamanager.cpp b/src/qmmp/metadatamanager.cpp
index 1c65b817f..b119574db 100644
--- a/src/qmmp/metadatamanager.cpp
+++ b/src/qmmp/metadatamanager.cpp
@@ -75,10 +75,28 @@ MetaDataModel* MetaDataManager::createMetaDataModel(const QString &path, QObject
             return efact->createMetaDataModel(path, parent);
         return 0;
     }
+    else
+    {
+        QString scheme = path.section("://",0,0);
+        MetaDataModel *model = 0;
+        foreach(fact, *Decoder::factories())
+        {
+            if(fact->properties().protocols.split(" ").contains(scheme))
+                model = fact->createMetaDataModel(path, parent);
+            if(model)
+                return model;
+        }
+        foreach(efact, *AbstractEngine::factories())
+        {
+            if(efact->properties().protocols.split(" ").contains(scheme))
+                model = efact->createMetaDataModel(path, parent);
+            if(model)
+                return model;
+        }
+    }
     return 0;
 }
 
-
 QStringList MetaDataManager::filters() const
 {
     QStringList filters;
@@ -143,12 +161,15 @@ bool MetaDataManager::supports(const QString &fileName) const
     return FALSE;
 }
 
-QPixmap MetaDataManager::getCover(const QString &fileName) const
+QPixmap MetaDataManager::getCover(const QString &url) const
 {
-    QString p = getCoverPath(fileName);
-    if(!p.isEmpty())
-        return QPixmap(p);
-    MetaDataModel *model = createMetaDataModel(fileName);
+    if(!url.contains("://"))
+    {
+        QString p = getCoverPath(url);
+        if(!p.isEmpty())
+            return QPixmap(p);
+    }
+    MetaDataModel *model = createMetaDataModel(url);
     if(model)
     {
         QPixmap pix = model->cover();
@@ -158,19 +179,32 @@ QPixmap MetaDataManager::getCover(const QString &fileName) const
     return QPixmap();
 }
 
-QString MetaDataManager::getCoverPath(const QString &fileName) const
+QString MetaDataManager::getCoverPath(const QString &url) const
 {
-    QString p = QFileInfo(fileName).absolutePath();
-    QDir dir(p);
-    dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
-    dir.setSorting(QDir::Name);
-    QStringList filters;
-    filters << "*.jpg" << "*.png";
-    QFileInfoList file_list = dir.entryInfoList(filters);
-    foreach(QFileInfo i, file_list)
+    if(url.contains("://")) //url
+    {
+        MetaDataModel *model = createMetaDataModel(url);
+        if(model)
+        {
+            QString coverPath = model->coverPath();
+            model->deleteLater();
+            return coverPath;
+        }
+    }
+    else //local file
     {
-        if(!i.absoluteFilePath().contains("back", Qt::CaseInsensitive))
-            return i.absoluteFilePath();
+        QString p = QFileInfo(url).absolutePath();
+        QDir dir(p);
+        dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
+        dir.setSorting(QDir::Name);
+        QStringList filters;
+        filters << "*.jpg" << "*.png";
+        QFileInfoList file_list = dir.entryInfoList(filters);
+        foreach(QFileInfo i, file_list)
+        {
+            if(!i.absoluteFilePath().contains("back", Qt::CaseInsensitive))
+                return i.absoluteFilePath();
+        }
     }
     return QString();
 }
diff --git a/src/qmmp/metadatamanager.h b/src/qmmp/metadatamanager.h
index 4bdca20a7..ce01c6fd1 100644
--- a/src/qmmp/metadatamanager.h
+++ b/src/qmmp/metadatamanager.h
@@ -47,11 +47,11 @@ public:
     QList <FileInfo *> createPlayList(const QString &path, bool useMetaData = TRUE) const;
     /*!
      * Creats metadata object, which provides full access to file tags.
-     * @param path File path.
+     * @param url File path or URL.
      * @param parent Parent object.
      * @return MetaDataModel pointer or null pointer.
      */
-    MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0) const;
+    MetaDataModel* createMetaDataModel(const QString &url, QObject *parent = 0) const;
     /*!
      * Returns a list of file name filters with description, i.e. "MPEG Files (*.mp3 *.mpg)"
      */
diff --git a/src/qmmp/metadatamodel.cpp b/src/qmmp/metadatamodel.cpp
index d33ca59d5..0fe6b99a8 100644
--- a/src/qmmp/metadatamodel.cpp
+++ b/src/qmmp/metadatamodel.cpp
@@ -48,3 +48,8 @@ QPixmap MetaDataModel::cover()
 {
     return QPixmap();
 }
+
+QString MetaDataModel::coverPath()
+{
+    return QString();
+}
diff --git a/src/qmmp/metadatamodel.h b/src/qmmp/metadatamodel.h
index c07375f55..d787fe5e1 100644
--- a/src/qmmp/metadatamodel.h
+++ b/src/qmmp/metadatamodel.h
@@ -38,6 +38,7 @@ public:
     virtual QHash<QString, QString> descriptions();
     virtual QList<TagModel* > tags();
     virtual QPixmap cover();
+    virtual QString coverPath();
 };
 
 #endif // METADATAMODEL_H