Differential D10831

Ported some services to Qt5/KF5
ClosedPublic
Actions

Authored by malteveerman on Feb 25 2018, 12:49 PM.

Details

Reviewers

markey

Group Reviewers

Amarok

Commits

R181:0d7ae231eea9: Ported some services to Qt5/KF5

Summary

This patch ports the ampache, magnatune, gpodder and opmldirectory services. I've laid some groundwork for the other services too, but they still have problems. For example: Jamendo has changed its API, which makes the service useless in its current form. Mp3tunes and lastfm don't work either, but I haven't yet investigated why.

Diff Detail

Repository

R181 Amarok

Branch

kf5

Lint

No Linters Available

Unit

No Unit Test Coverage

malteveerman requested review of this revision.Feb 25 2018, 12:49 PM

malteveerman created this revision.

I've created this revision against the wrong branch. How do I fix that?

In D10831#213580, @malteveerman wrote:

I've created this revision against the wrong branch. How do I fix that?

If this is one commit, you switch to kf5 branch and cherry-pick this commit. Alternatively, rebase this branch on upstream/kf5 to get any recent changes, switch to kf5 and git merge --ff-only .

A subsequent arc diff should then update the revision. That is assuming you work with arcanist.

gpodder service using mygpo-qt, which is still in a qt4 world

Even though it may not be available on every distro out there yet (for lack of consumers), libmygpo-qt-1.0.9 supports Qt5 already. At least clementine also makes use of it, but only in their qt5 branch.

Fixed branch and commit author

In D10831#213608, @asturmlechner wrote:

gpodder service using mygpo-qt, which is still in a qt4 world

Even though it may not be available on every distro out there yet (for lack of consumers), libmygpo-qt-1.0.9 supports Qt5 already. At least clementine also makes use of it, but only in their qt5 branch.

On Arch Linux the official package is still Qt4. There is a Qt5 package in the AUR but I didn't test that. Is there a cmake test we could use to build the plugin conditionally?

libmygpo-qt provides a pkgconfig file libmygpo-qt5.pc you can check for using pkg_check_modules

cleaned up CMakeLists.txt a bit
Reactivated gpodder service. Build support depends on this pr, though: https://github.com/gpodder/libmygpo-qt/pull/12

malteveerman edited the summary of this revision. (Show Details)Feb 25 2018, 4:47 PM

cleaned up CMakeLists.txt a bit
Reactivated gpodder service. Build support depends on this pr, though: https://github.com/gpodder/libmygpo-qt/pull/12

markey accepted this revision.Feb 26 2018, 7:26 PM

This revision is now accepted and ready to land.Feb 26 2018, 7:26 PM

markey closed this revision.Feb 26 2018, 7:26 PM

Large Diff

This large diff affects 133 files. Files without inline comments have been collapsed. Expand All Files

Revision Contents
Changeset List

		Path
