Implement creation, deletion and switching of playlists (Idlists)

README

@@ -16,4 +16,4 @@ Compiling:
 
 Known bugs:
 	Tons of them.
-	
+

lib/lib.pro

@@ -8,6 +8,7 @@ OBJECTS_DIR = .obj
 SOURCES += xclient.cpp \
 		   xclientcache.cpp \
 		   xconfig.cpp \
+		   xcollection.cpp \
 		   playlistmodel.cpp \
 		   xmmsqt4.cpp
 
@@ -15,6 +16,7 @@ SOURCES += xclient.cpp \
 HEADERS += xclient.h \
 		   xclientcache.h \
 		   xconfig.h \
+		   xcollection.h \
 		   playlistmodel.h \
 		   xmmsqt4.h \
 		   debug.h

lib/xclient.cpp

@@ -24,6 +24,7 @@
 #include <QSettings>
 
 #include "xclient.h"
+#include "xcollection.h"
 #include "xmmsqt4.h"
 #include "debug.h"
 
@@ -74,6 +75,7 @@ XClient::XClient (QObject *parent, const std::string &name) : QObject (parent),
     m_isconnected = false;
 	m_cache = new XClientCache (this, this);
 	m_config = new XConfig (this, this);
+	m_collection = new XCollection (this);
 	m_name = name;
 }
 
@@ -128,7 +130,7 @@ try_again:
 		    qWarning ("Couldn't establish sync connection!");
 	    }
     }
-    
+
     m_isconnected = true;
 	emit gotConnection (this);
 

lib/xclient.h

@@ -32,6 +32,7 @@ class XClient;
 #include "xconfig.h"
 
 class XConfig;
+class XCollection;
 
 /*
 class XSettings : public QObject
@@ -73,6 +74,10 @@ class XClient : public QObject {
 			return m_config;
 		};
 
+		XCollection *xcollection () const {
+			return m_collection;
+		}
+
 		const Xmms::Client *sync () const {
 			return &m_sync;
 		};
@@ -106,6 +111,7 @@ class XClient : public QObject {
 //		Xmms::Client *m_client;
 		XClientCache *m_cache;
 		XConfig *m_config;
+		XCollection *m_collection;
         bool m_isconnected;
 
 		Xmms::Client m_sync;

lib/xcollection.cpp

@@ -0,0 +1,145 @@
+/**
+ *  This file is a part of Promoe, an XMMS2 Client.
+ *
+ *  Copyright (C) 2008 Thomas Frauendorfer
+ *
+ *  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; version 2 of the License.
+ *
+ *  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.
+ */
+
+#include "xcollection.h"
+
+#include <QHash>
+#include <QString>
+
+XCollection::XCollection (XClient * client) : QObject ( client)
+{
+	m_client = client;
+
+	connect (client, SIGNAL (gotConnection (XClient *)),
+	         this, SLOT (on_connect (XClient *)));
+
+	if (client->isConnected ()) {
+		on_connect (client);
+	}
+}
+
+void
+XCollection::on_connect (XClient *client)
+{
+	client->collection ()->broadcastCollectionChanged ()
+	        (Xmms::bind (&XCollection::on_collection_modified, this));
+
+	client->collection ()->list ("Playlists")
+	        (Xmms::bind (&XCollection::handle_playlists_list, this));
+
+	m_client = client;
+}
+
+bool
+XCollection::on_collection_modified (const Xmms::Dict &value)
+{
+	QString newname = QString ();
+	QHash<QString, QVariant> tmp = XClient::convert_dict (value);
+	int type = tmp["type"].toInt ();
+	QString name = tmp["name"].toString ();
+
+	// FIXME: handle other namespaces than "Playlists"
+	if (tmp["namespace"].toString () != "Playlists") {
+		return true;
+	}
+
+	if (type == XMMS_COLLECTION_CHANGED_RENAME)
+		newname = tmp["newname"].toString ();
+
+	// FIXME: use namespace parameter
+	switch (type) {
+		case XMMS_COLLECTION_CHANGED_ADD:
+			m_playlists.append (name);
+			break;
+		case XMMS_COLLECTION_CHANGED_REMOVE:
+			m_playlists.removeAll (name);
+			break;
+		case XMMS_COLLECTION_CHANGED_RENAME:
+			m_playlists.removeAll (name);
+			m_playlists.append (newname);
+			break;
+		case XMMS_COLLECTION_CHANGED_UPDATE:
+			// do nothing here
+			break;
+		default:
+			qDebug ("Unhandled collection change type %i", type);
+	}
+
+	m_playlists.sort ();
+
+/*
+	qDebug ("---");
+	foreach (QString s, m_playlists) {
+		qDebug (s.toAscii ());
+	}
+*/
+
+	emit collectionModified (tmp["name"].toString (),
+	                         tmp["namespace"].toString (),
+							 type, newname);
+
+	return true;
+}
+
+bool
+XCollection::handle_playlists_list (const Xmms::List< std::string > &list)
+{
+	m_playlists.clear ();
+
+	for (list.first (); list.isValid (); ++list) {
+		m_playlists.append (XClient::stdToQ(*list));
+	}
+	m_playlists.sort ();
+
+	return true;
+}
+
+
+QStringList
+XCollection::list (QString ns) {
+	// FIXME: use the ns parameter.
+	// We will need to handle querying the serverside playlists bettter...
+	return m_playlists;
+}
+
+
+// FIXME: Probably should be in another file
+bool
+XCollection::setActivePlaylist (QString name) {
+	if (!m_client->isConnected ()) return false;
+
+	m_client->playlist ()->load (name.toStdString ());
+
+	return true;
+}
+
+// FIXME: should be done in a more generic way
+bool
+XCollection::addIdlist (QString name) {
+	if (!m_client->isConnected ()) return false;
+
+	m_client->playlist ()->create (name.toStdString ());
+
+	return true;
+}
+
+bool
+XCollection::remove (QString name, QString ns) {
+	if (!m_client->isConnected ()) return false;
+
+	m_client->collection ()->remove (name.toStdString (), ns.toAscii ());
+
+	return true;
+}

