added packed skin support

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

5 files changed, 209 insertions, 12 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a7e642610..47d73130d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -75,6 +75,7 @@ SET(libsrc_SRCS
   keyboardmanager.cpp
   addurldialog.cpp
   filedialog.cpp
+  skinreader.cpp
 )
 
 SET(libsrc_MOC_HDRS
@@ -126,6 +127,7 @@ SET(libsrc_MOC_HDRS
   keyboardmanager.h
   addurldialog.h
   filedialog.h
+  skinreader.h
 )
 
 SET(libsrc_RCCS images/images.qrc stuff.qrc translations/qmmp_locales.qrc)
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 58b0b37a7..f4833cc87 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -35,6 +35,7 @@
 #include "filedialog.h"
 #include "pluginitem.h"
 #include "configdialog.h"
+#include "skinreader.h"
 
 ConfigDialog::ConfigDialog ( QWidget *parent )
         : QDialog ( parent )
@@ -53,6 +54,8 @@ ConfigDialog::ConfigDialog ( QWidget *parent )
     m_skin = Skin::getPointer();
     ui.fileDialogComboBox->insertItems(0,FileDialog::registeredFactories());
     readSettings();
+    SkinReader reader;
+    reader.updateCache();
     loadSkins();
     loadPluginsInfo();
     loadFonts();
@@ -143,6 +146,7 @@ void ConfigDialog::loadSkins()
     m_skinList << fileInfo;
 
     findSkins(QDir::homePath() +"/.qmmp/skins");
+    findSkins(QDir::homePath() +"/.qmmp/cache/skins");
     connect ( ui.listWidget, SIGNAL ( itemClicked ( QListWidgetItem* ) ),
               this, SLOT ( changeSkin() ) );
 }
