Added Playlist support (remote playlists)

[vlc-remote] / browsemainwindow.cpp

diff --git a/browsemainwindow.cpp b/browsemainwindow.cpp
index 27b84b2..c87713e 100644 (file)
--- a/browsemainwindow.cpp
+++ b/browsemainwindow.cpp
@@ -55,6 +55,7 @@ BrowseMainWindow::BrowseMainWindow(QWidget *parent) :
     connect(ui->playButton,SIGNAL(clicked()),this,SLOT(onPlay()));
     connect(ui->listWidget, SIGNAL(itemSelectionChanged()), this, SLOT(onListSelectionChanged()));
 
+    connect(ui->actionGoUserHome, SIGNAL(triggered()), this, SLOT(showUserHomeFolder()));
     connect(ui->actionGoHome, SIGNAL(triggered()), this, SLOT(showHomeFolder()));
     connect(ui->actionSetHome, SIGNAL(triggered()), this, SLOT(setHomeFolder()));
     connect(ui->actionViewFavourites, SIGNAL(triggered()), this, SLOT(showFavourites()));
@@ -98,6 +99,9 @@ void BrowseMainWindow::changeEvent(QEvent *e)
 void BrowseMainWindow::showHomeFolder() {
     browseDirectory(AppSettings::getHomeDirectory().path);
 }
