Merge pull request mixxxdj#15798 from daladim/fixed_rhythmbox_imports

Fixed rhythmbox imports

Author: daschuer

src/library/rhythmbox/rhythmboxfeature.cpp

@@ -97,8 +97,8 @@ RhythmboxFeature::~RhythmboxFeature() {
 }
 
 std::unique_ptr<BaseSqlTableModel>
-RhythmboxFeature::createPlaylistModelForPlaylist(const QVariant& data) {
-    VERIFY_OR_DEBUG_ASSERT(data.canConvert<QString>()) {
+RhythmboxFeature::createPlaylistModelForPlaylist(const QVariant& playlist_name) {
+    VERIFY_OR_DEBUG_ASSERT(playlist_name.canConvert<QString>()) {
         return {};
     }
     auto pModel = std::make_unique<BaseExternalPlaylistModel>(this,
@@ -107,7 +107,7 @@ RhythmboxFeature::createPlaylistModelForPlaylist(const QVariant& data) {
             "rhythmbox_playlists",
             "rhythmbox_playlist_tracks",
             m_trackSource);
-    pModel->setPlaylist(data.toString());
+    pModel->setPlaylist(playlist_name.toString());
     return pModel;
 }
 
@@ -250,8 +250,10 @@ TreeItem* RhythmboxFeature::importPlaylists() {
             if (attr.value("type").toString() == "static") {
                 QString playlist_name = attr.value("name").toString();
 
-                //Construct the childmodel
-                rootItem->appendChild(playlist_name);
+                // Construct the childmodel
+                // For Rhythmbox, the playlist name _is_ the unique identifier,
+                // so we're using it for both the label and data.
+                rootItem->appendChild(playlist_name, playlist_name);
 
                 //Execute SQL statement
                 query_insert_to_playlists.bindValue(":name", playlist_name);
@@ -266,7 +268,9 @@ TreeItem* RhythmboxFeature::importPlaylists() {
                 int playlist_id = query_insert_to_playlists.lastInsertId().toInt();
 
                 //Process playlist entries
+                ScopedTransaction transaction(m_database);
                 importPlaylist(xml, query_insert_to_playlist_tracks, playlist_id);
+                transaction.commit();
             }
         }
     }

src/library/rhythmbox/rhythmboxfeature.h

@@ -33,7 +33,7 @@ class RhythmboxFeature : public BaseExternalLibraryFeature {
 
   protected:
     std::unique_ptr<BaseSqlTableModel> createPlaylistModelForPlaylist(
-            const QVariant& data) override;
+            const QVariant& playlist_name) override;
 
   private:
     // Removes all rows from a given table