streamlined plugin system
4b19048bab54
Actions

Authored by malteveerman on Oct 22 2017, 1:39 PM.

Description

streamlined plugin system

Summary:
This is the first big change in my patchset.
Metadata is being baked into the plugins. No more need for each plugin to create its own KPluginData from a .desktop file in its constructor.
PluginLoader determines the plugin category by using qobject_cast.
Plugin factories no longer get their own factories with K_PLUGIN_FACTORY. They just implement the AmarokPluginFactory interface.
I also changed SqlCollection to get passed around as a QSharedPointer. This fixed another crash for me.

Reviewers: Amarok, markey

Reviewed By: Amarok, markey

Subscribers: markey

Differential Revision: https://phabricator.kde.org/D8229

Details

Committed

markey

Oct 22 2017, 6:07 PM

Reviewer

Amarok

Differential Revision

D8229: streamlined plugin system

Parents

R181:dcb859b8df66: some crash and hang fixes

Branches

Unknown

Tags

Unknown

markey committed R181:4b19048bab54: streamlined plugin system (authored by malteveerman).Oct 22 2017, 6:07 PM

Changes (155)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			src/CMakeLists.txt
	M			src/PluginManager.cpp
	M			src/PluginManager.h
	V			src/{amarok-plugin.desktop ← amarok_plugin.desktop}
	V			src/{amarok_plugin.desktop → amarok-plugin.desktop}
	M			src/amarokurls/AmarokUrl.cpp
	M			src/amarokurls/BookmarkModel.cpp
	M			src/configdialog/dialogs/PluginsConfig.h
	M			src/core-impl/collections/audiocd/AudioCdCollection.cpp
	M			src/core-impl/collections/audiocd/AudioCdCollection.h
	M			src/core-impl/collections/audiocd/amarok_collection-audiocdcollection.desktop
	M			src/core-impl/collections/daap/DaapCollection.cpp
	M			src/core-impl/collections/daap/DaapCollection.h
	M			src/core-impl/collections/daap/amarok_collection-daapcollection.desktop
	M			src/core-impl/collections/db/MountPointManager.cpp
	M			src/core-impl/collections/db/MountPointManager.h
	M			src/core-impl/collections/db/sql/DatabaseUpdater.cpp
	M			src/core-impl/collections/db/sql/SqlCollection.cpp
	M			src/core-impl/collections/db/sql/SqlCollection.h
	M			src/core-impl/collections/db/sql/SqlCollectionFactory.cpp
	M			src/core-impl/collections/db/sql/SqlCollectionFactory.h
	M			src/core-impl/collections/db/sql/SqlMeta.cpp
	M			src/core-impl/collections/db/sql/SqlMeta.h
	M			src/core-impl/collections/db/sql/SqlQueryMaker.cpp
	M			src/core-impl/collections/db/sql/SqlReadLabelCapability.cpp
	M			src/core-impl/collections/db/sql/SqlReadLabelCapability.h
	M			src/core-impl/collections/db/sql/SqlRegistry.cpp
	M			src/core-impl/collections/db/sql/SqlRegistry_p.h
	M			src/core-impl/collections/db/sql/SqlScanResultProcessor.cpp
	M			src/core-impl/collections/db/sql/SqlWriteLabelCapability.cpp
	M			src/core-impl/collections/db/sql/SqlWriteLabelCapability.h
	M			src/core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.cpp
	M			src/core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.h
	M			src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.cpp
	M			src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.h
	M			src/core-impl/collections/db/sql/device/smb/SmbDeviceHandler.cpp
	M			src/core-impl/collections/db/sql/device/smb/SmbDeviceHandler.h
	M			src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
	M			src/core-impl/collections/db/sql/mysqlcollection/MySqlCollectionFactory.cpp
	M			src/core-impl/collections/db/sql/mysqlcollection/MySqlCollectionFactory.h
	M			src/core-impl/collections/db/sql/mysqlcollection/amarok_collection-mysqlcollection.desktop
	M			src/core-impl/collections/ipodcollection/IpodCollectionFactory.cpp
	M			src/core-impl/collections/ipodcollection/IpodCollectionFactory.h
	M			src/core-impl/collections/ipodcollection/amarok_collection-ipodcollection.desktop
	M			src/core-impl/collections/mediadevicecollection/MediaDeviceCollection.cpp
	M			src/core-impl/collections/mediadevicecollection/MediaDeviceCollection.h
	M			src/core-impl/collections/mediadevicecollection/amarok_collection-mediadevicecollection.desktop
	M			src/core-impl/collections/mtpcollection/MtpCollection.cpp
	M			src/core-impl/collections/mtpcollection/MtpCollection.h
	M			src/core-impl/collections/mtpcollection/amarok_collection-mtpcollection.desktop
	M			src/core-impl/collections/nepomukcollection/amarok_collection-nepomukcollection.desktop
	M			src/core-impl/collections/playdarcollection/PlaydarCollection.cpp
	M			src/core-impl/collections/playdarcollection/PlaydarCollection.h
	M			src/core-impl/collections/playdarcollection/amarok_collection-playdarcollection.desktop
	M			src/core-impl/collections/support/CollectionManager.cpp
	M			src/core-impl/collections/umscollection/UmsCollection.cpp
	M			src/core-impl/collections/umscollection/UmsCollection.h
	M			src/core-impl/collections/umscollection/amarok_collection-umscollection.desktop
	M			src/core-impl/collections/upnpcollection/UpnpCollectionFactory.cpp
	M			src/core-impl/collections/upnpcollection/UpnpCollectionFactory.h
	M			src/core-impl/collections/upnpcollection/amarok_collection-upnpcollection.desktop
	M			src/core-impl/podcasts/sql/SqlPodcastMeta.cpp
	M			src/core-impl/podcasts/sql/SqlPodcastProvider.cpp
	M			src/core-impl/storage/StorageManager.cpp
	M			src/core-impl/storage/StorageManager.h
	M			src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt
	M			src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorageFactory.cpp
	M			src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorageFactory.h
	M			src/core-impl/storage/sql/mysqlestorage/amarok_storage-mysqlestorage.desktop
	M			src/core-impl/storage/sql/mysqlserverstorage/CMakeLists.txt
	M			src/core-impl/storage/sql/mysqlserverstorage/MySqlServerStorageFactory.cpp
	M			src/core-impl/storage/sql/mysqlserverstorage/MySqlServerStorageFactory.h
	M			src/core-impl/storage/sql/mysqlserverstorage/amarok_storage-mysqlserverstorage.desktop
	M			src/core-impl/support/TagStatisticsStore.cpp
	M			src/core-impl/support/UrlStatisticsStore.cpp
	M			src/core/collections/Collection.cpp
	M			src/core/collections/Collection.h
	M			src/core/storage/StorageFactory.cpp
	M			src/core/storage/StorageFactory.h
	M			src/core/support/PluginFactory.cpp
	M			src/core/support/PluginFactory.h
	M			src/importers/ImporterManager.cpp
	M			src/importers/ImporterManager.h
	M			src/importers/SimpleImporterManager.h
	M			src/importers/amarok/AmarokManager.cpp
	M			src/importers/amarok/AmarokManager.h
	M			src/importers/amarok/amarok_importer-amarok.desktop
	M			src/importers/banshee/BansheeManager.cpp
	M			src/importers/banshee/amarok_importer-banshee.desktop
	M			src/importers/clementine/ClementineManager.cpp
	M			src/importers/clementine/amarok_importer-clementine.desktop
	M			src/importers/fastforward/FastForwardManager.cpp
	M			src/importers/fastforward/amarok_importer-fastforward.desktop
	M			src/importers/itunes/ITunesManager.cpp
	M			src/importers/itunes/amarok_importer-itunes.desktop
	M			src/importers/rhythmbox/RhythmboxManager.cpp
	M			src/importers/rhythmbox/amarok_importer-rhythmbox.desktop
	M			src/playlistmanager/file/PlaylistFileProvider.h
	M			src/playlistmanager/sql/SqlPlaylist.cpp
	M			src/playlistmanager/sql/SqlPlaylistGroup.cpp
	M			src/playlistmanager/sql/SqlUserPlaylistProvider.cpp
	M			src/services/ServiceBase.cpp
	M			src/services/ServiceBase.h
	M			src/services/ServiceSqlCollection.cpp
	M			src/services/ServiceSqlQueryMaker.cpp
	M			src/services/ampache/AmpacheService.cpp
	M			src/services/ampache/AmpacheService.h
	M			src/services/ampache/AmpacheServiceQueryMaker.cpp
	M			src/services/ampache/AmpacheSettings.cpp
	M			src/services/ampache/amarok_service_ampache.desktop
	M			src/services/ampache/amarok_service_ampache_config.desktop
	M			src/services/gpodder/GpodderService.cpp
	M			src/services/gpodder/GpodderService.h
	M			src/services/gpodder/amarok_service_gpodder.desktop
	M			src/services/jamendo/JamendoDatabaseHandler.cpp
	M			src/services/jamendo/JamendoService.cpp
	M			src/services/jamendo/JamendoService.h
	M			src/services/jamendo/amarok_service_jamendo.desktop
	M			src/services/lastfm/LastFmService.cpp
	M			src/services/lastfm/LastFmService.h
	M			src/services/lastfm/amarok_service_lastfm.desktop
	M			src/services/magnatune/MagnatuneDatabaseHandler.cpp
	M			src/services/magnatune/MagnatuneDatabaseWorker.cpp
	M			src/services/magnatune/MagnatuneSettingsModule.cpp
	M			src/services/magnatune/MagnatuneStore.cpp
	M			src/services/magnatune/MagnatuneStore.h
	M			src/services/magnatune/amarok_service_magnatunestore.desktop
	M			src/services/mp3tunes/Mp3tunesService.cpp
	M			src/services/mp3tunes/Mp3tunesService.h
	M			src/services/mp3tunes/amarok_service_mp3tunes.desktop
	M			src/services/opmldirectory/OpmlDirectoryService.cpp
	M			src/services/opmldirectory/OpmlDirectoryService.h
	M			src/services/opmldirectory/amarok_service_opmldirectory.desktop
	M			src/statsyncing/Controller.h
	M			src/statsyncing/Provider.h
	M			src/statsyncing/ProviderFactory.cpp
	M			src/statsyncing/ProviderFactory.h
	M			src/statsyncing/ScrobblingService.h
	M			tests/core-impl/collections/db/sql/SqlMountPointManagerMock.h
	M			tests/core-impl/collections/db/sql/TestDatabaseUpdater.cpp
	M			tests/core-impl/collections/db/sql/TestDatabaseUpdater.h
	M			tests/core-impl/collections/db/sql/TestSqlAlbum.cpp
	M			tests/core-impl/collections/db/sql/TestSqlAlbum.h
	M			tests/core-impl/collections/db/sql/TestSqlArtist.cpp
	M			tests/core-impl/collections/db/sql/TestSqlArtist.h
	M			tests/core-impl/collections/db/sql/TestSqlCollection.cpp
	M			tests/core-impl/collections/db/sql/TestSqlCollection.h
	M			tests/core-impl/collections/db/sql/TestSqlCollectionLocation.cpp
	M			tests/core-impl/collections/db/sql/TestSqlCollectionLocation.h
	M			tests/core-impl/collections/db/sql/TestSqlQueryMaker.cpp
	M			tests/core-impl/collections/db/sql/TestSqlQueryMaker.h
	M			tests/core-impl/collections/db/sql/TestSqlScanManager.cpp
	M			tests/core-impl/collections/db/sql/TestSqlScanManager.h
	M			tests/core-impl/collections/db/sql/TestSqlTrack.cpp
	M			tests/core-impl/collections/db/sql/TestSqlTrack.h

