Changeset 148

Timestamp:

10/25/08 00:38:06 (4 years ago)

Author:

roeland

Message:

Files are now orderd before we pack it (by track number).

Location:

gui

Files:

• musiclibraryitem.cpp (modified) (1 diff)
• musiclibraryitem.h (modified) (1 diff)
• musiclibrarymodel.cpp (modified) (3 diffs)
• musiclibrarymodel.h (modified) (1 diff)

gui/musiclibraryitem.cpp

@@ -24 +24 @@
 {
     childItems.append(item);
+}
+
+void MusicLibraryItem::removeAllChildrens()
+{
+    while (!childItems.empty()) {
+        childItems.takeLast();
+    }
+}
+
+/**
+ * Insert a new child item at a given place
+ *
+ * @param child The child item
+ * @param place The place to insert the child item
+ */
+void MusicLibraryItem::insertChild(MusicLibraryItem * const child, const int place)
+{
+    childItems.insert(place, child);
 }
 

gui/musiclibraryitem.h

@@ -18 +18 @@
 
         void appendChild(MusicLibraryItem * const child);
+        void insertChild(MusicLibraryItem * const child, const int place);
+        void removeAllChildrens();
 
         MusicLibraryItem *child(int row) const;

gui/musiclibrarymodel.cpp

@@ -305 +305 @@
         return Qt::ItemIsDropEnabled;
 }
-#include <QDebug>
+
 /**
 * Convert the data at indexes into mimedata ready for transport
@@ -326 +326 @@
             case MusicLibraryItem::Type_Artist:
                 for(int i = 0; i < item->childCount(); i++) {
-                    for(int j = 0; j < item->child(i)->childCount(); j++) {
-                        if (!filenames.contains(item->child(i)->child(j)->file()))
-                            filenames << item->child(i)->child(j)->file();
-                    }
+                    filenames << sortAlbumTracks(item->child(i));
                 }
                 break;
             case MusicLibraryItem::Type_Album:
-                for(int i = 0; i < item->childCount(); i++) {
-                    if (!filenames.contains(item->child(i)->file()))
-                        filenames << item->child(i)->file();
-                }
+                filenames << sortAlbumTracks(item);
                 break;
             case MusicLibraryItem::Type_Song:
@@ -349 +343 @@
     }
 
-    for (int i = filenames.size() - 1; i >= 0; i--)
+    for (int i = filenames.size() - 1; i >= 0; i--) {
         stream << filenames.at(i);
+    }
 
     mimeData->setData("application/qtmpc_songs_filename_text", encodedData);
     return mimeData;
 }
+
+/**
+ * Sort an album by its track numbers. All unnumberd tracks are added to the end
+ *
+ * @param album The album musiclibrary item
+ */
+QStringList MusicLibraryModel::sortAlbumTracks(const MusicLibraryItem *album) const
+{
+    if (album->type() != MusicLibraryItem::Type_Album) {
+        return QStringList();
+    }
+
+    MusicLibraryItem *orderdTracks = new MusicLibraryItem("Album", MusicLibraryItem::Type_Album);
+    QStringList unorderdTracks;
+
+    for(int i = 0; i < album->childCount(); i++) {
+        MusicLibraryItem *track = album->child(i);
+        if (track->track() == (quint32)0) {
+            unorderdTracks << track->file();
+        }
+
+        bool insert = false;
+        for(int j = 0; j < orderdTracks->childCount(); j++) {
+            if (track->track() < orderdTracks->child(j)->track()) {
+                orderdTracks->insertChild(track, j);
+                insert = true;
+                break;
+            }
+        }
+
+        if (insert == false) {
+            orderdTracks->insertChild(track, orderdTracks->childCount());
+        }
+    }
+
+    QStringList tracks;
+    for (int i = 0; i < orderdTracks->childCount(); i++) {
+        tracks << orderdTracks->child(i)->file();
+    }
+    tracks << unorderdTracks;
+
+    orderdTracks->removeAllChildrens();
+    delete orderdTracks;
+    return tracks;
+}

gui/musiclibrarymodel.h

@@ -38 +38 @@
         MusicLibraryItem *rootItem;
         QSettings settings;
+        QStringList sortAlbumTracks(const MusicLibraryItem *album) const;
 };