M		CMakeLists.txt (42 lines)
D	M	cmake/modules/FindLibmygpo-qt.cmake (48 lines)
M		src/CMakeLists.txt (2 lines)
M		src/core/podcasts/PodcastImageFetcher.cpp (12 lines)
M		src/services/CMakeLists.txt (26 lines)
M		src/services/ampache/AddServerDialog.h (6 lines)
M		src/services/ampache/AddServerDialog.cpp (34 lines)
M		src/services/ampache/AmpacheAccountLogin.h (20 lines)
M		src/services/ampache/AmpacheAccountLogin.cpp (98 lines)
M		src/services/ampache/AmpacheConfig.h (3 lines)
M		src/services/ampache/AmpacheConfig.cpp (20 lines)
M		src/services/ampache/AmpacheMeta.h (7 lines)
M		src/services/ampache/AmpacheService.h (2 lines)
M		src/services/ampache/AmpacheService.cpp (10 lines)
M		src/services/ampache/AmpacheServiceCollection.h (10 lines)
M		src/services/ampache/AmpacheServiceCollection.cpp (33 lines)
M		src/services/ampache/AmpacheServiceQueryMaker.h (2 lines)
M		src/services/ampache/AmpacheServiceQueryMaker.cpp (72 lines)
M		src/services/ampache/AmpacheSettings.h (12 lines)
M		src/services/ampache/AmpacheSettings.cpp (25 lines)
M		src/services/ampache/CMakeLists.txt (113 lines)
M		src/services/ampache/LastfmInfoParser.cpp (8 lines)
M		src/services/ampache/NewServerWidget.ui (18 lines)
M		src/services/ampache/amarok_service_ampache.desktop (1 line)
M		src/services/gpodder/CMakeLists.txt (158 lines)
M		src/services/gpodder/GpodderConfigWidget.ui (10 lines)
M		src/services/gpodder/GpodderPodcastMeta.h (4 lines)
M		src/services/gpodder/GpodderPodcastMeta.cpp (4 lines)
M		src/services/gpodder/GpodderPodcastRequestHandler.h (2 lines)
M		src/services/gpodder/GpodderPodcastRequestHandler.cpp (1 line)
M		src/services/gpodder/GpodderPodcastTreeItem.h (2 lines)
M		src/services/gpodder/GpodderProvider.h (8 lines)
M		src/services/gpodder/GpodderProvider.cpp (106 lines)
M		src/services/gpodder/GpodderService.h (5 lines)
M		src/services/gpodder/GpodderService.cpp (39 lines)
M		src/services/gpodder/GpodderServiceConfig.h (12 lines)
M		src/services/gpodder/GpodderServiceConfig.cpp (32 lines)
M		src/services/gpodder/GpodderServiceModel.h (4 lines)
M		src/services/gpodder/GpodderServiceModel.cpp (23 lines)
M		src/services/gpodder/GpodderServiceSettings.h (16 lines)
M		src/services/gpodder/GpodderServiceSettings.cpp (43 lines)
M		src/services/gpodder/GpodderTagTreeItem.h (2 lines)
M		src/services/gpodder/GpodderTreeItem.h (4 lines)
M		src/services/gpodder/GpodderTreeItem.cpp (4 lines)
M		src/services/gpodder/amarok_service_gpodder.desktop (1 line)
M		src/services/jamendo/CMakeLists.txt (7 lines)
M		src/services/jamendo/JamendoDatabaseHandler.cpp (2 lines)
M		src/services/jamendo/JamendoInfoParser.cpp (2 lines)
M		src/services/jamendo/JamendoMeta.cpp (6 lines)
M		src/services/jamendo/JamendoService.cpp (46 lines)
M		src/services/jamendo/JamendoXmlParser.h (3 lines)
M		src/services/jamendo/JamendoXmlParser.cpp (10 lines)
M		src/services/jamendo/amarok_service_jamendo.desktop (1 line)
M		src/services/lastfm/AvatarDownloader.h (2 lines)
M		src/services/lastfm/CMakeLists.txt (45 lines)
M		src/services/lastfm/LastFmConfigWidget.ui (10 lines)
M		src/services/lastfm/LastFmService.h (8 lines)
M		src/services/lastfm/LastFmService.cpp (56 lines)
M		src/services/lastfm/LastFmServiceCollection.cpp (8 lines)
M		src/services/lastfm/LastFmServiceConfig.h (4 lines)
M		src/services/lastfm/LastFmServiceConfig.cpp (26 lines)
M		src/services/lastfm/LastFmServiceSettings.cpp (36 lines)
M		src/services/lastfm/LastFmTreeModel.cpp (43 lines)
M		src/services/lastfm/LastFmTreeView.h (2 lines)
M		src/services/lastfm/LastFmTreeView.cpp (15 lines)
M		src/services/lastfm/LoveTrackAction.cpp (2 lines)
M		src/services/lastfm/ScrobblerAdapter.cpp (18 lines)
M		src/services/lastfm/SimilarArtistsAction.cpp (4 lines)
M		src/services/lastfm/SynchronizationAdapter.cpp (14 lines)
M		src/services/lastfm/SynchronizationTrack.cpp (12 lines)
M		src/services/lastfm/amarok_lastfm_shared_export.h (8 lines)
M		src/services/lastfm/amarok_service_lastfm.desktop (1 line)
M		src/services/lastfm/biases/LastFmBias.cpp (30 lines)
M		src/services/lastfm/biases/WeeklyTopBias.cpp (26 lines)
M		src/services/lastfm/meta/LastFmMeta.h (2 lines)
M		src/services/lastfm/meta/LastFmMeta.cpp (17 lines)
M		src/services/lastfm/meta/LastFmMeta_p.h (7 lines)
M		src/services/lastfm/meta/LastFmMultiPlayableCapability.h (2 lines)
M		src/services/lastfm/meta/LastFmMultiPlayableCapability.cpp (13 lines)
M		src/services/magnatune/CMakeLists.txt (18 lines)
M		src/services/magnatune/MagnatuneActions.cpp (4 lines)
M		src/services/magnatune/MagnatuneAlbumDownloader.h (20 lines)
M		src/services/magnatune/MagnatuneAlbumDownloader.cpp (59 lines)
M		src/services/magnatune/MagnatuneCollectionLocation.cpp (10 lines)
M		src/services/magnatune/MagnatuneConfig.cpp (13 lines)
M		src/services/magnatune/MagnatuneConfigWidget.ui (10 lines)
M		src/services/magnatune/MagnatuneDatabaseHandler.cpp (4 lines)
M		src/services/magnatune/MagnatuneDatabaseWorker.cpp (2 lines)
M		src/services/magnatune/MagnatuneDownloadDialog.h (6 lines)
M		src/services/magnatune/MagnatuneDownloadDialog.cpp (15 lines)
M		src/services/magnatune/MagnatuneDownloadHandler.cpp (14 lines)
M		src/services/magnatune/MagnatuneDownloadInfo.cpp (2 lines)
M		src/services/magnatune/MagnatuneInfoParser.cpp (22 lines)
M		src/services/magnatune/MagnatuneMeta.h (12 lines)
M		src/services/magnatune/MagnatuneMeta.cpp (29 lines)
M		src/services/magnatune/MagnatuneNeedUpdateWidget.cpp (4 lines)
M		src/services/magnatune/MagnatuneRedownloadDialog.h (6 lines)
M		src/services/magnatune/MagnatuneRedownloadDialog.cpp (9 lines)
M		src/services/magnatune/MagnatuneRedownloadHandler.h (6 lines)
M		src/services/magnatune/MagnatuneRedownloadHandler.cpp (27 lines)
M		src/services/magnatune/MagnatuneSettingsModule.cpp (20 lines)
M		src/services/magnatune/MagnatuneStore.h (16 lines)
M		src/services/magnatune/MagnatuneStore.cpp (101 lines)
M		src/services/magnatune/MagnatuneUrlRunner.cpp (2 lines)
M		src/services/magnatune/MagnatuneXmlParser.cpp (14 lines)
M		src/services/magnatune/amarok_service_magnatunestore.desktop (2 lines)
M		src/services/mp3tunes/CMakeLists.txt (275 lines)
M		src/services/mp3tunes/Mp3tunesConfig.cpp (29 lines)
M		src/services/mp3tunes/Mp3tunesHarmonyHandler.cpp (4 lines)
M		src/services/mp3tunes/Mp3tunesMeta.h (4 lines)
M		src/services/mp3tunes/Mp3tunesMeta.cpp (9 lines)
M		src/services/mp3tunes/Mp3tunesService.cpp (47 lines)
M		src/services/mp3tunes/Mp3tunesServiceCollection.cpp (2 lines)
M		src/services/mp3tunes/Mp3tunesServiceCollectionLocation.cpp (2 lines)
M		src/services/mp3tunes/Mp3tunesServiceQueryMaker.cpp (22 lines)
M		src/services/mp3tunes/Mp3tunesSettingsModule.cpp (12 lines)
M		src/services/mp3tunes/Mp3tunesWorkers.h (6 lines)
M		src/services/mp3tunes/Mp3tunesWorkers.cpp (24 lines)
M		src/services/mp3tunes/amarok_service_mp3tunes.desktop (1 line)
M		src/services/mp3tunes/harmonydaemon/Mp3tunesHarmonyDaemon.h (6 lines)
M		src/services/mp3tunes/harmonydaemon/Mp3tunesHarmonyDaemon.cpp (39 lines)
M		src/services/mp3tunes/harmonydaemon/main.cpp (65 lines)
M		src/services/opmldirectory/AddOpmlWidget.ui (8 lines)
M		src/services/opmldirectory/CMakeLists.txt (5 lines)
M		src/services/opmldirectory/OpmlDirectoryInfoParser.h (1 line)
M		src/services/opmldirectory/OpmlDirectoryInfoParser.cpp (10 lines)
M		src/services/opmldirectory/OpmlDirectoryMeta.h (4 lines)
M		src/services/opmldirectory/OpmlDirectoryModel.h (3 lines)
M		src/services/opmldirectory/OpmlDirectoryModel.cpp (36 lines)
M		src/services/opmldirectory/OpmlDirectoryService.h (3 lines)
M		src/services/opmldirectory/OpmlDirectoryService.cpp (33 lines)
M		src/services/opmldirectory/OpmlDirectoryView.cpp (3 lines)
M		src/services/opmldirectory/amarok_service_opmldirectory.desktop (1 line)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	28016	4b9a4e8		Feb 25 2018, 12:35 PM	★	★
Diff 2	28020	4b9a4e8	Fixed branch and commit author	Feb 25 2018, 1:10 PM	★	★
Diff 3	28042	4b9a4e8	- cleaned up CMakeLists.txt a bit	Feb 25 2018, 4:45 PM	★	★
Diff 4	28043	4b9a4e8	- cleaned up CMakeLists.txt a bit	Feb 25 2018, 4:52 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
10ba6f71edbc	d19593fb658b	b9ec7b76e117	Malte Veerman	Reactivated gpodder service. Build support depends on this pr, though: https… (Show More…)	Feb 25 2018, 4:45 PM
b9ec7b76e117	8358d8e77711	2ca1b8bdd00c	Malte Veerman	cleaned up CMakeLists.txt a bit	Feb 25 2018, 4:43 PM
2ca1b8bdd00c	3975ab8cb2b1	4b9a4e88c9f6	Malte Veerman	ported services. they still need a lot of love, though.	Feb 9 2018, 6:16 AM