streamlined plugin system4b19048bab54Actions

Description

Details

Changes (155)Show All Changes

Very Large Commit

R181:4b19048bab54

src/CMakeLists.txt

src/PluginManager.cpp

src/PluginManager.h

src/amarok-plugin.desktop

src/amarok_plugin.desktop

src/amarokurls/AmarokUrl.cpp

src/amarokurls/BookmarkModel.cpp

src/configdialog/dialogs/PluginsConfig.h

src/core-impl/collections/audiocd/AudioCdCollection.cpp

src/core-impl/collections/audiocd/AudioCdCollection.h

src/core-impl/collections/audiocd/amarok_collection-audiocdcollection.desktop

src/core-impl/collections/daap/DaapCollection.cpp

src/core-impl/collections/daap/DaapCollection.h

src/core-impl/collections/daap/amarok_collection-daapcollection.desktop

src/core-impl/collections/db/MountPointManager.cpp

src/core-impl/collections/db/MountPointManager.h

src/core-impl/collections/db/sql/DatabaseUpdater.cpp

src/core-impl/collections/db/sql/SqlCollection.cpp

src/core-impl/collections/db/sql/SqlCollection.h

src/core-impl/collections/db/sql/SqlCollectionFactory.cpp

src/core-impl/collections/db/sql/SqlCollectionFactory.h

