modified: browsemainwindow.cpp

[vlc-remote] / browsemainwindow.cpp

diff --git a/browsemainwindow.cpp b/browsemainwindow.cpp
index c561533..7bb6cbb 100644 (file)
--- a/browsemainwindow.cpp
+++ b/browsemainwindow.cpp
@@ -18,7 +18,6 @@
 #include "browsemainwindow.h"
 #include "ui_browsemainwindow.h"
 #include <QSettings>
-#include <QDebug>
 #include "configdialog.h"
 #include "aboutdialog.h"
 #include "vlcbrowseelement.h"
@@ -34,13 +33,12 @@ BrowseMainWindow::BrowseMainWindow(QWidget *parent) :
     setWindowTitle("Vlc remote");
 
     QSettings settings;
-
-    QString currentKey = settings.value("config/currentKey").toString();
-    mIp = settings.value("account/"+currentKey).toString();
-
+    mIp = settings.value("ip").toString();
 
     mNetManager = new QNetworkAccessManager(this);
 
+    mContents = new QList<VlcBrowseElement>();
+
     ui->playButton->setIcon(QIcon::fromTheme("camera_playback"));
     ui->addButton->setIcon(QIcon::fromTheme("general_add"));
     ui->browseButton->setIcon(QIcon::fromTheme("filemanager_media_folder"));
@@ -102,11 +100,11 @@ void BrowseMainWindow::onListSelectionChanged() {
 
 VlcBrowseElement BrowseMainWindow::getElementFromText(QString text) {
     //if (0 != QString::compare("", text)) {
-    for (int idx = 0; idx < mContents->count(); ++idx) {
-        if (0 == QString::compare(text, mContents->at(idx).name)) {
-            return mContents->at(idx);
+        for (int idx = 0; idx < mContents->count(); ++idx) {
+            if (0 == QString::compare(text, mContents->at(idx).name)) {
+                return mContents->at(idx);
+            }
         }
-    }
     //}
     return *(new VlcBrowseElement());
 }
@@ -117,15 +115,18 @@ void BrowseMainWindow::onBrowse() {
         // call browseDirectory
         this->browseDirectory(mCurrentElement.path);
     }
+    else {
+        ui->browseButton->setDisabled(true);
+    }
 }
 
 void BrowseMainWindow::onAddToPlaylist() {
     /*QNetworkReply * reply = */ mNetManager->get(QNetworkRequest(QUrl("http://"+mIp+"/requests/status.xml?command=in_enqueue&input=" + mCurrentElement.path)));
-                             }
+}
 
 void BrowseMainWindow::onPlay() {
     /*QNetworkReply * reply = */ mNetManager->get(QNetworkRequest(QUrl("http://"+mIp+"/requests/status.xml?command=in_play&input=" + mCurrentElement.path)));
-                             }
+}
 
 void BrowseMainWindow::browseDirectory(QString dir) {
     ui->listWidget->clear();
@@ -133,12 +134,17 @@ void BrowseMainWindow::browseDirectory(QString dir) {
     connect(reply,SIGNAL(readyRead()),this,SLOT(parseXmlDirectory()));
 }
 void BrowseMainWindow::parseXmlDirectory() {
+    qDebug() << "got called!";
     QNetworkReply * reply = qobject_cast<QNetworkReply*>(sender());
     QDomDocument doc;
     doc.setContent(reply->readAll());
     QDomElement docElem = doc.documentElement();
     QDomNodeList elements = docElem.elementsByTagName("element");
-    mContents = new QList<VlcBrowseElement>();
+    mContents->clear();
+    //mContents = new QList<VlcBrowseElement>();
+    // we can sort by filders then files alphabetically by running to lists and appending them at the end
+    // vlc alpha sorts everything in the incoming stream, we just need to seperate files from folders.
+    QList<VlcBrowseElement>* files = new QList<VlcBrowseElement>();
     if (0 < elements.count()) {
         int idx = 0;
         do {
@@ -151,9 +157,20 @@ void BrowseMainWindow::parseXmlDirectory() {
             dir->name = node.attributes().namedItem("name").nodeValue();
             dir->extension = node.attributes().namedItem("extension").nodeValue();
             ++idx;
-            this->mContents->append(*dir);
+            if (0 != QString::compare("directory", dir->type)) {
+                files->append(*dir);
+            }
+            else {
+                this->mContents->append(*dir);
+            }
+            delete dir;
         } while (idx < elements.count());
+        if (0 < files->count()) {
+            mContents->append(*files);
+        }
     }
+    delete files;
+    //reply->deleteLater();
     delete reply;
 
     // Update UI