Changeset 17 for lib/mpdparseutils.cpp

Timestamp:

12/30/07 20:55:36 (4 years ago)

Author:

sander

Message:

Lots of updates, the music library is now being showed in the tree view. Though it doesn't actually do anything yet.

File:

• lib/mpdparseutils.cpp (modified) (4 diffs)

lib/mpdparseutils.cpp

@@ -4 +4 @@
 
 
-MPDStatus * MPDParseUtils::parseStatus(const QByteArray * const data)
+void MPDParseUtils::parseStatus(const QByteArray * const data, MPDStatus &destStatus)
 {
-    MPDStatus *status = new MPDStatus;
-
     QList<QByteArray> lines = data->split('\n');
     QList<QByteArray> tokens;
@@ -15 +13 @@
 
         if(tokens.at(0) == "volume") {
-            status->volume = tokens.at(1).toUInt();
+            destStatus.volume = tokens.at(1).toUInt();
         } else if(tokens.at(0) == "repeat") {
             if(tokens.at(1) == "1") {
-                status->repeat = true;
+                destStatus.repeat = true;
             } else {
-                status->repeat = false;
+                destStatus.repeat = false;
             }
         } else if(tokens.at(0) == "random") {
             if(tokens.at(1) == "1") {
-                status->random = "1";
+                destStatus.random = "1";
             } else {
-                status->random = "0";
+                destStatus.random = "0";
             }
         } else if(tokens.at(0) == "playlist") {
-            status->playlist = tokens.at(1).toUInt();
+            destStatus.playlist = tokens.at(1).toUInt();
         } else if(tokens.at(0) == "playlistlength") {
-            status->playlistlength = tokens.at(1).toInt();
+            destStatus.playlistlength = tokens.at(1).toInt();
         } else if(tokens.at(0) == "playlistqueue") {
-            status->playlistqueue = tokens.at(1).toInt();
+            destStatus.playlistqueue = tokens.at(1).toInt();
         } else if(tokens.at(0) == "xfade") {
-            status->xfade = tokens.at(1).toInt();
+            destStatus.xfade = tokens.at(1).toInt();
         } else if(tokens.at(0) == "state") {
             if(tokens.at(1).contains("play")) {
-                status->state = MPDStatus::State_Playing;
+                destStatus.state = MPDStatus::State_Playing;
             } else if(tokens.at(1).contains("stop")) {
-                status->state = MPDStatus::State_Stopped;
+                destStatus.state = MPDStatus::State_Stopped;
             } else {
-                status->state = MPDStatus::State_Paused;
+                destStatus.state = MPDStatus::State_Paused;
             }
         } else if(tokens.at(0) == "song") {
-            status->song = tokens.at(1).toInt();
+            destStatus.song = tokens.at(1).toInt();
         } else if(tokens.at(0) == "songid") {
-            status->song_id = tokens.at(1).toInt();
+            destStatus.song_id = tokens.at(1).toInt();
         } else if(tokens.at(0) == "time") {
-            status->time_elapsed = tokens.at(1).toInt();
-            status->time_total = tokens.at(2).toInt();
+            destStatus.time_elapsed = tokens.at(1).toInt();
+            destStatus.time_total = tokens.at(2).toInt();
         } else if(tokens.at(0) == "bitrate") {
-            status->bitrate = tokens.at(1).toUInt();
+            destStatus.bitrate = tokens.at(1).toUInt();
         } else if(tokens.at(0) == "audio") {
         } else if(tokens.at(0) == "updating_db") {
-            status->updating_db = tokens.at(1).toInt();
+            destStatus.updating_db = tokens.at(1).toInt();
         } else if(tokens.at(0) == "error") {
-            status->error = tokens.at(1);
+            destStatus.error = tokens.at(1);
         }
     }
-
-    return status;
 }
 
@@ -77 +73 @@
             song->file = tokens.at(1);
         } else if(tokens.at(0) == "Time") {
+            song->time = tokens.at(1).toUInt();
         } else if(tokens.at(0) == "Album") {
-            song->album = tokens.at(1);
+            for(qint32 j = 1; j < tokens.size(); j++) {
+                if(j != 1 && j != tokens.size() - 1)
+                    song->album += ":";
+                song->album += tokens.at(j);
+            }
         } else if(tokens.at(0) == "Artist") {
-            song->artist = tokens.at(1);
+            for(qint32 j = 1; j < tokens.size(); j++) {
+                if(j != 1 && j != tokens.size() - 1)
+                    song->artist += ":";
+                song->artist += tokens.at(j);
+            }
         } else if(tokens.at(0) == "Title") {
-            song->title = tokens.at(1);
+            for(qint32 j = 1; j < tokens.size(); j++) {
+                if(j != 1 && j != tokens.size() - 1)
+                    song->title += ":";
+                song->title += tokens.at(j);
+            }
         } else if(tokens.at(0) == "Track") {
+            song->track = tokens.at(1).toInt();
         } else if(tokens.at(0) == "Pos") {
         } else if(tokens.at(0) == "Id") {
@@ -111 +121 @@
     return songs;
 }
+
+QList<MusicLibraryItem *> * MPDParseUtils::parseLibraryItems(const QByteArray * const data)
+{
+    QList<MusicLibraryItem *> *artists = new QList<MusicLibraryItem *>;
+    QByteArray currentItem;
+    MusicLibraryItem *artistItem, *albumItem, *songItem;
+    Song *currentSong;
+    bool found = false;
+
+    QList<QByteArray> lines = data->split('\n');
+
+    for(qint32 i = 0; i < lines.size(); i++) {
+        currentItem += lines.at(i);
+        currentItem += "\n";
+        if(i == lines.size() - 1 || lines.at(i + 1).startsWith("file:")) {
+            currentSong = parseSong(&currentItem);
+            currentItem.clear();
+
+            if(currentSong->isEmpty()) {
+                delete currentSong;
+                continue;
+            }
+
+            currentSong->fillEmptyFields();
+
+            // Check if artist already exists
+            for(qint32 i = 0; i < artists->size(); i++) {
+                if(artists->at(i)->data(0) == currentSong->artist) {
+                    artistItem = artists->at(i);
+                    found = true;
+                }
+            }
+
+            if(!found) {
+                artistItem = new MusicLibraryItem(currentSong->artist, MusicLibraryItem::Type_Artist);
+                artists->append(artistItem);
+            }
+
+            found = false;
+
+            // Check if album already exists
+            for(qint32 i = 0; i < artistItem->childCount(); i++) {
+                if(artistItem->child(i)->data(0) == currentSong->album) {
+                    albumItem = artistItem->child(i);
+                    found = true;
+                }
+            }
+
+            if(!found) {
+                albumItem = new MusicLibraryItem(currentSong->album, MusicLibraryItem::Type_Album, artistItem);
+                artistItem->appendChild(albumItem);
+            }
+
+            found = false;
+
+            // Add song to album (possibly in track order)
+            songItem = new MusicLibraryItem(currentSong->title, MusicLibraryItem::Type_Song, albumItem);
+            songItem->setFile(currentSong->file);
+            albumItem->appendChild(songItem);
+
+            delete currentSong;
+        }
+    }
+
+    return artists;
+}