[multimedia/amarok] src: Remove a number of useless X-KDE-Amarok fields from plugin JSONs
Tuomas Nurmi <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit af52934d20f0516b7630cbcb240e291b4c79d5e3 by Tuomas Nurmi.
Committed on 30/07/2026 at 08:57.
Pushed by nurmi into branch 'master'.
Remove a number of useless X-KDE-Amarok fields from plugin JSONs
They all seem to be unused, and the data is either default value or duplicate of
some other field in the respective JSON. No idea when/if they've had any
function.
M +0 -7 src/PluginManager.cpp
M +1 -10 src/core-impl/collections/audiocd/amarok_collection-audiocdcollection.json
M +1 -10 src/core-impl/collections/daap/amarok_collection-daapcollection.json
M +0 -9 src/core-impl/collections/db/sql/mysqlcollection/amarok_collection-mysqlcollection.json
M +1 -10 src/core-impl/collections/ipodcollection/amarok_collection-ipodcollection.json
M +1 -10 src/core-impl/collections/mediadevicecollection/amarok_collection-mediadevicecollection.json
M +1 -10 src/core-impl/collections/mtpcollection/amarok_collection-mtpcollection.json
M +1 -10 src/core-impl/collections/playdarcollection/amarok_collection-playdarcollection.json
M +1 -10 src/core-impl/collections/umscollection/amarok_collection-umscollection.json
M +0 -9 src/core-impl/storage/sql/mysqlestorage/amarok_storage-mysqlestorage.json
M +0 -9 src/core-impl/storage/sql/mysqlserverstorage/amarok_storage-mysqlserverstorage.json
M +1 -10 src/importers/amarok/amarok_importer-amarok.json
M +1 -10 src/importers/banshee/amarok_importer-banshee.json
M +1 -10 src/importers/clementine/amarok_importer-clementine.json
M +1 -10 src/importers/fastforward/amarok_importer-fastforward.json
M +1 -10 src/importers/itunes/amarok_importer-itunes.json
M +1 -10 src/importers/rhythmbox/amarok_importer-rhythmbox.json
M +0 -9 src/services/ampache/amarok_service_ampache.json
M +0 -15 src/services/gpodder/amarok_service_gpodder.json
M +1 -10 src/services/jamendo/amarok_service_jamendo.json
M +0 -9 src/services/lastfm/amarok_service_lastfm.json
M +0 -9 src/services/magnatune/amarok_service_magnatunestore.json
M +0 -9 src/services/mp3tunes/amarok_service_mp3tunes.json
M +1 -10 src/services/opmldirectory/amarok_service_opmldirectory.json
https://invent.kde.org/multimedia/amarok/-/commit/af52934d20f0516b7630cbcb240e291b4c79d5e3
diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp
index e2095f4521..80faf2fc35 100644
--- a/src/PluginManager.cpp
+++ b/src/PluginManager.cpp
@@ -230,7 +230,6 @@ Plugins::PluginManager::isPluginEnabled( const KPluginMetaData &plugin ) const
auto raw = plugin.rawData();
int version = raw.value( QStringLiteral("X-KDE-Amarok-framework-version") ).toInt();
- int rank = raw.value( QStringLiteral("X-KDE-Amarok-rank") ).toInt();
if( version != s_pluginFrameworkVersion )
{
@@ -239,12 +238,6 @@ Plugins::PluginManager::isPluginEnabled( const KPluginMetaData &plugin ) const
return false;
}
- if( rank == 0 )
- {
- warning() << "Plugin" << plugin.pluginId() << "has rank 0";
- return false;
- }
-
auto vital = raw.value( QStringLiteral( "X-KDE-Amarok-vital" ) );
if( !vital.isUndefined())
diff --git a/src/core-impl/collections/audiocd/amarok_collection-audiocdcollection.json b/src/core-impl/collections/audiocd/amarok_collection-audiocdcollection.json
index a0540903ce..58fae92a19 100644
--- a/src/core-impl/collections/audiocd/amarok_collection-audiocdcollection.json
+++ b/src/core-impl/collections/audiocd/amarok_collection-audiocdcollection.json
@@ -136,14 +136,5 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Nikolaj Hald Nielsen"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
- "X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "audiocd-collection",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1
+ "X-KDE-Amarok-framework-version": 88
}
diff --git a/src/core-impl/collections/daap/amarok_collection-daapcollection.json b/src/core-impl/collections/daap/amarok_collection-daapcollection.json
index 401170bb2b..45c786b917 100644
--- a/src/core-impl/collections/daap/amarok_collection-daapcollection.json
+++ b/src/core-impl/collections/daap/amarok_collection-daapcollection.json
@@ -140,14 +140,5 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Maximilian Kossick"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
- "X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "daap-collection",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1
+ "X-KDE-Amarok-framework-version": 88
}
diff --git a/src/core-impl/collections/db/sql/mysqlcollection/amarok_collection-mysqlcollection.json b/src/core-impl/collections/db/sql/mysqlcollection/amarok_collection-mysqlcollection.json
index 300635d05d..f604be9f26 100644
--- a/src/core-impl/collections/db/sql/mysqlcollection/amarok_collection-mysqlcollection.json
+++ b/src/core-impl/collections/db/sql/mysqlcollection/amarok_collection-mysqlcollection.json
@@ -125,15 +125,6 @@
"Version": "1.0"
},
"NoDisplay": "true",
- "X-KDE-Amarok-authors": [
- "Maximilian Kossick"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
"X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "mysql-collection",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1,
"X-KDE-Amarok-vital": true
}
diff --git a/src/core-impl/collections/ipodcollection/amarok_collection-ipodcollection.json b/src/core-impl/collections/ipodcollection/amarok_collection-ipodcollection.json
index 09d547f4d1..045ea173c6 100644
--- a/src/core-impl/collections/ipodcollection/amarok_collection-ipodcollection.json
+++ b/src/core-impl/collections/ipodcollection/amarok_collection-ipodcollection.json
@@ -129,14 +129,5 @@
],
"Version": "2.0"
},
- "X-KDE-Amarok-authors": [
- "Matěj Laitl"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
- "X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "ipod-collection",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1
+ "X-KDE-Amarok-framework-version": 88
}
diff --git a/src/core-impl/collections/mediadevicecollection/amarok_collection-mediadevicecollection.json b/src/core-impl/collections/mediadevicecollection/amarok_collection-mediadevicecollection.json
index d236b7fbda..4470deb58f 100644
--- a/src/core-impl/collections/mediadevicecollection/amarok_collection-mediadevicecollection.json
+++ b/src/core-impl/collections/mediadevicecollection/amarok_collection-mediadevicecollection.json
@@ -140,14 +140,5 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Alejandro Wainzinger"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
- "X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "mediadevice-collection",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1
+ "X-KDE-Amarok-framework-version": 88
}
diff --git a/src/core-impl/collections/mtpcollection/amarok_collection-mtpcollection.json b/src/core-impl/collections/mtpcollection/amarok_collection-mtpcollection.json
index a63a259c11..3ddfbf0fbd 100644
--- a/src/core-impl/collections/mtpcollection/amarok_collection-mtpcollection.json
+++ b/src/core-impl/collections/mtpcollection/amarok_collection-mtpcollection.json
@@ -139,14 +139,5 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Alejandro Wainzinger"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
- "X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "mtp-collection",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1
+ "X-KDE-Amarok-framework-version": 88
}
diff --git a/src/core-impl/collections/playdarcollection/amarok_collection-playdarcollection.json b/src/core-impl/collections/playdarcollection/amarok_collection-playdarcollection.json
index 7eaec52a2e..f6a14637e0 100644
--- a/src/core-impl/collections/playdarcollection/amarok_collection-playdarcollection.json
+++ b/src/core-impl/collections/playdarcollection/amarok_collection-playdarcollection.json
@@ -130,14 +130,5 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Andrew Coder"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
- "X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "playdar-collection",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1
+ "X-KDE-Amarok-framework-version": 88
}
diff --git a/src/core-impl/collections/umscollection/amarok_collection-umscollection.json b/src/core-impl/collections/umscollection/amarok_collection-umscollection.json
index e38931bf57..f436e3ba19 100644
--- a/src/core-impl/collections/umscollection/amarok_collection-umscollection.json
+++ b/src/core-impl/collections/umscollection/amarok_collection-umscollection.json
@@ -101,14 +101,5 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Alejandro Wainzinger"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
- "X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "ums-collection",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1
+ "X-KDE-Amarok-framework-version": 88
}
diff --git a/src/core-impl/storage/sql/mysqlestorage/amarok_storage-mysqlestorage.json b/src/core-impl/storage/sql/mysqlestorage/amarok_storage-mysqlestorage.json
index eb8c147352..04f4f68c6d 100644
--- a/src/core-impl/storage/sql/mysqlestorage/amarok_storage-mysqlestorage.json
+++ b/src/core-impl/storage/sql/mysqlestorage/amarok_storage-mysqlestorage.json
@@ -125,15 +125,6 @@
"Version": "1.0"
},
"NoDisplay": "true",
- "X-KDE-Amarok-authors": [
- "Ralf Engels"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
"X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "mysqle-storage",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1,
"X-KDE-Amarok-vital": true
}
diff --git a/src/core-impl/storage/sql/mysqlserverstorage/amarok_storage-mysqlserverstorage.json b/src/core-impl/storage/sql/mysqlserverstorage/amarok_storage-mysqlserverstorage.json
index ff296cef3f..fd9dbdd8c2 100644
--- a/src/core-impl/storage/sql/mysqlserverstorage/amarok_storage-mysqlserverstorage.json
+++ b/src/core-impl/storage/sql/mysqlserverstorage/amarok_storage-mysqlserverstorage.json
@@ -125,15 +125,6 @@
"Version": "1.0"
},
"NoDisplay": "true",
- "X-KDE-Amarok-authors": [
- "Ralf Engels"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
"X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "mysqlserver-storage",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1,
"X-KDE-Amarok-vital": true
}
diff --git a/src/importers/amarok/amarok_importer-amarok.json b/src/importers/amarok/amarok_importer-amarok.json
index a88d92c565..6b2a6d8fac 100644
--- a/src/importers/amarok/amarok_importer-amarok.json
+++ b/src/importers/amarok/amarok_importer-amarok.json
@@ -124,14 +124,5 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Konrad Zemek"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
- "X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "AmarokImporter",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1
+ "X-KDE-Amarok-framework-version": 88
}
diff --git a/src/importers/banshee/amarok_importer-banshee.json b/src/importers/banshee/amarok_importer-banshee.json
index 88a412a9c3..394a489b4c 100644
--- a/src/importers/banshee/amarok_importer-banshee.json
+++ b/src/importers/banshee/amarok_importer-banshee.json
@@ -124,14 +124,5 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Konrad Zemek"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
- "X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "BansheeImporter",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1
+ "X-KDE-Amarok-framework-version": 88
}
diff --git a/src/importers/clementine/amarok_importer-clementine.json b/src/importers/clementine/amarok_importer-clementine.json
index 2da808c15d..f66cf7dcb2 100644
--- a/src/importers/clementine/amarok_importer-clementine.json
+++ b/src/importers/clementine/amarok_importer-clementine.json
@@ -124,14 +124,5 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Konrad Zemek"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
- "X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "ClementineImporter",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1
+ "X-KDE-Amarok-framework-version": 88
}
diff --git a/src/importers/fastforward/amarok_importer-fastforward.json b/src/importers/fastforward/amarok_importer-fastforward.json
index 2ac5afdb02..142b51d915 100644
--- a/src/importers/fastforward/amarok_importer-fastforward.json
+++ b/src/importers/fastforward/amarok_importer-fastforward.json
@@ -124,14 +124,5 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Konrad Zemek"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
- "X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "FastForwardImporter",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1
+ "X-KDE-Amarok-framework-version": 88
}
diff --git a/src/importers/itunes/amarok_importer-itunes.json b/src/importers/itunes/amarok_importer-itunes.json
index 2da933d9b7..037c46e800 100644
--- a/src/importers/itunes/amarok_importer-itunes.json
+++ b/src/importers/itunes/amarok_importer-itunes.json
@@ -124,14 +124,5 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Konrad Zemek"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
- "X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "iTunesImporter",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1
+ "X-KDE-Amarok-framework-version": 88
}
diff --git a/src/importers/rhythmbox/amarok_importer-rhythmbox.json b/src/importers/rhythmbox/amarok_importer-rhythmbox.json
index 047ff951af..e3e41d7356 100644
--- a/src/importers/rhythmbox/amarok_importer-rhythmbox.json
+++ b/src/importers/rhythmbox/amarok_importer-rhythmbox.json
@@ -124,14 +124,5 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Konrad Zemek"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
- "X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "RhythmboxImporter",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1
+ "X-KDE-Amarok-framework-version": 88
}
diff --git a/src/services/ampache/amarok_service_ampache.json b/src/services/ampache/amarok_service_ampache.json
index 0fd3b1811a..42c4d928ad 100644
--- a/src/services/ampache/amarok_service_ampache.json
+++ b/src/services/ampache/amarok_service_ampache.json
@@ -137,15 +137,6 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Nikolaj Hald Nielsen"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
"X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "AmpacheService",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1,
"X-KDE-ConfigModule": "kcm_amarok_service_ampache"
}
diff --git a/src/services/gpodder/amarok_service_gpodder.json b/src/services/gpodder/amarok_service_gpodder.json
index 04590a7d05..8160bb0d46 100644
--- a/src/services/gpodder/amarok_service_gpodder.json
+++ b/src/services/gpodder/amarok_service_gpodder.json
@@ -134,21 +134,6 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Stefan Derkits",
- " Christian Wagner",
- " Felix Winter",
- " Lucas Lira Gomes"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]",
- " [email protected]",
- " [email protected]",
- " [email protected]"
- ],
"X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "gpodderService",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1,
"X-KDE-ConfigModule": "kcm_amarok_service_gpodder"
}
diff --git a/src/services/jamendo/amarok_service_jamendo.json b/src/services/jamendo/amarok_service_jamendo.json
index e0c12112ee..323f67a396 100644
--- a/src/services/jamendo/amarok_service_jamendo.json
+++ b/src/services/jamendo/amarok_service_jamendo.json
@@ -141,14 +141,5 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Nikolaj Hald Nielsen"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
- "X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "JamendoService",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1
+ "X-KDE-Amarok-framework-version": 88
}
diff --git a/src/services/lastfm/amarok_service_lastfm.json b/src/services/lastfm/amarok_service_lastfm.json
index 430a6acc8f..3bad15967f 100644
--- a/src/services/lastfm/amarok_service_lastfm.json
+++ b/src/services/lastfm/amarok_service_lastfm.json
@@ -138,15 +138,6 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Shane King"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
"X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "LastFmService",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1,
"X-KDE-ConfigModule": "kcm_amarok_service_lastfm"
}
diff --git a/src/services/magnatune/amarok_service_magnatunestore.json b/src/services/magnatune/amarok_service_magnatunestore.json
index 810d33a290..92363ed4a3 100644
--- a/src/services/magnatune/amarok_service_magnatunestore.json
+++ b/src/services/magnatune/amarok_service_magnatunestore.json
@@ -141,15 +141,6 @@
],
"Version": "2.0"
},
- "X-KDE-Amarok-authors": [
- "Nikolaj Hald Nielsen"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
"X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "MagnatuneStore",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1,
"X-KDE-ConfigModule": "kcm_amarok_service_magnatunestore"
}
diff --git a/src/services/mp3tunes/amarok_service_mp3tunes.json b/src/services/mp3tunes/amarok_service_mp3tunes.json
index 1b6e454f7f..9f193fa4cb 100644
--- a/src/services/mp3tunes/amarok_service_mp3tunes.json
+++ b/src/services/mp3tunes/amarok_service_mp3tunes.json
@@ -135,15 +135,6 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Nikolaj Hald Nielsen"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
"X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "Mp3tunesService",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1,
"X-KDE-ConfigModule": "kcm_amarok_service_mp3tunes"
}
diff --git a/src/services/opmldirectory/amarok_service_opmldirectory.json b/src/services/opmldirectory/amarok_service_opmldirectory.json
index 8ba4f64b0e..b17c7451ac 100644
--- a/src/services/opmldirectory/amarok_service_opmldirectory.json
+++ b/src/services/opmldirectory/amarok_service_opmldirectory.json
@@ -136,14 +136,5 @@
],
"Version": "1.0"
},
- "X-KDE-Amarok-authors": [
- "Nikolaj Hald Nielsen"
- ],
- "X-KDE-Amarok-email": [
- "[email protected]"
- ],
- "X-KDE-Amarok-framework-version": 88,
- "X-KDE-Amarok-name": "JamendoService",
- "X-KDE-Amarok-rank": 100,
- "X-KDE-Amarok-version": 1
+ "X-KDE-Amarok-framework-version": 88
}