lib/xcollection.h

@@ -0,0 +1,51 @@
+/**
+ *  This file is a part of Promoe, an XMMS2 Client.
+ *
+ *  Copyright (C) 2008 Thomas Frauendorfer
+ *
+ *  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; version 2 of the License.
+ *
+ *  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.
+ */
+
+#ifndef __XCollection_H__
+#define __XCollection_H__
+
+#include "xclient.h"
+
+#include <QObject>
+class QString;
+class QStringList;
+
+class XCollection : public QObject
+{
+	Q_OBJECT
+
+	public:
+		XCollection (XClient *client);
+		QStringList list (QString ns = "Playlists");
+
+		bool setActivePlaylist (QString name);
+		bool addIdlist (QString name);
+		bool remove (QString name, QString ns);
+
+	signals:
+		void collectionModified (QString collection, QString ns, int type,
+		                         QString newname);
+
+	protected slots:
+		void on_connect (XClient *);
+
+	private:
+		bool on_collection_modified (const Xmms::Dict &value);
+		bool handle_playlists_list (const Xmms::List< std::string > &list);
+		XClient *m_client;
+		QStringList m_playlists;
+};
+
+#endif

lib/xconfig.cpp

@@ -49,7 +49,7 @@ XConfig::value_get (QString key)
 bool
 XConfig::value_set (QString key, QString val)
 {
-	/* Only send change request to server here
+	/* Only send change request to server from here
 	 * update of local cache will be done through handle_config_value_changed
 	 */
 	if (!m_client->isConnected ()) {

src/dialogs/dialogs.pri

@@ -0,0 +1,8 @@
+HEADERS += playlistchooser.h
+
+SOURCES += playlistchooser.cpp
+
+FORMS += playlistchooser.ui
+
+INCLUDEPATH += $$PWD
+DEPENDPATH += $$PWD

src/dialogs/playlistchooser.cpp

@@ -0,0 +1,132 @@
+/**
+ *  This file is a part of Promoe, an XMMS2 client
+ *
+ *  Copyright (C) 2008 Thomas Frauendorfer
+ *
+ *  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.
+ */
+
+// FIXME: because somewhere something with the includes is wrons, this line
+// is needed
+#include "XMMSHandler.h"
+
+#include <QRegExp>
+#include <QStringList>
+#include <QList>
+#include <QListWidgetItem>
+
+#include "playlistchooser.h"
+
+#include "xcollection.h"
+
+PlaylistChooser::PlaylistChooser (QWidget *parent, XCollection *coll)
+                                  : QDialog (parent)
+{
+	setupUi (this);
+	setAttribute (Qt::WA_DeleteOnClose);
+
+	m_collection = coll;
+
+	// FIXME: implement creation of new Playlists
+//	playlistCreateButton->setEnabled (false);
+//	playlistRemoveButton->setEnabled (false);
+
+	// fill the List with Playlistnames.
+	// Sort out playlists that start with '_'
+	QRegExp regex = QRegExp ("^[^_]");
+	QStringList lists = coll->list ("Playlists").filter (regex);
+	playlistsListWidget->setSortingEnabled (true);
+	playlistsListWidget->addItems (lists);
+	connect (coll, SIGNAL (collectionModified (QString, QString, int, QString)),
+	         this, SLOT (handle_playlists_modified (QString, QString, int,
+			                                       QString)));
+
+}
+
+void
+PlaylistChooser::handle_playlists_modified (QString name, QString ns,
+                                            int type, QString newname)
+{
+	if (ns != "Playlists") {
+		return;
+	}
+
+	switch (type) {
+		case XMMS_COLLECTION_CHANGED_ADD:
+			if (!name.startsWith("_")) {
+				playlistsListWidget->addItem(name);
+			}
+			break;
+		case XMMS_COLLECTION_CHANGED_REMOVE: {
+				QList<QListWidgetItem *> list
+				   = playlistsListWidget->findItems (name, Qt::MatchExactly);
+				if (!list.empty ()) {
+					// we should only have one exatly matching String
+					QListWidgetItem* item = list.first ();
+					int idx = playlistsListWidget->row (item);
+					item = playlistsListWidget->takeItem (idx);
+					delete item;
+				}
+			}
+			break;
+		case XMMS_COLLECTION_CHANGED_RENAME: {
+				// remove the old entry
+				QList<QListWidgetItem *> list
+				   = playlistsListWidget->findItems (name, Qt::MatchExactly);
+				if (!list.empty ()) {
+					// we should only have one exatly matching String
+					QListWidgetItem* item = list.first ();
+					int idx = playlistsListWidget->row (item);
+					item = playlistsListWidget->takeItem (idx);
+					delete item;
+				}
+				// and add the new one
+				if (!newname.startsWith("_")) {
+					playlistsListWidget->addItem(newname);
+				}
+			}
+			break;
+
+		default:
+			break;
+	}
+}
+
+
+void
+PlaylistChooser::on_playlistCreateButton_clicked ()
+{
+	QString name = playlistTextEdit->text ();
+	// only create new playlist, if it doesn't already exist
+	if (m_collection->list ("Playlists").contains (name)) return;
+
+	m_collection->addIdlist (name);
+}
+
+void
+PlaylistChooser::on_playlistRemoveButton_clicked ()
+{
+	QList<QListWidgetItem *> list = playlistsListWidget->selectedItems ();
+	if (list.empty ()) return; // nothing to do
+
+	// TODO: if we change the selectionmodel to multiselection,
+	// change this tp remove more than one item
+	QListWidgetItem* item = list.first ();
+	QString name = item->text ();
+	m_collection->remove (name, "Playlists");
+}
+
+void
+PlaylistChooser::on_playlistsListWidget_itemDoubleClicked (QListWidgetItem* item)
+{
+	QString name = item->text ();
+	m_collection->setActivePlaylist (name);
+}

src/dialogs/playlistchooser.h

@@ -0,0 +1,46 @@
+/**
+ *  This file is a part of Promoe, an XMMS2 client
+ *
+ *  Copyright (C) 2008 Thomas Frauendorfer
+ *
+ *  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.
+ */
+
+#ifndef __PLAYLISTCHOOSER_H__
+#define __PLAYLISTCHOOSER_H__
+
+#include "ui_playlistchooser.h"
+
+#include <QDialog>
+class QListWidgetItem;
+
+class XCollection;
+
+class PlaylistChooser : public QDialog,  private Ui::PlaylistChooser {
+	Q_OBJECT
+
+	public:
+		PlaylistChooser (QWidget *parent, XCollection *coll);
+
+
+	private slots:
+		void handle_playlists_modified (QString, QString, int, QString);
+
+		void on_playlistCreateButton_clicked ();
+		void on_playlistRemoveButton_clicked ();
+
+		void on_playlistsListWidget_itemDoubleClicked (QListWidgetItem* item);
+
+	private:
+		XCollection* m_collection;
+};
+
+#endif

src/dialogs/playlistchooser.ui

@@ -0,0 +1,108 @@
+<ui version="4.0" >
+ <class>PlaylistChooser</class>
+ <widget class="QDialog" name="PlaylistChooser" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>260</width>
+    <height>301</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Playlists</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QLineEdit" name="playlistTextEdit" />
+     </item>
+     <item>
+      <widget class="QPushButton" name="playlistCreateButton" >
+       <property name="text" >
+        <string>Create</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QListWidget" name="playlistsListWidget" >
+     <property name="verticalScrollBarPolicy" >
+      <enum>Qt::ScrollBarAsNeeded</enum>
+     </property>
+     <property name="horizontalScrollBarPolicy" >
+      <enum>Qt::ScrollBarAlwaysOff</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QPushButton" name="playlistRemoveButton" >
+       <property name="text" >
+        <string>Remove</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="closeButton" >
+       <property name="text" >
+        <string>Close</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>closeButton</sender>
+   <signal>clicked()</signal>
+   <receiver>PlaylistChooser</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>217</x>
+     <y>279</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>129</x>
+     <y>124</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>playlistsListWidget</sender>
+   <signal>currentTextChanged(QString)</signal>
+   <receiver>playlistTextEdit</receiver>
+   <slot>setText(QString)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>129</x>
+     <y>150</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>87</x>
+     <y>21</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

src/playlist/playlistwidget.cpp

@@ -26,6 +26,7 @@
 #include "playlistshade.h"
 #include "playlistmenu.h"
 #include "FileDialog.h"
+#include "playlistchooser.h"
 
 #include <QMouseEvent>
 #include <QPaintEvent>
@@ -277,6 +278,8 @@ PlaylistWidget::addButtons (void)
 							  Skin::PLS_LST_DEC);
 	b = new PlaylistMenuButton (m_lst, Skin::PLS_LST_NEW_0,
 								Skin::PLS_LST_NEW_1);
+	connect (b, SIGNAL (activated ()),
+	         this, SLOT(openPlaylistChooser ()));
 	b = new PlaylistMenuButton (m_lst, Skin::PLS_LST_SAV_0,
 								Skin::PLS_LST_SAV_1);
 	b = new PlaylistMenuButton (m_lst, Skin::PLS_LST_OPN_0,
@@ -505,3 +508,10 @@ PlaylistWidget::paintEvent (QPaintEvent *event)
 	paint.end ();
 }
 
+void
+PlaylistWidget::openPlaylistChooser ()
+{
+	XMMSHandler &client = XMMSHandler::getInstance ();
+	PlaylistChooser *tmp = new PlaylistChooser (this, client.xcollection ());
+	tmp->show ();
+}

src/playlist/playlistwidget.h

@@ -86,6 +86,9 @@ class PlaylistWidget : public QWidget {
 		void menuAddDir ();
 		void menuAddFile ();
 
+	protected slots:
+		void openPlaylistChooser ();
+
 	private:
 		void resizeEvent (QResizeEvent *event);
 		void paintEvent (QPaintEvent *event);

src/src.pri

@@ -2,6 +2,7 @@ include($$PWD/widgets/widgets.pri)
 include($$PWD/mainwindow/mainwindow.pri)
 include($$PWD/playlist/playlist.pri)
 include($$PWD/equalizer/equalizer.pri)
+include($$PWD/dialogs/dialogs.pri)
 
 HEADERS += PixWidget.h \
            Skin.h \