+void BrowseMainWindow::showUserHomeFolder() {
+    browseDirectory("~/");
+}
 void BrowseMainWindow::setHomeFolder() {
     if (0 < mCurrentDir.length()) {
         VlcDirectory dir;
@@ -123,7 +127,7 @@ void BrowseMainWindow::onListSelectionChanged() {
         }
         else {
             // can we browse?
-            if (0 == QString::compare("directory", mCurrentElement.type)) {
+            if (0 == QString::compare("directory", mCurrentElement.type) || 0 == QString::compare("dir", mCurrentElement.type)) {
                 ui->browseButton->setDisabled(false);
             }
             else {
@@ -148,7 +152,7 @@ VlcBrowseElement BrowseMainWindow::getElementFromText(QString text) {
 
 void BrowseMainWindow::onBrowse() {
     // check for directory
-    if (0 == QString::compare("directory", mCurrentElement.type)) {
+    if (0 == QString::compare("directory", mCurrentElement.type) || 0 == QString::compare("dir", mCurrentElement.type)) {
         // call browseDirectory
         mCurrentDir = mCurrentElement.path;
         browseDirectory(mCurrentDir);
@@ -160,14 +164,14 @@ void BrowseMainWindow::onBrowse() {
 
 void BrowseMainWindow::onAddToPlaylist() {
     QUrl url = QUrl("http://"+mIp+"/requests/status.xml?command=in_enqueue");
-    url.addEncodedQueryItem(QByteArray("input"), QUrl::toPercentEncoding(mCurrentElement.path.replace("\\", "\\\\")));
+    url.addEncodedQueryItem(QByteArray("input"), QUrl::toPercentEncoding(mCurrentElement.path.replace("\\", "\\\\").replace("'", "\\'")));
     mNetManager->get(QNetworkRequest(url));
     //mNetManager->get(QNetworkRequest(QUrl("http://"+mIp+"/requests/status.xml?command=in_enqueue&input=" + mCurrentElement.path.replace("\\", "\\\\"))));
 }
 
 void BrowseMainWindow::onPlay() {
     QUrl url = QUrl("http://"+mIp+"/requests/status.xml?command=in_play");
-    url.addEncodedQueryItem(QByteArray("input"), QUrl::toPercentEncoding(mCurrentElement.path.replace("\\", "\\\\")));
+    url.addEncodedQueryItem(QByteArray("input"), QUrl::toPercentEncoding(mCurrentElement.path.replace("\\", "\\\\").replace("'", "\\'")));
     mNetManager->get(QNetworkRequest(url));
     //mNetManager->get(QNetworkRequest(QUrl("http://"+mIp+"/requests/status.xml?command=in_play&input=" + mCurrentElement.path.replace("\\", "\\\\"))));
 }
@@ -178,11 +182,17 @@ void BrowseMainWindow::browseDirectory(QString dir) {
     url.addEncodedQueryItem(QByteArray("dir"), QUrl::toPercentEncoding(dir));
     QNetworkReply * reply = mNetManager->get(QNetworkRequest(url));
     //QNetworkReply * reply =  mNetManager->get(QNetworkRequest(QUrl("http://"+mIp+"/requests/browse.xml?dir=" + dir.replace("&", "%26").replace("\\", "\\\\"))));
+#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
+    this->setAttribute(Qt::WA_Maemo5ShowProgressIndicator, true);
+#endif
     connect(reply,SIGNAL(readyRead()),this,SLOT(readReady()));
     connect(reply,SIGNAL(error(QNetworkReply::NetworkError)),this,SLOT(error(QNetworkReply::NetworkError)));
     connect(mNetManager,SIGNAL(finished(QNetworkReply *)),this,SLOT(finished(QNetworkReply *)));
 }
 void BrowseMainWindow::error(QNetworkReply::NetworkError code) {
+#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
+    this->setAttribute(Qt::WA_Maemo5ShowProgressIndicator, false);
+#endif
     qDebug() << code;
 }
 void BrowseMainWindow::readReady() {
@@ -195,6 +205,10 @@ void BrowseMainWindow::finished(QNetworkReply * reply) {
     this->parseXmlDirectory();
     // only interested in finished signals
     disconnect(mNetManager,SIGNAL(finished(QNetworkReply *)),this,SLOT(finished(QNetworkReply *)));
+#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
+    this->setAttribute(Qt::WA_Maemo5ShowProgressIndicator, false);
+#endif
+    delete reply;
 }
 void BrowseMainWindow::parseXmlDirectory() {
     QDomDocument doc;
@@ -217,7 +231,7 @@ void BrowseMainWindow::parseXmlDirectory() {
             dir->name = node.attributes().namedItem("name").nodeValue();
             dir->extension = getExtension(dir->path, node.attributes().namedItem("extension").nodeValue());
             ++idx;
-            if (0 != QString::compare("directory", dir->type)) {
+            if (0 != QString::compare("directory", dir->type) && 0 != QString::compare("dir", dir->type)) {
                 files->append(*dir);
             }
             else if (0 == QString::compare("..", dir->name)) {
@@ -261,15 +275,6 @@ QString BrowseMainWindow::getExtension(QString path, QString extension) {
     }
 }
 
-void BrowseMainWindow::writeFile(QString path, QByteArray text) {
-    QFile file(path);
-    if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
-        return;
-
-    QTextStream out(&file);
-    out << text;
-}
-
 void BrowseMainWindow::updateList() {
     ui->listWidget->clear();
     int ct = this->mContents->count();
@@ -281,12 +286,13 @@ void BrowseMainWindow::updateList() {
         QIcon icon_image  = QIcon::fromTheme("general_image");
         QIcon icon_flash  = QIcon::fromTheme("filemanager_flash_file");
         QIcon icon_real   = QIcon::fromTheme("filemanager_real_music");
+        QIcon icon_playl  = QIcon::fromTheme("filemanager_playlist");
         QIcon icon_unknown= QIcon::fromTheme("filemanager_unknown_file");
         for (int idx = 0; idx < ct; ++idx) {
             VlcBrowseElement dir = mContents->at(idx);
             QListWidgetItem* item;
             bool item_good = false;
-            if (0 == QString::compare("directory", dir.type)) {
+            if (0 == QString::compare("directory", dir.type) || 0 == QString::compare("dir", dir.type)) {
                 if (0 == QString::compare("..", dir.name)) {
                     item = new QListWidgetItem(icon_up, dir.name, ui->listWidget, 0);
                     item_good = true;
@@ -314,6 +320,15 @@ void BrowseMainWindow::updateList() {
                     item_good = true;
                     item = new QListWidgetItem(icon_audio, dir.name, ui->listWidget, 0); // .mp3, .m4a, .ogg, .oga, .wav, .flac
                 }
+                else if ( 0 == QString::compare(dir.extension, "m3u")  ||
+                          0 == QString::compare(dir.extension, "wpl")  ||
+                          0 == QString::compare(dir.extension, "pls")  ||
+                          0 == QString::compare(dir.extension, "asx")  ||
+                          0 == QString::compare(dir.extension, "xspf") ||
+                          0 == QString::compare(dir.extension, "cmml")  ) {
+                    item_good = true;
+                    item = new QListWidgetItem(icon_playl, dir.name, ui->listWidget, 0); // .m3u, .wpl, .pls, .asx, .xspf, .cmml
+                }
                 else if ( 0 == QString::compare(dir.extension, "avi")  ||
                           0 == QString::compare(dir.extension, "mpeg") ||
                           0 == QString::compare(dir.extension, "mpg")  ||