src/core-impl/collections/db/sql/SqlMeta.cpp

src/core-impl/collections/db/sql/SqlMeta.h

src/core-impl/collections/db/sql/SqlQueryMaker.cpp

src/core-impl/collections/db/sql/SqlReadLabelCapability.cpp

src/core-impl/collections/db/sql/SqlReadLabelCapability.h

src/core-impl/collections/db/sql/SqlRegistry.cpp

src/core-impl/collections/db/sql/SqlRegistry_p.h

src/core-impl/collections/db/sql/SqlScanResultProcessor.cpp

src/core-impl/collections/db/sql/SqlWriteLabelCapability.cpp

src/core-impl/collections/db/sql/SqlWriteLabelCapability.h

src/core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.cpp

src/core-impl/collections/db/sql/device/massstorage/MassStorageDeviceHandler.h

src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.cpp

src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.h

src/core-impl/collections/db/sql/device/smb/SmbDeviceHandler.cpp

src/core-impl/collections/db/sql/device/smb/SmbDeviceHandler.h

src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt

src/core-impl/collections/db/sql/mysqlcollection/MySqlCollectionFactory.cpp

src/core-impl/collections/db/sql/mysqlcollection/MySqlCollectionFactory.h

src/core-impl/collections/db/sql/mysqlcollection/amarok_collection-mysqlcollection.desktop