Ported some services to Qt5/KF5ClosedPublicActions

Details

Diff Detail

Large Diff

Revision ContentsChangeset List

Diff 28043

CMakeLists.txt

cmake/modules/FindLibmygpo-qt.cmake

src/CMakeLists.txt

src/core/podcasts/PodcastImageFetcher.cpp

src/services/CMakeLists.txt

src/services/ampache/AddServerDialog.h

src/services/ampache/AddServerDialog.cpp

src/services/ampache/AmpacheAccountLogin.h

src/services/ampache/AmpacheAccountLogin.cpp

src/services/ampache/AmpacheConfig.h

src/services/ampache/AmpacheConfig.cpp

src/services/ampache/AmpacheMeta.h

src/services/ampache/AmpacheService.h

src/services/ampache/AmpacheService.cpp

src/services/ampache/AmpacheServiceCollection.h

src/services/ampache/AmpacheServiceCollection.cpp

src/services/ampache/AmpacheServiceQueryMaker.h

src/services/ampache/AmpacheServiceQueryMaker.cpp

src/services/ampache/AmpacheSettings.h

src/services/ampache/AmpacheSettings.cpp

src/services/ampache/CMakeLists.txt

src/services/ampache/LastfmInfoParser.cpp

src/services/ampache/NewServerWidget.ui