@@ -150,13 +154,12 @@ void ConfigDialog::loadSkins()
 void ConfigDialog::findSkins(const QString &path)
 {
     QDir dir(path);
-    dir.setFilter ( QDir::Dirs );
+    dir.setFilter ( QDir::Dirs | QDir::NoDotAndDotDot);
     QList <QFileInfo> fileList = dir.entryInfoList();
-    if ( fileList.count() == 2 )
+    if ( fileList.count() == 0 )
         return;
-    for ( int i = 2; i < fileList.size(); ++i )
+    foreach (QFileInfo fileInfo, fileList)
     {
-        QFileInfo fileInfo = fileList.at ( i );
         QPixmap preview = Skin::getPixmap ( "main", QDir ( fileInfo.filePath() ) );
         if ( !preview.isNull() )
         {
diff --git a/src/skinreader.cpp b/src/skinreader.cpp
new file mode 100644
index 000000000..64e0aacc9
--- /dev/null
+++ b/src/skinreader.cpp
@@ -0,0 +1,144 @@
+/***************************************************************************
+ *   Copyright (C) 2006 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 <QDir>
+#include <QList>
+#include <QFileInfo>
+#include <QProcess>
+#include <QByteArray>
+#include <QFile>
+
+#include "skinreader.h"
+
+SkinReader::SkinReader(QObject *parent)
+        : QObject(parent)
+{
+    m_process = new QProcess(this);
+    //create cache dir
+    QDir dir(QDir::homePath() +"/.qmmp/");
+    dir.mkdir("cache");
+    dir.cd("cache");
+    dir.mkdir("skins");
+}
+
+
+SkinReader::~SkinReader()
+{}
+
+void SkinReader::updateCache()
+{
+    QDir dir(QDir::homePath() +"/.qmmp/skins");
+    dir.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks);
+    QFileInfoList f = dir.entryInfoList();
+    //clear removed skins from cache
+    QDir cache_dir(QDir::homePath() +"/.qmmp/cache/skins");
+    cache_dir.setFilter(QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot);
+    QFileInfoList d = cache_dir.entryInfoList();
+
+    foreach(QFileInfo dirInfo, d)
+    {
+        bool del = TRUE;
+        foreach(QFileInfo fileInfo, f)
+        {
+            if (fileInfo.baseName () == dirInfo.fileName ())
+            {
+                del = FALSE;
+                break;
+            }
+        }
+        if (del)
+        {
+            qDebug("SkinReader: deleting %s from cache",
+                   qPrintable(dirInfo.fileName ()));
+
+            cache_dir.cd(dirInfo.fileName ());
+            cache_dir.setFilter(QDir::Files | QDir::Hidden);
+            QFileInfoList removeList = cache_dir.entryInfoList();
+            foreach(QFileInfo to_remove, removeList)
+            cache_dir.remove(to_remove.fileName ());
+            cache_dir.cdUp();
+            cache_dir.rmdir(dirInfo.fileName ());
+        }
+    }
+    //add new skins to cache
+    foreach(QFileInfo fileInfo, f)
+    {
+        bool create = TRUE;
+        foreach(QFileInfo dirInfo, d)
+        {
+            if (fileInfo.baseName () == dirInfo.fileName ())
+            {
+                create = FALSE;
+                break;
+            }
+        }
+        if (create)
+        {
+            qDebug("SkinReader: adding %s to cache",
+                   qPrintable(fileInfo.fileName ()));
+            cache_dir.mkdir(fileInfo.baseName ());
+            QString name = fileInfo.fileName ().toLower();
+
+            if (name.endsWith(".tgz") || name.endsWith(".tar.gz"))
+                untar(fileInfo.filePath (), cache_dir.absolutePath ()+"/"+
+                      fileInfo.baseName ());
+            if (name.endsWith(".zip") || name.endsWith(".wsz"))
+                unzip(fileInfo.filePath (), cache_dir.absolutePath ()+"/"+
+                      fileInfo.baseName ());
+        }
+    }
+}
+
+void SkinReader::untar(const QString &from, const QString &to)
+{
+    QByteArray array;
+    QStringList args;
+    //list archive
+    args << "tf" <<from;
+    m_process->start("tar", args);
+    m_process->waitForFinished();
+    array = m_process->readAllStandardOutput ();
+    QString str = QString(array);
+    QStringList outputList = str.split("\n",QString::SkipEmptyParts);
+    foreach(QString str, outputList)
+    {
+        str = str.trimmed();
+        args.clear();
+        args << "xvfk" << from << "-O" << str;
+        m_process->start("tar", args);
+        m_process->waitForFinished();
+        array = m_process->readAllStandardOutput ();
+        QString name = str.right(str.size() - str.indexOf("/",Qt::CaseInsensitive) - 1).trimmed().toLower();
+
+        QFile file(to+"/"+name);
+        file.open(QIODevice::WriteOnly);
+        file.write(array);
+        file.close();
+    }
+}
+
+void SkinReader::unzip(const QString &from, const QString &to)
+{
+    QStringList args;
+    args << "-j" << "-o" << "-d" << to << from;
+    m_process->start("unzip", args);
+    m_process->waitForFinished();
+}
+
diff --git a/src/skinreader.h b/src/skinreader.h
new file mode 100644
index 000000000..c6db283fa
--- /dev/null
+++ b/src/skinreader.h
@@ -0,0 +1,46 @@
+/***************************************************************************
+ *   Copyright (C) 2006 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 SKINREADER_H
+#define SKINREADER_H
+
+#include <QObject>
+
+/**
+    @author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+class QProcess;
+
+class SkinReader : public QObject
+{
+    Q_OBJECT
+public:
+    SkinReader(QObject *parent = 0);
+
+    ~SkinReader();
+
+    void updateCache();
+
+private:
+    QProcess *m_process;
+    void untar(const QString &from, const QString &to);
+    void unzip(const QString &from, const QString &to);
+};
+
+#endif
diff --git a/src/src.pro b/src/src.pro
index 0e8baefe0..5b32d9aad 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -9,7 +9,7 @@ FORMS += configdialog.ui \
          preseteditor.ui \
          jumptotrackdialog.ui \
          aboutdialog.ui 
-         
+
 HEADERS += mainwindow.h \
            fileloader.h \
            button.h \
@@ -57,8 +57,8 @@ HEADERS += mainwindow.h \
            timeindicator.h \
            keyboardmanager.h \
            filedialog.h 
-           
-           
+
+
 SOURCES += mainwindow.cpp \
            mp3player.cpp \
            fileloader.cpp \
@@ -105,9 +105,9 @@ SOURCES += mainwindow.cpp \
            timeindicator.cpp \
            keyboardmanager.cpp \
            filedialog.cpp 
-           
-           
-           
+
+
+
 contains(CONFIG,XSPF_PLUGIN){
     message(*********************************************)
     message(*  XSPF support will be compiled as plugin  *)
@@ -141,6 +141,8 @@ script.path = /bin
 target.path = /bin
 INSTALLS += target script
 
-HEADERS += addurldialog.h
-SOURCES += addurldialog.cpp
+HEADERS += addurldialog.h \
+ skinreader.h
+SOURCES += addurldialog.cpp \
+ skinreader.cpp
 FORMS += addurldialog.ui