src/core-impl/collections/ipodcollection/IpodCollectionFactory.cpp

src/core-impl/collections/ipodcollection/IpodCollectionFactory.h

src/core-impl/collections/ipodcollection/amarok_collection-ipodcollection.desktop

src/core-impl/collections/mediadevicecollection/MediaDeviceCollection.cpp

src/core-impl/collections/mediadevicecollection/MediaDeviceCollection.h

src/core-impl/collections/mediadevicecollection/amarok_collection-mediadevicecollection.desktop

src/core-impl/collections/mtpcollection/MtpCollection.cpp

src/core-impl/collections/mtpcollection/MtpCollection.h

src/core-impl/collections/mtpcollection/amarok_collection-mtpcollection.desktop

src/core-impl/collections/nepomukcollection/amarok_collection-nepomukcollection.desktop

src/core-impl/collections/playdarcollection/PlaydarCollection.cpp

src/core-impl/collections/playdarcollection/PlaydarCollection.h

src/core-impl/collections/playdarcollection/amarok_collection-playdarcollection.desktop

src/core-impl/collections/support/CollectionManager.cpp

src/core-impl/collections/umscollection/UmsCollection.cpp

src/core-impl/collections/umscollection/UmsCollection.h

src/core-impl/collections/umscollection/amarok_collection-umscollection.desktop

src/core-impl/collections/upnpcollection/UpnpCollectionFactory.cpp

src/core-impl/collections/upnpcollection/UpnpCollectionFactory.h

src/core-impl/collections/upnpcollection/amarok_collection-upnpcollection.desktop

src/core-impl/podcasts/sql/SqlPodcastMeta.cpp

src/core-impl/podcasts/sql/SqlPodcastProvider.cpp

src/core-impl/storage/StorageManager.cpp

src/core-impl/storage/StorageManager.h

src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt

src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorageFactory.cpp

src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorageFactory.h

src/core-impl/storage/sql/mysqlestorage/amarok_storage-mysqlestorage.desktop

src/core-impl/storage/sql/mysqlserverstorage/CMakeLists.txt

src/core-impl/storage/sql/mysqlserverstorage/MySqlServerStorageFactory.cpp

src/core-impl/storage/sql/mysqlserverstorage/MySqlServerStorageFactory.h

src/core-impl/storage/sql/mysqlserverstorage/amarok_storage-mysqlserverstorage.desktop

src/core-impl/support/TagStatisticsStore.cpp

streamlined plugin system
4b19048bab54
Actions

Changes (155)
Show All Changes