src/services/ampache/amarok_service_ampache.desktop

src/services/gpodder/CMakeLists.txt

src/services/gpodder/GpodderConfigWidget.ui

src/services/gpodder/GpodderPodcastMeta.h

src/services/gpodder/GpodderPodcastMeta.cpp

src/services/gpodder/GpodderPodcastRequestHandler.h

src/services/gpodder/GpodderPodcastRequestHandler.cpp

src/services/gpodder/GpodderPodcastTreeItem.h

src/services/gpodder/GpodderProvider.h

src/services/gpodder/GpodderProvider.cpp

src/services/gpodder/GpodderService.h

src/services/gpodder/GpodderService.cpp

src/services/gpodder/GpodderServiceConfig.h

src/services/gpodder/GpodderServiceConfig.cpp

src/services/gpodder/GpodderServiceModel.h

src/services/gpodder/GpodderServiceModel.cpp

src/services/gpodder/GpodderServiceSettings.h

src/services/gpodder/GpodderServiceSettings.cpp

src/services/gpodder/GpodderTagTreeItem.h

src/services/gpodder/GpodderTreeItem.h

src/services/gpodder/GpodderTreeItem.cpp

src/services/gpodder/amarok_service_gpodder.desktop

src/services/jamendo/CMakeLists.txt

src/services/jamendo/JamendoDatabaseHandler.cpp

src/services/jamendo/JamendoInfoParser.cpp

src/services/jamendo/JamendoMeta.cpp

src/services/jamendo/JamendoService.cpp

src/services/jamendo/JamendoXmlParser.h

src/services/jamendo/JamendoXmlParser.cpp

src/services/jamendo/amarok_service_jamendo.desktop

src/services/lastfm/AvatarDownloader.h

src/services/lastfm/CMakeLists.txt

src/services/lastfm/LastFmConfigWidget.ui

src/services/lastfm/LastFmService.h

src/services/lastfm/LastFmService.cpp

src/services/lastfm/LastFmServiceCollection.cpp

src/services/lastfm/LastFmServiceConfig.h

src/services/lastfm/LastFmServiceConfig.cpp

src/services/lastfm/LastFmServiceSettings.cpp

src/services/lastfm/LastFmTreeModel.cpp

src/services/lastfm/LastFmTreeView.h

src/services/lastfm/LastFmTreeView.cpp

src/services/lastfm/LoveTrackAction.cpp

src/services/lastfm/ScrobblerAdapter.cpp

src/services/lastfm/SimilarArtistsAction.cpp

src/services/lastfm/SynchronizationAdapter.cpp

src/services/lastfm/SynchronizationTrack.cpp

src/services/lastfm/amarok_lastfm_shared_export.h

src/services/lastfm/amarok_service_lastfm.desktop

src/services/lastfm/biases/LastFmBias.cpp

src/services/lastfm/biases/WeeklyTopBias.cpp

Ported some services to Qt5/KF5
ClosedPublic
Actions

Revision Contents
Changeset List