From e421adf733034a360c7e6148c794d5648958729a Mon Sep 17 00:00:00 2001 From: Henk Kalkwater Date: Fri, 26 Mar 2021 21:27:35 +0100 Subject: [PATCH] WIP: Reimplementation of ListModels. --- core/CMakeLists.txt | 3 + core/GeneratedSources.cmake | 5 +- core/codegen/loader_header.hbs | 4 +- core/codegen/loader_implementation.hbs | 6 +- core/include/JellyfinQt/apiclient.h | 8 +- core/include/JellyfinQt/apimodel.h | 521 ++++++++++-------- .../dto/activitylogentryqueryresult.h | 7 +- core/include/JellyfinQt/dto/albuminfo.h | 7 +- core/include/JellyfinQt/dto/artistinfo.h | 7 +- .../dto/authenticationinfoqueryresult.h | 7 +- core/include/JellyfinQt/dto/baseitem.h | 7 +- core/include/JellyfinQt/dto/baseitemdto.h | 60 +- .../JellyfinQt/dto/baseitemdtoqueryresult.h | 7 +- .../JellyfinQt/dto/channelmappingoptionsdto.h | 19 +- core/include/JellyfinQt/dto/codecprofile.h | 13 +- .../include/JellyfinQt/dto/containerprofile.h | 7 +- .../JellyfinQt/dto/deviceidentification.h | 7 +- .../JellyfinQt/dto/deviceinfoqueryresult.h | 7 +- core/include/JellyfinQt/dto/deviceprofile.h | 42 +- core/include/JellyfinQt/dto/libraryoptions.h | 13 +- .../JellyfinQt/dto/libraryoptionsresultdto.h | 25 +- .../JellyfinQt/dto/librarytypeoptionsdto.h | 19 +- .../JellyfinQt/dto/listingsproviderinfo.h | 7 +- core/include/JellyfinQt/dto/livetvinfo.h | 7 +- core/include/JellyfinQt/dto/mediasourceinfo.h | 13 +- .../JellyfinQt/dto/metadataeditorinfo.h | 31 +- .../JellyfinQt/dto/notificationresultdto.h | 7 +- core/include/JellyfinQt/dto/packageinfo.h | 7 +- .../JellyfinQt/dto/playbackinforesponse.h | 7 +- .../JellyfinQt/dto/playbackprogressinfo.h | 6 +- .../JellyfinQt/dto/playbackstartinfo.h | 6 +- .../include/JellyfinQt/dto/playbackstopinfo.h | 6 +- core/include/JellyfinQt/dto/queryfilters.h | 7 +- .../JellyfinQt/dto/recommendationdto.h | 7 +- .../JellyfinQt/dto/remoteimageresult.h | 7 +- .../JellyfinQt/dto/remotesearchresult.h | 6 +- core/include/JellyfinQt/dto/responseprofile.h | 7 +- .../include/JellyfinQt/dto/searchhintresult.h | 7 +- .../dto/seriestimerinfodtoqueryresult.h | 7 +- .../JellyfinQt/dto/serverconfiguration.h | 24 +- core/include/JellyfinQt/dto/sessioninfo.h | 12 +- core/include/JellyfinQt/dto/systeminfo.h | 7 +- core/include/JellyfinQt/dto/taskinfo.h | 6 +- .../include/JellyfinQt/dto/thememediaresult.h | 7 +- .../JellyfinQt/dto/timerinfodtoqueryresult.h | 7 +- core/include/JellyfinQt/dto/typeoptions.h | 7 +- core/include/JellyfinQt/dto/userpolicy.h | 7 +- core/include/JellyfinQt/jellyfin.h | 1 + .../loader/http/addlistingprovider.h | 4 +- .../JellyfinQt/loader/http/addtunerhost.h | 4 +- .../JellyfinQt/loader/http/authenticateuser.h | 4 +- .../loader/http/authenticateuserbyname.h | 4 +- .../http/authenticatewithquickconnect.h | 4 +- core/include/JellyfinQt/loader/http/connect.h | 4 +- .../JellyfinQt/loader/http/createcollection.h | 4 +- .../JellyfinQt/loader/http/createplaylist.h | 4 +- .../JellyfinQt/loader/http/createuserbyname.h | 4 +- .../loader/http/deleteuseritemrating.h | 4 +- .../JellyfinQt/loader/http/forgotpassword.h | 4 +- .../loader/http/forgotpasswordpin.h | 4 +- core/include/JellyfinQt/loader/http/get.h | 4 +- .../loader/http/getadditionalpart.h | 4 +- .../JellyfinQt/loader/http/getalbumartists.h | 4 +- .../JellyfinQt/loader/http/getartistbyname.h | 4 +- .../JellyfinQt/loader/http/getartists.h | 4 +- .../loader/http/getbrandingoptions.h | 4 +- .../JellyfinQt/loader/http/getchannel.h | 4 +- .../loader/http/getchannelfeatures.h | 4 +- .../JellyfinQt/loader/http/getchannelitems.h | 4 +- .../loader/http/getchannelmappingoptions.h | 4 +- .../JellyfinQt/loader/http/getchannels.h | 4 +- .../JellyfinQt/loader/http/getconfiguration.h | 4 +- .../JellyfinQt/loader/http/getcriticreviews.h | 4 +- .../JellyfinQt/loader/http/getcurrentuser.h | 4 +- .../loader/http/getdefaultdirectorybrowser.h | 4 +- .../loader/http/getdefaultlistingprovider.h | 4 +- .../loader/http/getdefaultmetadataoptions.h | 4 +- .../loader/http/getdefaultprofile.h | 4 +- .../JellyfinQt/loader/http/getdefaulttimer.h | 4 +- .../JellyfinQt/loader/http/getdeviceinfo.h | 4 +- .../JellyfinQt/loader/http/getdeviceoptions.h | 4 +- .../JellyfinQt/loader/http/getdevices.h | 4 +- .../loader/http/getdisplaypreferences.h | 4 +- .../JellyfinQt/loader/http/getendpointinfo.h | 4 +- .../JellyfinQt/loader/http/getepisodes.h | 4 +- .../JellyfinQt/loader/http/getfirstuser.h | 4 +- .../JellyfinQt/loader/http/getfirstuser_2.h | 4 +- .../include/JellyfinQt/loader/http/getgenre.h | 4 +- .../JellyfinQt/loader/http/getgenres.h | 4 +- .../JellyfinQt/loader/http/getguideinfo.h | 4 +- .../loader/http/getinstantmixfromalbum.h | 4 +- .../loader/http/getinstantmixfromartists.h | 4 +- .../loader/http/getinstantmixfromitem.h | 4 +- .../loader/http/getinstantmixfrommusicgenre.h | 4 +- .../http/getinstantmixfrommusicgenres.h | 4 +- .../loader/http/getinstantmixfromplaylist.h | 4 +- .../loader/http/getinstantmixfromsong.h | 4 +- .../JellyfinQt/loader/http/getintros.h | 4 +- core/include/JellyfinQt/loader/http/getitem.h | 4 +- .../JellyfinQt/loader/http/getitemcounts.h | 4 +- .../include/JellyfinQt/loader/http/getitems.h | 4 +- .../JellyfinQt/loader/http/getitemsbyuserid.h | 4 +- core/include/JellyfinQt/loader/http/getkeys.h | 4 +- .../loader/http/getlatestchannelitems.h | 4 +- .../loader/http/getlibraryoptionsinfo.h | 4 +- .../loader/http/getlivetvchannels.h | 4 +- .../JellyfinQt/loader/http/getlivetvinfo.h | 4 +- .../loader/http/getlivetvprograms.h | 4 +- .../JellyfinQt/loader/http/getlogentries.h | 4 +- .../JellyfinQt/loader/http/getmediafolders.h | 4 +- .../loader/http/getmetadataeditorinfo.h | 4 +- .../JellyfinQt/loader/http/getmusicgenre.h | 4 +- .../JellyfinQt/loader/http/getmusicgenres.h | 4 +- .../JellyfinQt/loader/http/getnextup.h | 4 +- .../JellyfinQt/loader/http/getnotifications.h | 4 +- .../loader/http/getnotificationssummary.h | 4 +- .../JellyfinQt/loader/http/getpackageinfo.h | 4 +- .../JellyfinQt/loader/http/getperson.h | 4 +- .../JellyfinQt/loader/http/getpersons.h | 4 +- .../JellyfinQt/loader/http/getplaybackinfo.h | 4 +- .../JellyfinQt/loader/http/getplaylistitems.h | 4 +- .../loader/http/getpluginconfiguration.h | 4 +- .../loader/http/getpostedplaybackinfo.h | 4 +- .../JellyfinQt/loader/http/getprofile.h | 4 +- .../JellyfinQt/loader/http/getprogram.h | 4 +- .../JellyfinQt/loader/http/getprograms.h | 4 +- .../loader/http/getpublicsysteminfo.h | 4 +- .../JellyfinQt/loader/http/getqueryfilters.h | 4 +- .../loader/http/getqueryfilterslegacy.h | 4 +- .../loader/http/getrecommendedprograms.h | 4 +- .../JellyfinQt/loader/http/getrecording.h | 4 +- .../loader/http/getrecordingfolders.h | 4 +- .../loader/http/getrecordinggroups.h | 4 +- .../JellyfinQt/loader/http/getrecordings.h | 4 +- .../loader/http/getrecordingsseries.h | 4 +- .../JellyfinQt/loader/http/getremoteimages.h | 4 +- .../JellyfinQt/loader/http/getresumeitems.h | 4 +- .../JellyfinQt/loader/http/getrootfolder.h | 4 +- .../JellyfinQt/loader/http/getseasons.h | 4 +- .../JellyfinQt/loader/http/getseriestimer.h | 4 +- .../JellyfinQt/loader/http/getseriestimers.h | 4 +- .../JellyfinQt/loader/http/getsimilaralbums.h | 4 +- .../loader/http/getsimilarartists.h | 4 +- .../JellyfinQt/loader/http/getsimilaritems.h | 4 +- .../JellyfinQt/loader/http/getsimilarmovies.h | 4 +- .../JellyfinQt/loader/http/getsimilarshows.h | 4 +- .../loader/http/getsimilartrailers.h | 4 +- .../loader/http/getstartupconfiguration.h | 4 +- .../JellyfinQt/loader/http/getstatus.h | 4 +- .../JellyfinQt/loader/http/getstudio.h | 4 +- .../JellyfinQt/loader/http/getstudios.h | 4 +- .../JellyfinQt/loader/http/getsuggestions.h | 4 +- .../JellyfinQt/loader/http/getsysteminfo.h | 4 +- core/include/JellyfinQt/loader/http/gettask.h | 4 +- .../JellyfinQt/loader/http/getthememedia.h | 4 +- .../JellyfinQt/loader/http/getthemesongs.h | 4 +- .../JellyfinQt/loader/http/getthemevideos.h | 4 +- .../include/JellyfinQt/loader/http/gettimer.h | 4 +- .../JellyfinQt/loader/http/gettimers.h | 4 +- .../JellyfinQt/loader/http/gettrailers.h | 4 +- .../loader/http/getupcomingepisodes.h | 4 +- .../JellyfinQt/loader/http/getuserbyid.h | 4 +- .../JellyfinQt/loader/http/getuserviews.h | 4 +- .../JellyfinQt/loader/http/getutctime.h | 4 +- core/include/JellyfinQt/loader/http/getyear.h | 4 +- .../include/JellyfinQt/loader/http/getyears.h | 4 +- .../include/JellyfinQt/loader/http/initiate.h | 4 +- .../JellyfinQt/loader/http/markfavoriteitem.h | 4 +- .../JellyfinQt/loader/http/markplayeditem.h | 4 +- .../JellyfinQt/loader/http/markunplayeditem.h | 4 +- .../JellyfinQt/loader/http/openlivestream.h | 4 +- .../loader/http/setchannelmapping.h | 4 +- .../loader/http/unmarkfavoriteitem.h | 4 +- .../loader/http/updateuseritemrating.h | 4 +- core/include/JellyfinQt/loader/requesttypes.h | 1 + core/include/JellyfinQt/support/loader.h | 13 +- core/include/JellyfinQt/viewmodel/item.h | 1 - core/include/JellyfinQt/viewmodel/itemmodel.h | 152 +++++ core/include/JellyfinQt/viewmodel/loader.h | 8 +- .../JellyfinQt/viewmodel/playbackmanager.h | 1 + .../JellyfinQt/viewmodel/propertyhelper.h | 41 ++ core/openapigenerator.d | 3 +- core/src/apiclient.cpp | 9 +- core/src/apimodel.cpp | 444 ++------------- core/src/dto/activitylogentryqueryresult.cpp | 8 +- core/src/dto/albuminfo.cpp | 8 +- core/src/dto/artistinfo.cpp | 8 +- .../src/dto/authenticationinfoqueryresult.cpp | 8 +- core/src/dto/baseitem.cpp | 8 +- core/src/dto/baseitemdto.cpp | 80 +-- core/src/dto/baseitemdtoqueryresult.cpp | 8 +- core/src/dto/channelmappingoptionsdto.cpp | 24 +- core/src/dto/codecprofile.cpp | 16 +- core/src/dto/containerprofile.cpp | 8 +- core/src/dto/deviceidentification.cpp | 8 +- core/src/dto/deviceinfoqueryresult.cpp | 8 +- core/src/dto/deviceprofile.cpp | 56 +- core/src/dto/libraryoptions.cpp | 16 +- core/src/dto/libraryoptionsresultdto.cpp | 32 +- core/src/dto/librarytypeoptionsdto.cpp | 24 +- core/src/dto/listingsproviderinfo.cpp | 8 +- core/src/dto/livetvinfo.cpp | 8 +- core/src/dto/mediasourceinfo.cpp | 16 +- core/src/dto/metadataeditorinfo.cpp | 40 +- core/src/dto/notificationresultdto.cpp | 8 +- core/src/dto/packageinfo.cpp | 8 +- core/src/dto/playbackinforesponse.cpp | 8 +- core/src/dto/playbackprogressinfo.cpp | 8 +- core/src/dto/playbackstartinfo.cpp | 8 +- core/src/dto/playbackstopinfo.cpp | 8 +- core/src/dto/queryfilters.cpp | 8 +- core/src/dto/recommendationdto.cpp | 8 +- core/src/dto/remoteimageresult.cpp | 8 +- core/src/dto/remotesearchresult.cpp | 8 +- core/src/dto/responseprofile.cpp | 8 +- core/src/dto/searchhintresult.cpp | 8 +- .../src/dto/seriestimerinfodtoqueryresult.cpp | 8 +- core/src/dto/serverconfiguration.cpp | 32 +- core/src/dto/sessioninfo.cpp | 16 +- core/src/dto/systeminfo.cpp | 8 +- core/src/dto/taskinfo.cpp | 8 +- core/src/dto/thememediaresult.cpp | 8 +- core/src/dto/timerinfodtoqueryresult.cpp | 8 +- core/src/dto/typeoptions.cpp | 8 +- core/src/dto/userpolicy.cpp | 8 +- core/src/jellyfin.cpp | 5 + core/src/loader/http/addlistingprovider.cpp | 6 +- core/src/loader/http/addtunerhost.cpp | 6 +- core/src/loader/http/authenticateuser.cpp | 6 +- .../loader/http/authenticateuserbyname.cpp | 6 +- .../http/authenticatewithquickconnect.cpp | 6 +- core/src/loader/http/connect.cpp | 6 +- core/src/loader/http/createcollection.cpp | 6 +- core/src/loader/http/createplaylist.cpp | 6 +- core/src/loader/http/createuserbyname.cpp | 6 +- core/src/loader/http/deleteuseritemrating.cpp | 6 +- core/src/loader/http/forgotpassword.cpp | 6 +- core/src/loader/http/forgotpasswordpin.cpp | 6 +- core/src/loader/http/get.cpp | 6 +- core/src/loader/http/getadditionalpart.cpp | 6 +- core/src/loader/http/getalbumartists.cpp | 6 +- core/src/loader/http/getartistbyname.cpp | 6 +- core/src/loader/http/getartists.cpp | 6 +- core/src/loader/http/getbrandingoptions.cpp | 6 +- core/src/loader/http/getchannel.cpp | 6 +- core/src/loader/http/getchannelfeatures.cpp | 6 +- core/src/loader/http/getchannelitems.cpp | 6 +- .../loader/http/getchannelmappingoptions.cpp | 6 +- core/src/loader/http/getchannels.cpp | 6 +- core/src/loader/http/getconfiguration.cpp | 6 +- core/src/loader/http/getcriticreviews.cpp | 6 +- core/src/loader/http/getcurrentuser.cpp | 6 +- .../http/getdefaultdirectorybrowser.cpp | 6 +- .../loader/http/getdefaultlistingprovider.cpp | 6 +- .../loader/http/getdefaultmetadataoptions.cpp | 6 +- core/src/loader/http/getdefaultprofile.cpp | 6 +- core/src/loader/http/getdefaulttimer.cpp | 6 +- core/src/loader/http/getdeviceinfo.cpp | 6 +- core/src/loader/http/getdeviceoptions.cpp | 6 +- core/src/loader/http/getdevices.cpp | 6 +- .../src/loader/http/getdisplaypreferences.cpp | 6 +- core/src/loader/http/getendpointinfo.cpp | 6 +- core/src/loader/http/getepisodes.cpp | 6 +- core/src/loader/http/getfirstuser.cpp | 6 +- core/src/loader/http/getfirstuser_2.cpp | 6 +- core/src/loader/http/getgenre.cpp | 6 +- core/src/loader/http/getgenres.cpp | 6 +- core/src/loader/http/getguideinfo.cpp | 6 +- .../loader/http/getinstantmixfromalbum.cpp | 6 +- .../loader/http/getinstantmixfromartists.cpp | 6 +- .../src/loader/http/getinstantmixfromitem.cpp | 6 +- .../http/getinstantmixfrommusicgenre.cpp | 6 +- .../http/getinstantmixfrommusicgenres.cpp | 6 +- .../loader/http/getinstantmixfromplaylist.cpp | 6 +- .../src/loader/http/getinstantmixfromsong.cpp | 6 +- core/src/loader/http/getintros.cpp | 6 +- core/src/loader/http/getitem.cpp | 6 +- core/src/loader/http/getitemcounts.cpp | 6 +- core/src/loader/http/getitems.cpp | 6 +- core/src/loader/http/getitemsbyuserid.cpp | 6 +- core/src/loader/http/getkeys.cpp | 6 +- .../src/loader/http/getlatestchannelitems.cpp | 6 +- .../src/loader/http/getlibraryoptionsinfo.cpp | 6 +- core/src/loader/http/getlivetvchannels.cpp | 6 +- core/src/loader/http/getlivetvinfo.cpp | 6 +- core/src/loader/http/getlivetvprograms.cpp | 6 +- core/src/loader/http/getlogentries.cpp | 6 +- core/src/loader/http/getmediafolders.cpp | 6 +- .../src/loader/http/getmetadataeditorinfo.cpp | 6 +- core/src/loader/http/getmusicgenre.cpp | 6 +- core/src/loader/http/getmusicgenres.cpp | 6 +- core/src/loader/http/getnextup.cpp | 6 +- core/src/loader/http/getnotifications.cpp | 6 +- .../loader/http/getnotificationssummary.cpp | 6 +- core/src/loader/http/getpackageinfo.cpp | 6 +- core/src/loader/http/getperson.cpp | 6 +- core/src/loader/http/getpersons.cpp | 6 +- core/src/loader/http/getplaybackinfo.cpp | 6 +- core/src/loader/http/getplaylistitems.cpp | 6 +- .../loader/http/getpluginconfiguration.cpp | 6 +- .../src/loader/http/getpostedplaybackinfo.cpp | 6 +- core/src/loader/http/getprofile.cpp | 6 +- core/src/loader/http/getprogram.cpp | 6 +- core/src/loader/http/getprograms.cpp | 6 +- core/src/loader/http/getpublicsysteminfo.cpp | 6 +- core/src/loader/http/getqueryfilters.cpp | 6 +- .../src/loader/http/getqueryfilterslegacy.cpp | 6 +- .../loader/http/getrecommendedprograms.cpp | 6 +- core/src/loader/http/getrecording.cpp | 6 +- core/src/loader/http/getrecordingfolders.cpp | 6 +- core/src/loader/http/getrecordinggroups.cpp | 6 +- core/src/loader/http/getrecordings.cpp | 6 +- core/src/loader/http/getrecordingsseries.cpp | 6 +- core/src/loader/http/getremoteimages.cpp | 6 +- core/src/loader/http/getresumeitems.cpp | 6 +- core/src/loader/http/getrootfolder.cpp | 6 +- core/src/loader/http/getseasons.cpp | 6 +- core/src/loader/http/getseriestimer.cpp | 6 +- core/src/loader/http/getseriestimers.cpp | 6 +- core/src/loader/http/getsimilaralbums.cpp | 6 +- core/src/loader/http/getsimilarartists.cpp | 6 +- core/src/loader/http/getsimilaritems.cpp | 6 +- core/src/loader/http/getsimilarmovies.cpp | 6 +- core/src/loader/http/getsimilarshows.cpp | 6 +- core/src/loader/http/getsimilartrailers.cpp | 6 +- .../loader/http/getstartupconfiguration.cpp | 6 +- core/src/loader/http/getstatus.cpp | 6 +- core/src/loader/http/getstudio.cpp | 6 +- core/src/loader/http/getstudios.cpp | 6 +- core/src/loader/http/getsuggestions.cpp | 6 +- core/src/loader/http/getsysteminfo.cpp | 6 +- core/src/loader/http/gettask.cpp | 6 +- core/src/loader/http/getthememedia.cpp | 6 +- core/src/loader/http/getthemesongs.cpp | 6 +- core/src/loader/http/getthemevideos.cpp | 6 +- core/src/loader/http/gettimer.cpp | 6 +- core/src/loader/http/gettimers.cpp | 6 +- core/src/loader/http/gettrailers.cpp | 6 +- core/src/loader/http/getupcomingepisodes.cpp | 6 +- core/src/loader/http/getuserbyid.cpp | 6 +- core/src/loader/http/getuserviews.cpp | 6 +- core/src/loader/http/getutctime.cpp | 6 +- core/src/loader/http/getyear.cpp | 6 +- core/src/loader/http/getyears.cpp | 6 +- core/src/loader/http/initiate.cpp | 6 +- core/src/loader/http/markfavoriteitem.cpp | 6 +- core/src/loader/http/markplayeditem.cpp | 6 +- core/src/loader/http/markunplayeditem.cpp | 6 +- core/src/loader/http/openlivestream.cpp | 6 +- core/src/loader/http/setchannelmapping.cpp | 6 +- core/src/loader/http/unmarkfavoriteitem.cpp | 6 +- core/src/loader/http/updateuseritemrating.cpp | 6 +- core/src/support/loader.cpp | 8 + core/src/viewmodel/item.cpp | 2 +- core/src/viewmodel/itemmodel.cpp | 77 +++ qtquick/qml/pages/MainPage.qml | 22 +- 356 files changed, 1830 insertions(+), 1833 deletions(-) create mode 100644 core/include/JellyfinQt/viewmodel/itemmodel.h create mode 100644 core/include/JellyfinQt/viewmodel/propertyhelper.h create mode 100644 core/src/viewmodel/itemmodel.cpp diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 3b9963a..da2f6f6 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -9,6 +9,7 @@ set(JellyfinQt_SOURCES src/support/jsonconv.cpp src/support/loader.cpp src/viewmodel/item.cpp + src/viewmodel/itemmodel.cpp src/viewmodel/loader.cpp src/viewmodel/playbackmanager.cpp src/apiclient.cpp @@ -28,7 +29,9 @@ set(JellyfinQt_HEADERS include/JellyfinQt/support/jsonconv.h include/JellyfinQt/support/loader.h include/JellyfinQt/viewmodel/item.h + include/JellyfinQt/viewmodel/itemmodel.h include/JellyfinQt/viewmodel/loader.h + include/JellyfinQt/viewmodel/propertyhelper.h include/JellyfinQt/viewmodel/playbackmanager.h include/JellyfinQt/apiclient.h include/JellyfinQt/apimodel.h diff --git a/core/GeneratedSources.cmake b/core/GeneratedSources.cmake index 7052e8a..a01e106 100644 --- a/core/GeneratedSources.cmake +++ b/core/GeneratedSources.cmake @@ -702,7 +702,8 @@ set(openapi_HEADERS ./include/JellyfinQt/loader/http/headvideostream.h ./include/JellyfinQt/loader/http/mergeversions.h ./include/JellyfinQt/loader/http/getyears.h - ./include/JellyfinQt/loader/http/getyear.h) + ./include/JellyfinQt/loader/http/getyear.h + ./include/JellyfinQt/loader/requesttypes.h) set(openapi_SOURCES ./src/dto/loglevel.cpp @@ -1377,4 +1378,4 @@ set(openapi_SOURCES ./src/loader/http/mergeversions.cpp ./src/loader/http/getyears.cpp ./src/loader/http/getyear.cpp - ./include/JellyfinQt/loader/requesttypes.h) + ./src/loader/requesttypes.cpp) diff --git a/core/codegen/loader_header.hbs b/core/codegen/loader_header.hbs index 61e99db..f5788c7 100644 --- a/core/codegen/loader_header.hbs +++ b/core/codegen/loader_header.hbs @@ -6,9 +6,9 @@ */ {{/if}} -class {{className}} : public {{supportNamespace}}::HttpLoader<{{dtoNamespace}}::{{endpoint.resultType}}, {{endpoint.parameterType}}> { +class {{className}}Loader : public {{supportNamespace}}::HttpLoader<{{dtoNamespace}}::{{endpoint.resultType}}, {{endpoint.parameterType}}> { public: - explicit {{className}}(ApiClient *apiClient = nullptr); + explicit {{className}}Loader(ApiClient *apiClient = nullptr); protected: QString path(const {{endpoint.parameterType}}& parameters) const override; diff --git a/core/codegen/loader_implementation.hbs b/core/codegen/loader_implementation.hbs index 56860cf..a9f876a 100644 --- a/core/codegen/loader_implementation.hbs +++ b/core/codegen/loader_implementation.hbs @@ -1,15 +1,15 @@ {{#if endpoint.hasSuccessResponse}} -{{className}}::{{className}}(ApiClient *apiClient) +{{className}}Loader::{{className}}Loader(ApiClient *apiClient) : {{supportNamespace}}::HttpLoader<{{dtoNamespace}}::{{endpoint.resultType}}, {{endpoint.parameterType}}>(apiClient) {} -QString {{className}}::path(const {{endpoint.parameterType}} ¶ms) const { +QString {{className}}Loader::path(const {{endpoint.parameterType}} ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return {{pathStringInterpolation "params"}}; } -QUrlQuery {{className}}::query(const {{endpoint.parameterType}} ¶ms) const { +QUrlQuery {{className}}Loader::query(const {{endpoint.parameterType}} ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/include/JellyfinQt/apiclient.h b/core/include/JellyfinQt/apiclient.h index 099a7fe..7f92e80 100644 --- a/core/include/JellyfinQt/apiclient.h +++ b/core/include/JellyfinQt/apiclient.h @@ -94,7 +94,7 @@ public: Q_PROPERTY(QString version READ version) Q_PROPERTY(EventBus *eventbus READ eventbus FINAL) Q_PROPERTY(WebSocket *websocket READ websocket FINAL) - Q_PROPERTY(QList supportedCommands READ supportedCommands WRITE setSupportedCommands NOTIFY supportedCommandsChanged) + Q_PROPERTY(QVariantList supportedCommands READ supportedCommands WRITE setSupportedCommands NOTIFY supportedCommandsChanged) /** * Wether this ApiClient operates in "online mode". * @@ -138,8 +138,8 @@ public: * The list support commands will be sent to the Jellyfin server. QML applications should listen to * the events emitted by the eventBus and act accordingly. */ - QList supportedCommands() const { return m_supportedCommands; } - void setSupportedCommands(QList newSupportedCommands) { m_supportedCommands = newSupportedCommands; } + QVariantList supportedCommands() const { return m_supportedCommands; } + void setSupportedCommands(QVariantList newSupportedCommands) { m_supportedCommands = newSupportedCommands; emit supportedCommandsChanged(); } QJsonObject &deviceProfile() { return m_deviceProfile; } QJsonObject &playbackDeviceProfile() { return m_playbackDeviceProfile; } /** @@ -278,7 +278,7 @@ private: QJsonObject m_deviceProfile; QJsonObject m_playbackDeviceProfile; bool m_online = true; - QList m_supportedCommands; + QVariantList m_supportedCommands; bool m_authenticated = false; /** diff --git a/core/include/JellyfinQt/apimodel.h b/core/include/JellyfinQt/apimodel.h index f8ad2ab..c290e60 100644 --- a/core/include/JellyfinQt/apimodel.h +++ b/core/include/JellyfinQt/apimodel.h @@ -20,12 +20,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #ifndef JELLYFIN_API_MODEL #define JELLYFIN_API_MODEL +#include + #include #include +#include +#include #include #include #include #include +#include #include #include #include @@ -36,41 +41,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "dto/baseitemdto.h" #include "dto/userdto.h" #include "dto/useritemdatadto.h" +#include "dto/baseitemdtoqueryresult.h" +#include "loader/requesttypes.h" +#include "support/loader.h" namespace Jellyfin { -class SortOptions : public QObject { - Q_OBJECT -public: - explicit SortOptions (QObject *parent = nullptr) : QObject(parent) {} - enum SortBy { - Album, - AlbumArtist, - Artist, - Budget, - CommunityRating, - CriticRating, - DateCreated, - DatePlayed, - PlayCount, - PremiereDate, - ProductionYear, - SortName, - Random, - Revenue, - Runtime - }; - Q_ENUM(SortBy) -}; - /** - * Q_OBJECT does not support template classes. This base class declares the - * Q_OBJECT related properties and signals. + * Pageable response, which support offset and record parameters. The result + * should contain a field with the total item count, returned item count and an array + * containing the results. */ -class BaseApiModel : public QAbstractListModel, public QQmlParserStatus { - Q_OBJECT +struct PageableResponse; + +class ModelStatusClass { + Q_GADGET public: - explicit BaseApiModel(QString path, bool hasRecordResponse, bool addUserId, QObject *parent = nullptr); enum ModelStatus { Uninitialised, Loading, @@ -79,61 +65,51 @@ public: LoadingMore }; Q_ENUM(ModelStatus) +private: + ModelStatusClass() {} +}; - enum SortOrder { - Unspecified, - Ascending, - Descending - }; - Q_ENUM(SortOrder) - Q_PROPERTY(ApiClient *apiClient MEMBER m_apiClient NOTIFY apiClientChanged) +using ModelStatus = ModelStatusClass::ModelStatus; + +class BaseModelLoader : public QObject, public QQmlParserStatus { + Q_INTERFACES(QQmlParserStatus) + Q_OBJECT +public: + explicit BaseModelLoader(QObject *parent = nullptr); + Q_PROPERTY(ApiClient *apiClient READ apiClient WRITE setApiClient NOTIFY apiClientChanged) Q_PROPERTY(ModelStatus status READ status NOTIFY statusChanged) + Q_PROPERTY(int limit READ limit WRITE setLimit NOTIFY limitChanged) + Q_PROPERTY(bool autoReload READ autoReload WRITE setAutoReload NOTIFY autoReloadChanged) - // Query properties - Q_PROPERTY(int limit MEMBER m_limit NOTIFY limitChanged) - Q_PROPERTY(QList sortBy MEMBER m_sortBy NOTIFY sortByChanged) - Q_PROPERTY(QList fields MEMBER m_fields NOTIFY fieldsChanged) - Q_PROPERTY(SortOrder sortOrder MEMBER m_sortOrder NOTIFY sortOrderChanged) + ApiClient *apiClient() const { return m_apiClient; } + void setApiClient(ApiClient *newApiClient); + + int limit() const { return m_limit; } + void setLimit(int newLimit); + bool autoReload() const { return m_autoReload; } + void setAutoReload(bool newAutoReload); ModelStatus status() const { return m_status; } - void setApiClient(ApiClient *newApiClient); - void setLimit(int newLimit); - - // From AbstractListModel, gets implemented in ApiModel - virtual int rowCount(const QModelIndex &index) const override = 0; - virtual QHash roleNames() const override = 0; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override = 0; - virtual bool canFetchMore(const QModelIndex &parent) const override = 0; - virtual void fetchMore(const QModelIndex &parent) override = 0; + // QQmlParserStatus interface + virtual void classBegin() override; + virtual void componentComplete() override; + void autoReloadIfNeeded(); signals: void ready(); void apiClientChanged(ApiClient *newApiClient); - void statusChanged(ModelStatus newStatus); + void statusChanged(); void limitChanged(int newLimit); - void sortByChanged(QList newSortOrder); - void sortOrderChanged(SortOrder newSortOrder); - void fieldsChanged(QList newFields); + void autoReloadChanged(bool newAutoReload); -public slots: - /** - * @brief (Re)loads the data into this model. This might make a network request. - */ - void reload(); + void reloadWanted(); protected: - enum LoadType { - RELOAD, - LOAD_MORE - }; - - ApiClient *m_apiClient = nullptr; + // Is this object being parsed by the QML engine bool m_isBeingParsed = false; - // Per-model specific settings. - QString m_path; - bool m_hasRecordResponse; - bool m_addUserId; + ApiClient *m_apiClient = nullptr; + bool m_autoReload = true; // Query/record controlling properties int m_limit = -1; @@ -141,55 +117,168 @@ protected: int m_totalRecordCount = 0; const int DEFAULT_LIMIT = 100; - // Query properties - QList m_fields = {}; - QList m_sortBy = {}; - SortOrder m_sortOrder = Unspecified; - - // State properties. - ModelStatus m_status = Uninitialised; - + ModelStatus m_status = ModelStatus::Uninitialised; void setStatus(ModelStatus newStatus) { if (this->m_status != newStatus) { this->m_status = newStatus; - emit this->statusChanged(newStatus); - if (m_status == Ready) { + emit this->statusChanged(); + if (this->m_status == ModelStatus::Ready) { emit ready(); } } } - - void load(LoadType loadType); - virtual void setModelData(QJsonArray &data) = 0; - virtual void appendModelData(QJsonArray &data) = 0; - /** - * @brief Adds parameters to the query - * @param query The query to add parameters to - * - * This method is intended to be overrided by subclasses. It gets called - * before a request is made to the server and can be used to enable - * query types specific for a certain model to be available. - * - * Make sure to call the method in the superclass as well! - */ - virtual void addQueryParameters(QUrlQuery &query); - - /** - * @brief Replaces placeholders in an URL. - * @param path The path in which placeholders should be replaced. - * - * This method is intended to be overrided by subclasses. It gets called - * before a request is made to the server and can be used to enable - * query types specific for a certain model to be available. - * - * Make sure to call the method in the superclass as well! - */ - virtual void replacePathPlaceholders(QString &path); - - virtual void classBegin() override; - virtual void componentComplete() override; }; +/** + * Base model loader that only has one template parameter, + * so it can be used within the ApiModel. + */ +template +class ModelLoader : public BaseModelLoader { +public: + ModelLoader(QObject *parent = nullptr) + : BaseModelLoader(parent) {} + + QList reload() { + m_startIndex = 0; + m_totalRecordCount = -1; + return loadMore(); + } + + QList loadMore() { + if (m_startIndex == 0) { + this->setStatus(ModelStatus::Loading); + } else { + this->setStatus(ModelStatus::LoadingMore); + } + std::pair, int> result; + try { + result = loadMore(m_startIndex, m_limit); + } catch(Support::LoadException &e) { + qWarning() << "Exception while loading in ModelLoader: " << e.what(); + return QList(); + } + m_startIndex += result.first.size(); + m_totalRecordCount = result.second; + return result.first; + } + + virtual bool canLoadMore() const { + return m_totalRecordCount == -1 || m_startIndex < m_totalRecordCount; + } +protected: + virtual std::pair, int> loadMore(int offset, int limit) = 0; +}; + +/** + * Template to extract records from the given result. + */ +template +QList extractRecords(const R &result) { + Q_UNUSED(result) + Q_UNIMPLEMENTED(); + return QList(); +} + +template +int extractTotalRecordCount(const R &result) { + Q_UNUSED(result) + Q_UNIMPLEMENTED(); + return -1; +} +template +void setRequestLimit(R ¶meters, int limit) { + Q_UNUSED(parameters) + Q_UNUSED(limit) + Q_UNIMPLEMENTED(); +} + +template +void setRequestStartIndex(P ¶meters, int startIndex) { + Q_UNUSED(parameters) + Q_UNUSED(startIndex) + Q_UNIMPLEMENTED(); +} + +/** + * Template for implementing a loader for the given type, response and parameters + * @tparam T type of which this loader should load a list of + * @tparam D type of the DTO which can be converted into T using T(const D&, ApiClient*); + * @tparam R type of the deserialized loader response + * @tparam P type of the deserialized loader request parameters + */ +template +class LoaderModelLoader : public ModelLoader { +public: + explicit LoaderModelLoader(Support::Loader loader, QObject *parent = nullptr) + : ModelLoader(parent), m_loader(loader) { } +protected: + std::pair, int> loadMore(int offset, int limit) override { + QMutexLocker(&this->m_mutex); + // We never want to set this while the loader is running, hence the Mutex and setting it here + // instead when Loader::setApiClient is called. + this->m_loader.setApiClient(this->m_apiClient); + try { + setRequestStartIndex

(this->m_parameters, offset); + setRequestLimit(this->m_parameters, limit); + R result; + try { + std::optional optResult = m_loader.load(this->m_parameters); + if (!optResult.has_value()) { + this->setStatus(ModelStatus::Error); + return {QList(), -1}; + } + result = optResult.value(); + } catch (Support::LoadException e) { + this->setStatus(ModelStatus::Error); + return {QList(), -1}; + } + + QList records = extractRecords(result); + int totalRecordCount = extractTotalRecordCount(result); + // If totalRecordCount < 0, it is not supported for this endpoint + if (totalRecordCount < 0) { + totalRecordCount = records.size(); + } + QList models; + models.reserve(records.size()); + + // Convert the DTOs into models + for (int i = 0; i < records.size(); i++) { + models[i] = T(records[i], m_loader.apiClient()); + } + this->setStatus(ModelStatus::Ready); + return { models, totalRecordCount}; + } catch (Support::LoadException e) { + //this->setErrorString(QString(e.what())); + this->setStatus(ModelStatus::Error); + return {QList(), -1}; + } + } + Support::Loader m_loader; + QMutex m_mutex; + P m_parameters; +}; + +class BaseApiModel : public QAbstractListModel { + Q_OBJECT +public: + BaseApiModel(QObject *parent = nullptr) + : QAbstractListModel (parent) {} + + Q_PROPERTY(BaseModelLoader *loader READ loader WRITE setLoader NOTIFY loaderChanged) + + virtual BaseModelLoader *loader() const = 0; + virtual void setLoader(BaseModelLoader *newLoader) { + Q_UNUSED(newLoader); + connect(newLoader, &BaseModelLoader::reloadWanted, this, &BaseApiModel::reload); + emit loaderChanged(); + }; +public slots: + virtual void reload(); +signals: + void loaderChanged(); +}; /** * @brief Abstract model for displaying a REST JSON collection. Role names will be based on the fields encountered in the @@ -214,6 +303,10 @@ protected: * @endcode * The model will have roleNames for "name" and "id". * + * @tparam T The class of the result. + * @tparam R The class returned by the loader. + * @tparam P The class with the request parameters for the loader. + * */ template class ApiModel : public BaseApiModel { @@ -246,156 +339,126 @@ public: * @endcode * responseHasRecords should be true */ - explicit ApiModel(QString path, bool responseHasRecords, bool passUserId = false, QObject *parent = nullptr); + explicit ApiModel(QObject *parent = nullptr) + : BaseApiModel(parent) { + m_futureWatcherConnection = connect(&m_futureWatcher, &QFutureWatcher>::finished, + [&](){ futureFinished(); }); + } // Standard QAbstractItemModel overrides int rowCount(const QModelIndex &index) const override { if (!index.isValid()) return m_array.size(); return 0; } - QHash roleNames() const override { return m_roles; } - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - bool canFetchMore(const QModelIndex &parent) const override; - void fetchMore(const QModelIndex &parent) override; - - // Helper methods - template - QString enumToString (const QEnum anEnum) { return QVariant::fromValue(anEnum).toString(); } // QList-like API - T* at(int index) { return m_array.at(index); } - int size() { return rowCount(QModelIndex()); } - void insert(int index, T* object); - void append(T* object) { insert(size(), object); } - void removeAt(int index); - void removeOne(T* object); + T& at(int index) { return m_array.at(index); } + /** + * @return the amount of objects in this model. + */ + int size() { + return m_array.size(); + } - template - QString enumListToString (const QList enumList) { - QString result; - for (QEnum e : enumList) { - result += QVariant::fromValue(e).toString() + ","; + void insert(int index, T &object) { + Q_ASSERT(index >= 0 && index <= size()); + this->beginInsertRows(QModelIndex(), index, index); + m_array.insert(index, object); + this->endInsertRows(); + } + + void append(T &object) { insert(size(), object); } + void append(QList &objects) { + int index = size(); + this->beginInsertRows(QModelIndex(), index, index + objects.size()); + m_array.append(objects); + this->endInsertRows(); + }; + + void removeAt(int index) { + this->beginRemoveRows(QModelIndex(), index, index); + m_array.removeAt(index); + this->endRemoveRows(); + } + + void removeOne(T &object) { + int idx = m_array.indexOf(object); + if (idx >= 0) { + removeAt(idx); + } + } + + // From AbstractListModel, gets implemented in ApiModel + //virtual QHash roleNames() const override = 0; + /*virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override = 0;*/ + virtual bool canFetchMore(const QModelIndex &parent) const override { + if (parent.isValid()) return false; + if (m_loader == nullptr) return false; + return m_loader->canLoadMore(); + } + virtual void fetchMore(const QModelIndex &parent) override { + if (parent.isValid()) return; + if (m_loader != nullptr) { + QFuture> result = QtConcurrent::run(m_loader, &ModelLoader::loadMore); + m_futureWatcher.setFuture(result); + } + } + + BaseModelLoader *loader() const override { + return m_loader; + } + + void setLoader(BaseModelLoader *newLoader) { + ModelLoader *castedLoader = dynamic_cast *>(newLoader); + if (castedLoader != nullptr) { + m_loader = castedLoader; + // Hacky way to emit a signal + BaseApiModel::setLoader(newLoader); + } else { + qWarning() << "Somehow set a BaseModelLoader on ApiModel instead of a ModelLoader"; + } + } + + void reload() override { + if (m_loader != nullptr) { + QFuture> result = QtConcurrent::run(m_loader, &ModelLoader::reload); + m_futureWatcher.setFuture(result); } - return result; } protected: - // AbstractItemModel bookkeeping - QHash m_roles; - - // Helper methods. - T *deserializeResult(QJsonValueRef source); - virtual void addQueryParameters(QUrlQuery &query) override; - virtual void replacePathPlaceholders(QString &path) override; - - virtual void setModelData(QJsonArray &data) override; - virtual void appendModelData(QJsonArray &data) override; - // Model-specific properties. - QList m_array; + QList m_array; + ModelLoader *m_loader; + QFutureWatcher> m_futureWatcher; + void futureFinished() { + try { + QList result = m_futureWatcher.result(); + append(result); + } catch (QUnhandledException &e) { + qWarning() << "Unhandled exception while waiting for a future: " << e.what(); + } + } private: - /** - * @brief Generates roleNames based on the first record in m_array. - */ - void generateFields(); - QString sortByToString(SortOptions::SortBy sortBy); + QMetaObject::Connection m_futureWatcherConnection; }; + /** * @brief List of the public users on the server. */ -class PublicUserModel : public ApiModel { +/*class PublicUserModel : public ApiModel { public: explicit PublicUserModel (QObject *parent = nullptr); -}; +};*/ -/** - * @brief Base class for each model that works with items. - * - * Listens for updates in the library and updates the model accordingly. - */ -class ItemModel : public ApiModel { - Q_OBJECT -public: - explicit ItemModel (QString path, bool responseHasRecords, bool replaceUser, QObject *parent = nullptr); - // Query parameters - Q_PROPERTY(QString parentId MEMBER m_parentId WRITE setParentId NOTIFY parentIdChanged) - Q_PROPERTY(QString seasonId MEMBER m_seasonId NOTIFY seasonIdChanged) - Q_PROPERTY(QList imageTypes MEMBER m_imageTypes NOTIFY imageTypesChanged) - Q_PROPERTY(QList includeItemTypes MEMBER m_includeItemTypes NOTIFY includeItemTypesChanged) - Q_PROPERTY(bool recursive MEMBER m_recursive) - QList m_includeItemTypes = {}; - // Path properties - Q_PROPERTY(QString show MEMBER m_show NOTIFY showChanged) - - void setParentId(const QString &parentId) { - m_parentId = parentId; - emit parentIdChanged(m_parentId); - } -signals: - // Query property signals - void parentIdChanged(QString newParentId); - void seasonIdChanged(QString newSeasonId); - void imageTypesChanged(QList newImageTypes); - void includeItemTypesChanged(const QList &newIncludeItemTypes); - - // Path property signals - void showChanged(QString newShow); -public slots: - void onUserDataChanged(const QString &itemId, DTO::UserData *userData); -protected: - virtual void addQueryParameters(QUrlQuery &query) override; - virtual void replacePathPlaceholders(QString &path) override; -private: - // Path properties - QString m_show; - - // Query parameters - QString m_parentId; - QString m_seasonId; - QList m_imageTypes = {}; - bool m_recursive = false; -}; //template<> //void ApiModel::apiClientChanged(); -class UserViewModel : public ItemModel { -public: - explicit UserViewModel (QObject *parent = nullptr); -}; -class UserItemModel : public ItemModel { -public: - explicit UserItemModel (QObject *parent = nullptr); -}; - -class UserItemResumeModel : public ItemModel { -public: - explicit UserItemResumeModel (QObject *parent = nullptr); -}; - -class UserItemLatestModel : public ItemModel { -public: - explicit UserItemLatestModel (QObject *parent = nullptr); -}; - -class ShowNextUpModel : public ItemModel { -public: - explicit ShowNextUpModel (QObject *parent = nullptr); -}; - -class ShowSeasonsModel : public ItemModel { -public: - explicit ShowSeasonsModel (QObject *parent = nullptr); -}; - -class ShowEpisodesModel : public ItemModel { -public: - explicit ShowEpisodesModel (QObject *parent = nullptr); -}; void registerModels(const char *URI); diff --git a/core/include/JellyfinQt/dto/activitylogentryqueryresult.h b/core/include/JellyfinQt/dto/activitylogentryqueryresult.h index 2f99961..5d4a0ba 100644 --- a/core/include/JellyfinQt/dto/activitylogentryqueryresult.h +++ b/core/include/JellyfinQt/dto/activitylogentryqueryresult.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -62,11 +61,11 @@ public: /** * @brief Gets or sets the items. */ - QList> items() const; + QList items() const; /** * @brief Gets or sets the items. */ - void setItems(QList> newItems); + void setItems(QList newItems); bool itemsNull() const; void setItemsNull(); @@ -90,7 +89,7 @@ public: protected: - QList> m_items; + QList m_items; qint32 m_totalRecordCount; qint32 m_startIndex; }; diff --git a/core/include/JellyfinQt/dto/albuminfo.h b/core/include/JellyfinQt/dto/albuminfo.h index 5243bb4..6b77e11 100644 --- a/core/include/JellyfinQt/dto/albuminfo.h +++ b/core/include/JellyfinQt/dto/albuminfo.h @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -176,9 +175,9 @@ public: void setArtistProviderIdsNull(); - QList> songInfos() const; + QList songInfos() const; - void setSongInfos(QList> newSongInfos); + void setSongInfos(QList newSongInfos); bool songInfosNull() const; void setSongInfosNull(); @@ -196,7 +195,7 @@ protected: bool m_isAutomated; QStringList m_albumArtists; std::optional m_artistProviderIds = std::nullopt; - QList> m_songInfos; + QList m_songInfos; }; } // NS DTO diff --git a/core/include/JellyfinQt/dto/artistinfo.h b/core/include/JellyfinQt/dto/artistinfo.h index cb4f867..cb83058 100644 --- a/core/include/JellyfinQt/dto/artistinfo.h +++ b/core/include/JellyfinQt/dto/artistinfo.h @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -154,9 +153,9 @@ public: void setIsAutomated(bool newIsAutomated); - QList> songInfos() const; + QList songInfos() const; - void setSongInfos(QList> newSongInfos); + void setSongInfos(QList newSongInfos); bool songInfosNull() const; void setSongInfosNull(); @@ -172,7 +171,7 @@ protected: std::optional m_parentIndexNumber = std::nullopt; QDateTime m_premiereDate; bool m_isAutomated; - QList> m_songInfos; + QList m_songInfos; }; } // NS DTO diff --git a/core/include/JellyfinQt/dto/authenticationinfoqueryresult.h b/core/include/JellyfinQt/dto/authenticationinfoqueryresult.h index 2002313..7dd2468 100644 --- a/core/include/JellyfinQt/dto/authenticationinfoqueryresult.h +++ b/core/include/JellyfinQt/dto/authenticationinfoqueryresult.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -62,11 +61,11 @@ public: /** * @brief Gets or sets the items. */ - QList> items() const; + QList items() const; /** * @brief Gets or sets the items. */ - void setItems(QList> newItems); + void setItems(QList newItems); bool itemsNull() const; void setItemsNull(); @@ -90,7 +89,7 @@ public: protected: - QList> m_items; + QList m_items; qint32 m_totalRecordCount; qint32 m_startIndex; }; diff --git a/core/include/JellyfinQt/dto/baseitem.h b/core/include/JellyfinQt/dto/baseitem.h index 1746241..aecfd53 100644 --- a/core/include/JellyfinQt/dto/baseitem.h +++ b/core/include/JellyfinQt/dto/baseitem.h @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -83,11 +82,11 @@ public: /** * @brief Gets or sets the remote trailers. */ - QList> remoteTrailers() const; + QList remoteTrailers() const; /** * @brief Gets or sets the remote trailers. */ - void setRemoteTrailers(QList> newRemoteTrailers); + void setRemoteTrailers(QList newRemoteTrailers); bool remoteTrailersNull() const; void setRemoteTrailersNull(); @@ -135,7 +134,7 @@ protected: std::optional m_size = std::nullopt; QString m_container; QDateTime m_dateLastSaved; - QList> m_remoteTrailers; + QList m_remoteTrailers; bool m_isHD; bool m_isShortcut; QString m_shortcutPath; diff --git a/core/include/JellyfinQt/dto/baseitemdto.h b/core/include/JellyfinQt/dto/baseitemdto.h index 5c143c5..a229513 100644 --- a/core/include/JellyfinQt/dto/baseitemdto.h +++ b/core/include/JellyfinQt/dto/baseitemdto.h @@ -285,22 +285,22 @@ public: /** * @brief Gets or sets the external urls. */ - QList> externalUrls() const; + QList externalUrls() const; /** * @brief Gets or sets the external urls. */ - void setExternalUrls(QList> newExternalUrls); + void setExternalUrls(QList newExternalUrls); bool externalUrlsNull() const; void setExternalUrlsNull(); /** * @brief Gets or sets the media versions. */ - QList> mediaSources() const; + QList mediaSources() const; /** * @brief Gets or sets the media versions. */ - void setMediaSources(QList> newMediaSources); + void setMediaSources(QList newMediaSources); bool mediaSourcesNull() const; void setMediaSourcesNull(); @@ -538,11 +538,11 @@ public: /** * @brief Gets or sets the trailer urls. */ - QList> remoteTrailers() const; + QList remoteTrailers() const; /** * @brief Gets or sets the trailer urls. */ - void setRemoteTrailers(QList> newRemoteTrailers); + void setRemoteTrailers(QList newRemoteTrailers); bool remoteTrailersNull() const; void setRemoteTrailersNull(); @@ -604,29 +604,29 @@ public: /** * @brief Gets or sets the people. */ - QList> people() const; + QList people() const; /** * @brief Gets or sets the people. */ - void setPeople(QList> newPeople); + void setPeople(QList newPeople); bool peopleNull() const; void setPeopleNull(); /** * @brief Gets or sets the studios. */ - QList> studios() const; + QList studios() const; /** * @brief Gets or sets the studios. */ - void setStudios(QList> newStudios); + void setStudios(QList newStudios); bool studiosNull() const; void setStudiosNull(); - QList> genreItems() const; + QList genreItems() const; - void setGenreItems(QList> newGenreItems); + void setGenreItems(QList newGenreItems); bool genreItemsNull() const; void setGenreItemsNull(); @@ -825,11 +825,11 @@ public: /** * @brief Gets or sets the artist items. */ - QList> artistItems() const; + QList artistItems() const; /** * @brief Gets or sets the artist items. */ - void setArtistItems(QList> newArtistItems); + void setArtistItems(QList newArtistItems); bool artistItemsNull() const; void setArtistItemsNull(); @@ -913,11 +913,11 @@ public: /** * @brief Gets or sets the album artists. */ - QList> albumArtists() const; + QList albumArtists() const; /** * @brief Gets or sets the album artists. */ - void setAlbumArtists(QList> newAlbumArtists); + void setAlbumArtists(QList newAlbumArtists); bool albumArtistsNull() const; void setAlbumArtistsNull(); @@ -935,11 +935,11 @@ public: /** * @brief Gets or sets the media streams. */ - QList> mediaStreams() const; + QList mediaStreams() const; /** * @brief Gets or sets the media streams. */ - void setMediaStreams(QList> newMediaStreams); + void setMediaStreams(QList newMediaStreams); bool mediaStreamsNull() const; void setMediaStreamsNull(); @@ -1114,11 +1114,11 @@ Maps image type to dictionary mapping image tag to blurhash value. /** * @brief Gets or sets the chapters. */ - QList> chapters() const; + QList chapters() const; /** * @brief Gets or sets the chapters. */ - void setChapters(QList> newChapters); + void setChapters(QList newChapters); bool chaptersNull() const; void setChaptersNull(); @@ -1569,8 +1569,8 @@ protected: QString m_forcedSortName; Video3DFormat m_video3DFormat; QDateTime m_premiereDate; - QList> m_externalUrls; - QList> m_mediaSources; + QList m_externalUrls; + QList m_mediaSources; std::optional m_criticRating = std::nullopt; QStringList m_productionLocations; QString m_path; @@ -1594,15 +1594,15 @@ protected: std::optional m_indexNumber = std::nullopt; std::optional m_indexNumberEnd = std::nullopt; std::optional m_parentIndexNumber = std::nullopt; - QList> m_remoteTrailers; + QList m_remoteTrailers; std::optional m_providerIds = std::nullopt; std::optional m_isHD = std::nullopt; std::optional m_isFolder = std::nullopt; QString m_parentId; QString m_type; - QList> m_people; - QList> m_studios; - QList> m_genreItems; + QList m_people; + QList m_studios; + QList m_genreItems; QString m_parentLogoItemId; QString m_parentBackdropItemId; QStringList m_parentBackdropImageTags; @@ -1621,7 +1621,7 @@ protected: QStringList m_tags; std::optional m_primaryImageAspectRatio = std::nullopt; QStringList m_artists; - QList> m_artistItems; + QList m_artistItems; QString m_album; QString m_collectionType; QString m_displayOrder; @@ -1629,9 +1629,9 @@ protected: QString m_albumPrimaryImageTag; QString m_seriesPrimaryImageTag; QString m_albumArtist; - QList> m_albumArtists; + QList m_albumArtists; QString m_seasonName; - QList> m_mediaStreams; + QList m_mediaStreams; VideoType m_videoType; std::optional m_partCount = std::nullopt; std::optional m_mediaSourceCount = std::nullopt; @@ -1648,7 +1648,7 @@ protected: QString m_parentThumbImageTag; QString m_parentPrimaryImageItemId; QString m_parentPrimaryImageTag; - QList> m_chapters; + QList m_chapters; LocationType m_locationType; IsoType m_isoType; QString m_mediaType; diff --git a/core/include/JellyfinQt/dto/baseitemdtoqueryresult.h b/core/include/JellyfinQt/dto/baseitemdtoqueryresult.h index 54ac546..bb8e1d4 100644 --- a/core/include/JellyfinQt/dto/baseitemdtoqueryresult.h +++ b/core/include/JellyfinQt/dto/baseitemdtoqueryresult.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -62,11 +61,11 @@ public: /** * @brief Gets or sets the items. */ - QList> items() const; + QList items() const; /** * @brief Gets or sets the items. */ - void setItems(QList> newItems); + void setItems(QList newItems); bool itemsNull() const; void setItemsNull(); @@ -90,7 +89,7 @@ public: protected: - QList> m_items; + QList m_items; qint32 m_totalRecordCount; qint32 m_startIndex; }; diff --git a/core/include/JellyfinQt/dto/channelmappingoptionsdto.h b/core/include/JellyfinQt/dto/channelmappingoptionsdto.h index 2d24d4b..34629b2 100644 --- a/core/include/JellyfinQt/dto/channelmappingoptionsdto.h +++ b/core/include/JellyfinQt/dto/channelmappingoptionsdto.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -65,33 +64,33 @@ public: /** * @brief Gets or sets list of tuner channels. */ - QList> tunerChannels() const; + QList tunerChannels() const; /** * @brief Gets or sets list of tuner channels. */ - void setTunerChannels(QList> newTunerChannels); + void setTunerChannels(QList newTunerChannels); bool tunerChannelsNull() const; void setTunerChannelsNull(); /** * @brief Gets or sets list of provider channels. */ - QList> providerChannels() const; + QList providerChannels() const; /** * @brief Gets or sets list of provider channels. */ - void setProviderChannels(QList> newProviderChannels); + void setProviderChannels(QList newProviderChannels); bool providerChannelsNull() const; void setProviderChannelsNull(); /** * @brief Gets or sets list of mappings. */ - QList> mappings() const; + QList mappings() const; /** * @brief Gets or sets list of mappings. */ - void setMappings(QList> newMappings); + void setMappings(QList newMappings); bool mappingsNull() const; void setMappingsNull(); @@ -108,9 +107,9 @@ public: protected: - QList> m_tunerChannels; - QList> m_providerChannels; - QList> m_mappings; + QList m_tunerChannels; + QList m_providerChannels; + QList m_mappings; QString m_providerName; }; diff --git a/core/include/JellyfinQt/dto/codecprofile.h b/core/include/JellyfinQt/dto/codecprofile.h index b016c64..8dd2b3e 100644 --- a/core/include/JellyfinQt/dto/codecprofile.h +++ b/core/include/JellyfinQt/dto/codecprofile.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -67,16 +66,16 @@ public: void setType(CodecType newType); - QList> conditions() const; + QList conditions() const; - void setConditions(QList> newConditions); + void setConditions(QList newConditions); bool conditionsNull() const; void setConditionsNull(); - QList> applyConditions() const; + QList applyConditions() const; - void setApplyConditions(QList> newApplyConditions); + void setApplyConditions(QList newApplyConditions); bool applyConditionsNull() const; void setApplyConditionsNull(); @@ -97,8 +96,8 @@ public: protected: CodecType m_type; - QList> m_conditions; - QList> m_applyConditions; + QList m_conditions; + QList m_applyConditions; QString m_codec; QString m_container; }; diff --git a/core/include/JellyfinQt/dto/containerprofile.h b/core/include/JellyfinQt/dto/containerprofile.h index 2c3c0e5..c4e3605 100644 --- a/core/include/JellyfinQt/dto/containerprofile.h +++ b/core/include/JellyfinQt/dto/containerprofile.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -67,9 +66,9 @@ public: void setType(DlnaProfileType newType); - QList> conditions() const; + QList conditions() const; - void setConditions(QList> newConditions); + void setConditions(QList newConditions); bool conditionsNull() const; void setConditionsNull(); @@ -83,7 +82,7 @@ public: protected: DlnaProfileType m_type; - QList> m_conditions; + QList m_conditions; QString m_container; }; diff --git a/core/include/JellyfinQt/dto/deviceidentification.h b/core/include/JellyfinQt/dto/deviceidentification.h index 112a04f..c2574e9 100644 --- a/core/include/JellyfinQt/dto/deviceidentification.h +++ b/core/include/JellyfinQt/dto/deviceidentification.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -151,11 +150,11 @@ public: /** * @brief Gets or sets the headers. */ - QList> headers() const; + QList headers() const; /** * @brief Gets or sets the headers. */ - void setHeaders(QList> newHeaders); + void setHeaders(QList newHeaders); bool headersNull() const; void setHeadersNull(); @@ -169,7 +168,7 @@ protected: QString m_modelUrl; QString m_manufacturer; QString m_manufacturerUrl; - QList> m_headers; + QList m_headers; }; } // NS DTO diff --git a/core/include/JellyfinQt/dto/deviceinfoqueryresult.h b/core/include/JellyfinQt/dto/deviceinfoqueryresult.h index 89f58a8..8500430 100644 --- a/core/include/JellyfinQt/dto/deviceinfoqueryresult.h +++ b/core/include/JellyfinQt/dto/deviceinfoqueryresult.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -62,11 +61,11 @@ public: /** * @brief Gets or sets the items. */ - QList> items() const; + QList items() const; /** * @brief Gets or sets the items. */ - void setItems(QList> newItems); + void setItems(QList newItems); bool itemsNull() const; void setItemsNull(); @@ -90,7 +89,7 @@ public: protected: - QList> m_items; + QList m_items; qint32 m_totalRecordCount; qint32 m_startIndex; }; diff --git a/core/include/JellyfinQt/dto/deviceprofile.h b/core/include/JellyfinQt/dto/deviceprofile.h index f1eb9bd..8105aaa 100644 --- a/core/include/JellyfinQt/dto/deviceprofile.h +++ b/core/include/JellyfinQt/dto/deviceprofile.h @@ -396,77 +396,77 @@ public: /** * @brief Gets or sets the XmlRootAttributes. */ - QList> xmlRootAttributes() const; + QList xmlRootAttributes() const; /** * @brief Gets or sets the XmlRootAttributes. */ - void setXmlRootAttributes(QList> newXmlRootAttributes); + void setXmlRootAttributes(QList newXmlRootAttributes); bool xmlRootAttributesNull() const; void setXmlRootAttributesNull(); /** * @brief Gets or sets the direct play profiles. */ - QList> directPlayProfiles() const; + QList directPlayProfiles() const; /** * @brief Gets or sets the direct play profiles. */ - void setDirectPlayProfiles(QList> newDirectPlayProfiles); + void setDirectPlayProfiles(QList newDirectPlayProfiles); bool directPlayProfilesNull() const; void setDirectPlayProfilesNull(); /** * @brief Gets or sets the transcoding profiles. */ - QList> transcodingProfiles() const; + QList transcodingProfiles() const; /** * @brief Gets or sets the transcoding profiles. */ - void setTranscodingProfiles(QList> newTranscodingProfiles); + void setTranscodingProfiles(QList newTranscodingProfiles); bool transcodingProfilesNull() const; void setTranscodingProfilesNull(); /** * @brief Gets or sets the ContainerProfiles. */ - QList> containerProfiles() const; + QList containerProfiles() const; /** * @brief Gets or sets the ContainerProfiles. */ - void setContainerProfiles(QList> newContainerProfiles); + void setContainerProfiles(QList newContainerProfiles); bool containerProfilesNull() const; void setContainerProfilesNull(); /** * @brief Gets or sets the CodecProfiles. */ - QList> codecProfiles() const; + QList codecProfiles() const; /** * @brief Gets or sets the CodecProfiles. */ - void setCodecProfiles(QList> newCodecProfiles); + void setCodecProfiles(QList newCodecProfiles); bool codecProfilesNull() const; void setCodecProfilesNull(); /** * @brief Gets or sets the ResponseProfiles. */ - QList> responseProfiles() const; + QList responseProfiles() const; /** * @brief Gets or sets the ResponseProfiles. */ - void setResponseProfiles(QList> newResponseProfiles); + void setResponseProfiles(QList newResponseProfiles); bool responseProfilesNull() const; void setResponseProfilesNull(); /** * @brief Gets or sets the SubtitleProfiles. */ - QList> subtitleProfiles() const; + QList subtitleProfiles() const; /** * @brief Gets or sets the SubtitleProfiles. */ - void setSubtitleProfiles(QList> newSubtitleProfiles); + void setSubtitleProfiles(QList newSubtitleProfiles); bool subtitleProfilesNull() const; void setSubtitleProfilesNull(); @@ -504,13 +504,13 @@ protected: bool m_requiresPlainFolders; bool m_enableMSMediaReceiverRegistrar; bool m_ignoreTranscodeByteRangeRequests; - QList> m_xmlRootAttributes; - QList> m_directPlayProfiles; - QList> m_transcodingProfiles; - QList> m_containerProfiles; - QList> m_codecProfiles; - QList> m_responseProfiles; - QList> m_subtitleProfiles; + QList m_xmlRootAttributes; + QList m_directPlayProfiles; + QList m_transcodingProfiles; + QList m_containerProfiles; + QList m_codecProfiles; + QList m_responseProfiles; + QList m_subtitleProfiles; }; } // NS DTO diff --git a/core/include/JellyfinQt/dto/libraryoptions.h b/core/include/JellyfinQt/dto/libraryoptions.h index ee6027c..d5c9d24 100644 --- a/core/include/JellyfinQt/dto/libraryoptions.h +++ b/core/include/JellyfinQt/dto/libraryoptions.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -82,9 +81,9 @@ public: void setExtractChapterImagesDuringLibraryScan(bool newExtractChapterImagesDuringLibraryScan); - QList> pathInfos() const; + QList pathInfos() const; - void setPathInfos(QList> newPathInfos); + void setPathInfos(QList newPathInfos); bool pathInfosNull() const; void setPathInfosNull(); @@ -210,9 +209,9 @@ public: void setSaveSubtitlesWithMedia(bool newSaveSubtitlesWithMedia); - QList> typeOptions() const; + QList typeOptions() const; - void setTypeOptions(QList> newTypeOptions); + void setTypeOptions(QList newTypeOptions); bool typeOptionsNull() const; void setTypeOptionsNull(); @@ -222,7 +221,7 @@ protected: bool m_enableRealtimeMonitor; bool m_enableChapterImageExtraction; bool m_extractChapterImagesDuringLibraryScan; - QList> m_pathInfos; + QList m_pathInfos; bool m_saveLocalMetadata; bool m_enableInternetProviders; bool m_enableAutomaticSeriesGrouping; @@ -242,7 +241,7 @@ protected: QStringList m_subtitleDownloadLanguages; bool m_requirePerfectSubtitleMatch; bool m_saveSubtitlesWithMedia; - QList> m_typeOptions; + QList m_typeOptions; }; } // NS DTO diff --git a/core/include/JellyfinQt/dto/libraryoptionsresultdto.h b/core/include/JellyfinQt/dto/libraryoptionsresultdto.h index 4b7deb0..13b5cc7 100644 --- a/core/include/JellyfinQt/dto/libraryoptionsresultdto.h +++ b/core/include/JellyfinQt/dto/libraryoptionsresultdto.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -63,53 +62,53 @@ public: /** * @brief Gets or sets the metadata savers. */ - QList> metadataSavers() const; + QList metadataSavers() const; /** * @brief Gets or sets the metadata savers. */ - void setMetadataSavers(QList> newMetadataSavers); + void setMetadataSavers(QList newMetadataSavers); bool metadataSaversNull() const; void setMetadataSaversNull(); /** * @brief Gets or sets the metadata readers. */ - QList> metadataReaders() const; + QList metadataReaders() const; /** * @brief Gets or sets the metadata readers. */ - void setMetadataReaders(QList> newMetadataReaders); + void setMetadataReaders(QList newMetadataReaders); bool metadataReadersNull() const; void setMetadataReadersNull(); /** * @brief Gets or sets the subtitle fetchers. */ - QList> subtitleFetchers() const; + QList subtitleFetchers() const; /** * @brief Gets or sets the subtitle fetchers. */ - void setSubtitleFetchers(QList> newSubtitleFetchers); + void setSubtitleFetchers(QList newSubtitleFetchers); bool subtitleFetchersNull() const; void setSubtitleFetchersNull(); /** * @brief Gets or sets the type options. */ - QList> typeOptions() const; + QList typeOptions() const; /** * @brief Gets or sets the type options. */ - void setTypeOptions(QList> newTypeOptions); + void setTypeOptions(QList newTypeOptions); bool typeOptionsNull() const; void setTypeOptionsNull(); protected: - QList> m_metadataSavers; - QList> m_metadataReaders; - QList> m_subtitleFetchers; - QList> m_typeOptions; + QList m_metadataSavers; + QList m_metadataReaders; + QList m_subtitleFetchers; + QList m_typeOptions; }; } // NS DTO diff --git a/core/include/JellyfinQt/dto/librarytypeoptionsdto.h b/core/include/JellyfinQt/dto/librarytypeoptionsdto.h index a3bd798..569d686 100644 --- a/core/include/JellyfinQt/dto/librarytypeoptionsdto.h +++ b/core/include/JellyfinQt/dto/librarytypeoptionsdto.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -76,22 +75,22 @@ public: /** * @brief Gets or sets the metadata fetchers. */ - QList> metadataFetchers() const; + QList metadataFetchers() const; /** * @brief Gets or sets the metadata fetchers. */ - void setMetadataFetchers(QList> newMetadataFetchers); + void setMetadataFetchers(QList newMetadataFetchers); bool metadataFetchersNull() const; void setMetadataFetchersNull(); /** * @brief Gets or sets the image fetchers. */ - QList> imageFetchers() const; + QList imageFetchers() const; /** * @brief Gets or sets the image fetchers. */ - void setImageFetchers(QList> newImageFetchers); + void setImageFetchers(QList newImageFetchers); bool imageFetchersNull() const; void setImageFetchersNull(); @@ -109,21 +108,21 @@ public: /** * @brief Gets or sets the default image options. */ - QList> defaultImageOptions() const; + QList defaultImageOptions() const; /** * @brief Gets or sets the default image options. */ - void setDefaultImageOptions(QList> newDefaultImageOptions); + void setDefaultImageOptions(QList newDefaultImageOptions); bool defaultImageOptionsNull() const; void setDefaultImageOptionsNull(); protected: QString m_type; - QList> m_metadataFetchers; - QList> m_imageFetchers; + QList m_metadataFetchers; + QList m_imageFetchers; QList m_supportedImageTypes; - QList> m_defaultImageOptions; + QList m_defaultImageOptions; }; } // NS DTO diff --git a/core/include/JellyfinQt/dto/listingsproviderinfo.h b/core/include/JellyfinQt/dto/listingsproviderinfo.h index 1f47efc..529a3a1 100644 --- a/core/include/JellyfinQt/dto/listingsproviderinfo.h +++ b/core/include/JellyfinQt/dto/listingsproviderinfo.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -157,9 +156,9 @@ public: void setMovieCategoriesNull(); - QList> channelMappings() const; + QList channelMappings() const; - void setChannelMappings(QList> newChannelMappings); + void setChannelMappings(QList newChannelMappings); bool channelMappingsNull() const; void setChannelMappingsNull(); @@ -200,7 +199,7 @@ protected: QStringList m_sportsCategories; QStringList m_kidsCategories; QStringList m_movieCategories; - QList> m_channelMappings; + QList m_channelMappings; QString m_moviePrefix; QString m_preferredLanguage; QString m_userAgent; diff --git a/core/include/JellyfinQt/dto/livetvinfo.h b/core/include/JellyfinQt/dto/livetvinfo.h index 0d6e793..f82da65 100644 --- a/core/include/JellyfinQt/dto/livetvinfo.h +++ b/core/include/JellyfinQt/dto/livetvinfo.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -62,11 +61,11 @@ public: /** * @brief Gets or sets the services. */ - QList> services() const; + QList services() const; /** * @brief Gets or sets the services. */ - void setServices(QList> newServices); + void setServices(QList newServices); bool servicesNull() const; void setServicesNull(); @@ -92,7 +91,7 @@ public: protected: - QList> m_services; + QList m_services; bool m_isEnabled; QStringList m_enabledUsers; }; diff --git a/core/include/JellyfinQt/dto/mediasourceinfo.h b/core/include/JellyfinQt/dto/mediasourceinfo.h index a4c0b22..136bb8c 100644 --- a/core/include/JellyfinQt/dto/mediasourceinfo.h +++ b/core/include/JellyfinQt/dto/mediasourceinfo.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -244,16 +243,16 @@ public: void setVideo3DFormat(Video3DFormat newVideo3DFormat); - QList> mediaStreams() const; + QList mediaStreams() const; - void setMediaStreams(QList> newMediaStreams); + void setMediaStreams(QList newMediaStreams); bool mediaStreamsNull() const; void setMediaStreamsNull(); - QList> mediaAttachments() const; + QList mediaAttachments() const; - void setMediaAttachments(QList> newMediaAttachments); + void setMediaAttachments(QList newMediaAttachments); bool mediaAttachmentsNull() const; void setMediaAttachmentsNull(); @@ -357,8 +356,8 @@ protected: VideoType m_videoType; IsoType m_isoType; Video3DFormat m_video3DFormat; - QList> m_mediaStreams; - QList> m_mediaAttachments; + QList m_mediaStreams; + QList m_mediaAttachments; QStringList m_formats; std::optional m_bitrate = std::nullopt; TransportStreamTimestamp m_timestamp; diff --git a/core/include/JellyfinQt/dto/metadataeditorinfo.h b/core/include/JellyfinQt/dto/metadataeditorinfo.h index e3db416..3d82c77 100644 --- a/core/include/JellyfinQt/dto/metadataeditorinfo.h +++ b/core/include/JellyfinQt/dto/metadataeditorinfo.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -65,30 +64,30 @@ public: // Properties - QList> parentalRatingOptions() const; + QList parentalRatingOptions() const; - void setParentalRatingOptions(QList> newParentalRatingOptions); + void setParentalRatingOptions(QList newParentalRatingOptions); bool parentalRatingOptionsNull() const; void setParentalRatingOptionsNull(); - QList> countries() const; + QList countries() const; - void setCountries(QList> newCountries); + void setCountries(QList newCountries); bool countriesNull() const; void setCountriesNull(); - QList> cultures() const; + QList cultures() const; - void setCultures(QList> newCultures); + void setCultures(QList newCultures); bool culturesNull() const; void setCulturesNull(); - QList> externalIdInfos() const; + QList externalIdInfos() const; - void setExternalIdInfos(QList> newExternalIdInfos); + void setExternalIdInfos(QList newExternalIdInfos); bool externalIdInfosNull() const; void setExternalIdInfosNull(); @@ -100,20 +99,20 @@ public: void setContentTypeNull(); - QList> contentTypeOptions() const; + QList contentTypeOptions() const; - void setContentTypeOptions(QList> newContentTypeOptions); + void setContentTypeOptions(QList newContentTypeOptions); bool contentTypeOptionsNull() const; void setContentTypeOptionsNull(); protected: - QList> m_parentalRatingOptions; - QList> m_countries; - QList> m_cultures; - QList> m_externalIdInfos; + QList m_parentalRatingOptions; + QList m_countries; + QList m_cultures; + QList m_externalIdInfos; QString m_contentType; - QList> m_contentTypeOptions; + QList m_contentTypeOptions; }; } // NS DTO diff --git a/core/include/JellyfinQt/dto/notificationresultdto.h b/core/include/JellyfinQt/dto/notificationresultdto.h index 793f730..40c1104 100644 --- a/core/include/JellyfinQt/dto/notificationresultdto.h +++ b/core/include/JellyfinQt/dto/notificationresultdto.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -62,11 +61,11 @@ public: /** * @brief Gets or sets the current page of notifications. */ - QList> notifications() const; + QList notifications() const; /** * @brief Gets or sets the current page of notifications. */ - void setNotifications(QList> newNotifications); + void setNotifications(QList newNotifications); bool notificationsNull() const; void setNotificationsNull(); @@ -81,7 +80,7 @@ public: protected: - QList> m_notifications; + QList m_notifications; qint32 m_totalRecordCount; }; diff --git a/core/include/JellyfinQt/dto/packageinfo.h b/core/include/JellyfinQt/dto/packageinfo.h index 1370613..38e62db 100644 --- a/core/include/JellyfinQt/dto/packageinfo.h +++ b/core/include/JellyfinQt/dto/packageinfo.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -131,11 +130,11 @@ This is used to identify the proper item for automatic updates. /** * @brief Gets or sets the versions. */ - QList> versions() const; + QList versions() const; /** * @brief Gets or sets the versions. */ - void setVersions(QList> newVersions); + void setVersions(QList newVersions); bool versionsNull() const; void setVersionsNull(); @@ -158,7 +157,7 @@ protected: QString m_owner; QString m_category; QString m_guid; - QList> m_versions; + QList m_versions; QString m_imageUrl; }; diff --git a/core/include/JellyfinQt/dto/playbackinforesponse.h b/core/include/JellyfinQt/dto/playbackinforesponse.h index b727e53..85fb76d 100644 --- a/core/include/JellyfinQt/dto/playbackinforesponse.h +++ b/core/include/JellyfinQt/dto/playbackinforesponse.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -64,11 +63,11 @@ public: /** * @brief Gets or sets the media sources. */ - QList> mediaSources() const; + QList mediaSources() const; /** * @brief Gets or sets the media sources. */ - void setMediaSources(QList> newMediaSources); + void setMediaSources(QList newMediaSources); bool mediaSourcesNull() const; void setMediaSourcesNull(); @@ -90,7 +89,7 @@ public: protected: - QList> m_mediaSources; + QList m_mediaSources; QString m_playSessionId; PlaybackErrorCode m_errorCode; }; diff --git a/core/include/JellyfinQt/dto/playbackprogressinfo.h b/core/include/JellyfinQt/dto/playbackprogressinfo.h index 8f5b2c2..6ae7642 100644 --- a/core/include/JellyfinQt/dto/playbackprogressinfo.h +++ b/core/include/JellyfinQt/dto/playbackprogressinfo.h @@ -224,9 +224,9 @@ public: void setRepeatMode(RepeatMode newRepeatMode); - QList> nowPlayingQueue() const; + QList nowPlayingQueue() const; - void setNowPlayingQueue(QList> newNowPlayingQueue); + void setNowPlayingQueue(QList newNowPlayingQueue); bool nowPlayingQueueNull() const; void setNowPlayingQueueNull(); @@ -257,7 +257,7 @@ protected: QString m_liveStreamId; QString m_playSessionId; RepeatMode m_repeatMode; - QList> m_nowPlayingQueue; + QList m_nowPlayingQueue; QString m_playlistItemId; }; diff --git a/core/include/JellyfinQt/dto/playbackstartinfo.h b/core/include/JellyfinQt/dto/playbackstartinfo.h index 5725b28..6cee828 100644 --- a/core/include/JellyfinQt/dto/playbackstartinfo.h +++ b/core/include/JellyfinQt/dto/playbackstartinfo.h @@ -224,9 +224,9 @@ public: void setRepeatMode(RepeatMode newRepeatMode); - QList> nowPlayingQueue() const; + QList nowPlayingQueue() const; - void setNowPlayingQueue(QList> newNowPlayingQueue); + void setNowPlayingQueue(QList newNowPlayingQueue); bool nowPlayingQueueNull() const; void setNowPlayingQueueNull(); @@ -257,7 +257,7 @@ protected: QString m_liveStreamId; QString m_playSessionId; RepeatMode m_repeatMode; - QList> m_nowPlayingQueue; + QList m_nowPlayingQueue; QString m_playlistItemId; }; diff --git a/core/include/JellyfinQt/dto/playbackstopinfo.h b/core/include/JellyfinQt/dto/playbackstopinfo.h index b38b6c7..ec59368 100644 --- a/core/include/JellyfinQt/dto/playbackstopinfo.h +++ b/core/include/JellyfinQt/dto/playbackstopinfo.h @@ -154,9 +154,9 @@ public: void setPlaylistItemIdNull(); - QList> nowPlayingQueue() const; + QList nowPlayingQueue() const; - void setNowPlayingQueue(QList> newNowPlayingQueue); + void setNowPlayingQueue(QList newNowPlayingQueue); bool nowPlayingQueueNull() const; void setNowPlayingQueueNull(); @@ -172,7 +172,7 @@ protected: bool m_failed; QString m_nextMediaType; QString m_playlistItemId; - QList> m_nowPlayingQueue; + QList m_nowPlayingQueue; }; } // NS DTO diff --git a/core/include/JellyfinQt/dto/queryfilters.h b/core/include/JellyfinQt/dto/queryfilters.h index 7a30269..e90761c 100644 --- a/core/include/JellyfinQt/dto/queryfilters.h +++ b/core/include/JellyfinQt/dto/queryfilters.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -60,9 +59,9 @@ public: // Properties - QList> genres() const; + QList genres() const; - void setGenres(QList> newGenres); + void setGenres(QList newGenres); bool genresNull() const; void setGenresNull(); @@ -75,7 +74,7 @@ public: protected: - QList> m_genres; + QList m_genres; QStringList m_tags; }; diff --git a/core/include/JellyfinQt/dto/recommendationdto.h b/core/include/JellyfinQt/dto/recommendationdto.h index df59c70..1d909ad 100644 --- a/core/include/JellyfinQt/dto/recommendationdto.h +++ b/core/include/JellyfinQt/dto/recommendationdto.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -62,9 +61,9 @@ public: // Properties - QList> items() const; + QList items() const; - void setItems(QList> newItems); + void setItems(QList newItems); bool itemsNull() const; void setItemsNull(); @@ -87,7 +86,7 @@ public: protected: - QList> m_items; + QList m_items; RecommendationType m_recommendationType; QString m_baselineItemName; QString m_categoryId; diff --git a/core/include/JellyfinQt/dto/remoteimageresult.h b/core/include/JellyfinQt/dto/remoteimageresult.h index 57c10ae..c808ccf 100644 --- a/core/include/JellyfinQt/dto/remoteimageresult.h +++ b/core/include/JellyfinQt/dto/remoteimageresult.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -62,11 +61,11 @@ public: /** * @brief Gets or sets the images. */ - QList> images() const; + QList images() const; /** * @brief Gets or sets the images. */ - void setImages(QList> newImages); + void setImages(QList newImages); bool imagesNull() const; void setImagesNull(); @@ -92,7 +91,7 @@ public: protected: - QList> m_images; + QList m_images; qint32 m_totalRecordCount; QStringList m_providers; }; diff --git a/core/include/JellyfinQt/dto/remotesearchresult.h b/core/include/JellyfinQt/dto/remotesearchresult.h index 5ea1aae..bbda689 100644 --- a/core/include/JellyfinQt/dto/remotesearchresult.h +++ b/core/include/JellyfinQt/dto/remotesearchresult.h @@ -148,9 +148,9 @@ public: void setAlbumArtist(QSharedPointer newAlbumArtist); - QList> artists() const; + QList artists() const; - void setArtists(QList> newArtists); + void setArtists(QList newArtists); bool artistsNull() const; void setArtistsNull(); @@ -167,7 +167,7 @@ protected: QString m_searchProviderName; QString m_overview; QSharedPointer m_albumArtist = nullptr; - QList> m_artists; + QList m_artists; }; } // NS DTO diff --git a/core/include/JellyfinQt/dto/responseprofile.h b/core/include/JellyfinQt/dto/responseprofile.h index 6a70a78..177e1a1 100644 --- a/core/include/JellyfinQt/dto/responseprofile.h +++ b/core/include/JellyfinQt/dto/responseprofile.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -102,9 +101,9 @@ public: void setMimeTypeNull(); - QList> conditions() const; + QList conditions() const; - void setConditions(QList> newConditions); + void setConditions(QList newConditions); bool conditionsNull() const; void setConditionsNull(); @@ -116,7 +115,7 @@ protected: DlnaProfileType m_type; QString m_orgPn; QString m_mimeType; - QList> m_conditions; + QList m_conditions; }; } // NS DTO diff --git a/core/include/JellyfinQt/dto/searchhintresult.h b/core/include/JellyfinQt/dto/searchhintresult.h index ba33f10..6160721 100644 --- a/core/include/JellyfinQt/dto/searchhintresult.h +++ b/core/include/JellyfinQt/dto/searchhintresult.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -62,11 +61,11 @@ public: /** * @brief Gets or sets the search hints. */ - QList> searchHints() const; + QList searchHints() const; /** * @brief Gets or sets the search hints. */ - void setSearchHints(QList> newSearchHints); + void setSearchHints(QList newSearchHints); bool searchHintsNull() const; void setSearchHintsNull(); @@ -81,7 +80,7 @@ public: protected: - QList> m_searchHints; + QList m_searchHints; qint32 m_totalRecordCount; }; diff --git a/core/include/JellyfinQt/dto/seriestimerinfodtoqueryresult.h b/core/include/JellyfinQt/dto/seriestimerinfodtoqueryresult.h index e13423d..03146a9 100644 --- a/core/include/JellyfinQt/dto/seriestimerinfodtoqueryresult.h +++ b/core/include/JellyfinQt/dto/seriestimerinfodtoqueryresult.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -62,11 +61,11 @@ public: /** * @brief Gets or sets the items. */ - QList> items() const; + QList items() const; /** * @brief Gets or sets the items. */ - void setItems(QList> newItems); + void setItems(QList newItems); bool itemsNull() const; void setItemsNull(); @@ -90,7 +89,7 @@ public: protected: - QList> m_items; + QList m_items; qint32 m_totalRecordCount; qint32 m_startIndex; }; diff --git a/core/include/JellyfinQt/dto/serverconfiguration.h b/core/include/JellyfinQt/dto/serverconfiguration.h index a36ff70..055c705 100644 --- a/core/include/JellyfinQt/dto/serverconfiguration.h +++ b/core/include/JellyfinQt/dto/serverconfiguration.h @@ -560,9 +560,9 @@ Allows potential contributors without visual studio to modify production dashboa void setImageSavingConvention(ImageSavingConvention newImageSavingConvention); - QList> metadataOptions() const; + QList metadataOptions() const; - void setMetadataOptions(QList> newMetadataOptions); + void setMetadataOptions(QList newMetadataOptions); bool metadataOptionsNull() const; void setMetadataOptionsNull(); @@ -598,9 +598,9 @@ Allows potential contributors without visual studio to modify production dashboa void setSaveMetadataHidden(bool newSaveMetadataHidden); - QList> contentTypes() const; + QList contentTypes() const; - void setContentTypes(QList> newContentTypes); + void setContentTypes(QList newContentTypes); bool contentTypesNull() const; void setContentTypesNull(); @@ -654,9 +654,9 @@ Allows potential contributors without visual studio to modify production dashboa void setCodecsUsedNull(); - QList> pluginRepositories() const; + QList pluginRepositories() const; - void setPluginRepositories(QList> newPluginRepositories); + void setPluginRepositories(QList newPluginRepositories); bool pluginRepositoriesNull() const; void setPluginRepositoriesNull(); @@ -705,9 +705,9 @@ Allows potential contributors without visual studio to modify production dashboa void setImageExtractionTimeoutMs(qint32 newImageExtractionTimeoutMs); - QList> pathSubstitutions() const; + QList pathSubstitutions() const; - void setPathSubstitutions(QList> newPathSubstitutions); + void setPathSubstitutions(QList newPathSubstitutions); bool pathSubstitutionsNull() const; void setPathSubstitutionsNull(); @@ -864,13 +864,13 @@ protected: qint32 m_libraryMonitorDelay; bool m_enableDashboardResponseCaching; ImageSavingConvention m_imageSavingConvention; - QList> m_metadataOptions; + QList m_metadataOptions; bool m_skipDeserializationForBasicTypes; QString m_serverName; QString m_baseUrl; QString m_uICulture; bool m_saveMetadataHidden; - QList> m_contentTypes; + QList m_contentTypes; qint32 m_remoteClientBitrateLimit; bool m_enableFolderView; bool m_enableGroupingIntoCollections; @@ -878,14 +878,14 @@ protected: QStringList m_localNetworkSubnets; QStringList m_localNetworkAddresses; QStringList m_codecsUsed; - QList> m_pluginRepositories; + QList m_pluginRepositories; bool m_enableExternalContentInSuggestions; bool m_requireHttps; bool m_enableNewOmdbSupport; QStringList m_remoteIPFilter; bool m_isRemoteIPFilterBlacklist; qint32 m_imageExtractionTimeoutMs; - QList> m_pathSubstitutions; + QList m_pathSubstitutions; bool m_enableSimpleArtistDetection; QStringList m_uninstalledPlugins; bool m_enableSlowResponseWarning; diff --git a/core/include/JellyfinQt/dto/sessioninfo.h b/core/include/JellyfinQt/dto/sessioninfo.h index 48187f2..0b795b4 100644 --- a/core/include/JellyfinQt/dto/sessioninfo.h +++ b/core/include/JellyfinQt/dto/sessioninfo.h @@ -74,9 +74,9 @@ public: void setPlayState(QSharedPointer newPlayState); - QList> additionalUsers() const; + QList additionalUsers() const; - void setAdditionalUsers(QList> newAdditionalUsers); + void setAdditionalUsers(QList newAdditionalUsers); bool additionalUsersNull() const; void setAdditionalUsersNull(); @@ -251,9 +251,9 @@ public: void setSupportsRemoteControl(bool newSupportsRemoteControl); - QList> nowPlayingQueue() const; + QList nowPlayingQueue() const; - void setNowPlayingQueue(QList> newNowPlayingQueue); + void setNowPlayingQueue(QList newNowPlayingQueue); bool nowPlayingQueueNull() const; void setNowPlayingQueueNull(); @@ -297,7 +297,7 @@ public: protected: QSharedPointer m_playState = nullptr; - QList> m_additionalUsers; + QList m_additionalUsers; QSharedPointer m_capabilities = nullptr; QString m_remoteEndPoint; QStringList m_playableMediaTypes; @@ -318,7 +318,7 @@ protected: bool m_isActive; bool m_supportsMediaControl; bool m_supportsRemoteControl; - QList> m_nowPlayingQueue; + QList m_nowPlayingQueue; bool m_hasCustomDeviceName; QString m_playlistItemId; QString m_serverId; diff --git a/core/include/JellyfinQt/dto/systeminfo.h b/core/include/JellyfinQt/dto/systeminfo.h index d0f8476..733d18a 100644 --- a/core/include/JellyfinQt/dto/systeminfo.h +++ b/core/include/JellyfinQt/dto/systeminfo.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -196,11 +195,11 @@ public: /** * @brief Gets or sets the completed installations. */ - QList> completedInstallations() const; + QList completedInstallations() const; /** * @brief Gets or sets the completed installations. */ - void setCompletedInstallations(QList> newCompletedInstallations); + void setCompletedInstallations(QList newCompletedInstallations); bool completedInstallationsNull() const; void setCompletedInstallationsNull(); @@ -329,7 +328,7 @@ protected: bool m_isShuttingDown; bool m_supportsLibraryMonitor; qint32 m_webSocketPortNumber; - QList> m_completedInstallations; + QList m_completedInstallations; bool m_canSelfRestart; bool m_canLaunchWebBrowser; QString m_programDataPath; diff --git a/core/include/JellyfinQt/dto/taskinfo.h b/core/include/JellyfinQt/dto/taskinfo.h index 94fe64f..db1f495 100644 --- a/core/include/JellyfinQt/dto/taskinfo.h +++ b/core/include/JellyfinQt/dto/taskinfo.h @@ -108,11 +108,11 @@ public: /** * @brief Gets or sets the triggers. */ - QList> triggers() const; + QList triggers() const; /** * @brief Gets or sets the triggers. */ - void setTriggers(QList> newTriggers); + void setTriggers(QList newTriggers); bool triggersNull() const; void setTriggersNull(); @@ -165,7 +165,7 @@ protected: std::optional m_currentProgressPercentage = std::nullopt; QString m_jellyfinId; QSharedPointer m_lastExecutionResult = nullptr; - QList> m_triggers; + QList m_triggers; QString m_description; QString m_category; bool m_isHidden; diff --git a/core/include/JellyfinQt/dto/thememediaresult.h b/core/include/JellyfinQt/dto/thememediaresult.h index 0e4a89a..4a699c8 100644 --- a/core/include/JellyfinQt/dto/thememediaresult.h +++ b/core/include/JellyfinQt/dto/thememediaresult.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -63,11 +62,11 @@ public: /** * @brief Gets or sets the items. */ - QList> items() const; + QList items() const; /** * @brief Gets or sets the items. */ - void setItems(QList> newItems); + void setItems(QList newItems); bool itemsNull() const; void setItemsNull(); @@ -100,7 +99,7 @@ public: protected: - QList> m_items; + QList m_items; qint32 m_totalRecordCount; qint32 m_startIndex; QString m_ownerId; diff --git a/core/include/JellyfinQt/dto/timerinfodtoqueryresult.h b/core/include/JellyfinQt/dto/timerinfodtoqueryresult.h index bebb1e8..e70e036 100644 --- a/core/include/JellyfinQt/dto/timerinfodtoqueryresult.h +++ b/core/include/JellyfinQt/dto/timerinfodtoqueryresult.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -62,11 +61,11 @@ public: /** * @brief Gets or sets the items. */ - QList> items() const; + QList items() const; /** * @brief Gets or sets the items. */ - void setItems(QList> newItems); + void setItems(QList newItems); bool itemsNull() const; void setItemsNull(); @@ -90,7 +89,7 @@ public: protected: - QList> m_items; + QList m_items; qint32 m_totalRecordCount; qint32 m_startIndex; }; diff --git a/core/include/JellyfinQt/dto/typeoptions.h b/core/include/JellyfinQt/dto/typeoptions.h index 9d348ec..6f2855f 100644 --- a/core/include/JellyfinQt/dto/typeoptions.h +++ b/core/include/JellyfinQt/dto/typeoptions.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -96,9 +95,9 @@ public: void setImageFetcherOrderNull(); - QList> imageOptions() const; + QList imageOptions() const; - void setImageOptions(QList> newImageOptions); + void setImageOptions(QList newImageOptions); bool imageOptionsNull() const; void setImageOptionsNull(); @@ -109,7 +108,7 @@ protected: QStringList m_metadataFetcherOrder; QStringList m_imageFetchers; QStringList m_imageFetcherOrder; - QList> m_imageOptions; + QList m_imageOptions; }; } // NS DTO diff --git a/core/include/JellyfinQt/dto/userpolicy.h b/core/include/JellyfinQt/dto/userpolicy.h index 88381a9..d9aeb74 100644 --- a/core/include/JellyfinQt/dto/userpolicy.h +++ b/core/include/JellyfinQt/dto/userpolicy.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -113,9 +112,9 @@ public: void setEnableUserPreferenceAccess(bool newEnableUserPreferenceAccess); - QList> accessSchedules() const; + QList accessSchedules() const; - void setAccessSchedules(QList> newAccessSchedules); + void setAccessSchedules(QList newAccessSchedules); bool accessSchedulesNull() const; void setAccessSchedulesNull(); @@ -309,7 +308,7 @@ protected: std::optional m_maxParentalRating = std::nullopt; QStringList m_blockedTags; bool m_enableUserPreferenceAccess; - QList> m_accessSchedules; + QList m_accessSchedules; QList m_blockUnratedItems; bool m_enableRemoteControlOfOtherUsers; bool m_enableSharedDeviceControl; diff --git a/core/include/JellyfinQt/jellyfin.h b/core/include/JellyfinQt/jellyfin.h index 417827f..ac15c2b 100644 --- a/core/include/JellyfinQt/jellyfin.h +++ b/core/include/JellyfinQt/jellyfin.h @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "apimodel.h" #include "serverdiscoverymodel.h" #include "viewmodel/item.h" +#include "viewmodel/itemmodel.h" #include "viewmodel/loader.h" #include "viewmodel/playbackmanager.h" diff --git a/core/include/JellyfinQt/loader/http/addlistingprovider.h b/core/include/JellyfinQt/loader/http/addlistingprovider.h index 9cdd16f..7457f51 100644 --- a/core/include/JellyfinQt/loader/http/addlistingprovider.h +++ b/core/include/JellyfinQt/loader/http/addlistingprovider.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Adds a listings provider. */ -class AddListingProvider : public Jellyfin::Support::HttpLoader { +class AddListingProviderLoader : public Jellyfin::Support::HttpLoader { public: - explicit AddListingProvider(ApiClient *apiClient = nullptr); + explicit AddListingProviderLoader(ApiClient *apiClient = nullptr); protected: QString path(const AddListingProviderParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/addtunerhost.h b/core/include/JellyfinQt/loader/http/addtunerhost.h index 0dd41ed..1a52daf 100644 --- a/core/include/JellyfinQt/loader/http/addtunerhost.h +++ b/core/include/JellyfinQt/loader/http/addtunerhost.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Adds a tuner host. */ -class AddTunerHost : public Jellyfin::Support::HttpLoader { +class AddTunerHostLoader : public Jellyfin::Support::HttpLoader { public: - explicit AddTunerHost(ApiClient *apiClient = nullptr); + explicit AddTunerHostLoader(ApiClient *apiClient = nullptr); protected: QString path(const AddTunerHostParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/authenticateuser.h b/core/include/JellyfinQt/loader/http/authenticateuser.h index 24902c9..a91e68d 100644 --- a/core/include/JellyfinQt/loader/http/authenticateuser.h +++ b/core/include/JellyfinQt/loader/http/authenticateuser.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Authenticates a user. */ -class AuthenticateUser : public Jellyfin::Support::HttpLoader { +class AuthenticateUserLoader : public Jellyfin::Support::HttpLoader { public: - explicit AuthenticateUser(ApiClient *apiClient = nullptr); + explicit AuthenticateUserLoader(ApiClient *apiClient = nullptr); protected: QString path(const AuthenticateUserParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/authenticateuserbyname.h b/core/include/JellyfinQt/loader/http/authenticateuserbyname.h index c51eca4..8bd9993 100644 --- a/core/include/JellyfinQt/loader/http/authenticateuserbyname.h +++ b/core/include/JellyfinQt/loader/http/authenticateuserbyname.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Authenticates a user by name. */ -class AuthenticateUserByName : public Jellyfin::Support::HttpLoader { +class AuthenticateUserByNameLoader : public Jellyfin::Support::HttpLoader { public: - explicit AuthenticateUserByName(ApiClient *apiClient = nullptr); + explicit AuthenticateUserByNameLoader(ApiClient *apiClient = nullptr); protected: QString path(const AuthenticateUserByNameParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/authenticatewithquickconnect.h b/core/include/JellyfinQt/loader/http/authenticatewithquickconnect.h index 6d01f77..c04b60a 100644 --- a/core/include/JellyfinQt/loader/http/authenticatewithquickconnect.h +++ b/core/include/JellyfinQt/loader/http/authenticatewithquickconnect.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Authenticates a user with quick connect. */ -class AuthenticateWithQuickConnect : public Jellyfin::Support::HttpLoader { +class AuthenticateWithQuickConnectLoader : public Jellyfin::Support::HttpLoader { public: - explicit AuthenticateWithQuickConnect(ApiClient *apiClient = nullptr); + explicit AuthenticateWithQuickConnectLoader(ApiClient *apiClient = nullptr); protected: QString path(const AuthenticateWithQuickConnectParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/connect.h b/core/include/JellyfinQt/loader/http/connect.h index 73e6a0c..65ca3b3 100644 --- a/core/include/JellyfinQt/loader/http/connect.h +++ b/core/include/JellyfinQt/loader/http/connect.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Attempts to retrieve authentication information. */ -class Connect : public Jellyfin::Support::HttpLoader { +class ConnectLoader : public Jellyfin::Support::HttpLoader { public: - explicit Connect(ApiClient *apiClient = nullptr); + explicit ConnectLoader(ApiClient *apiClient = nullptr); protected: QString path(const ConnectParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/createcollection.h b/core/include/JellyfinQt/loader/http/createcollection.h index 4039516..0272250 100644 --- a/core/include/JellyfinQt/loader/http/createcollection.h +++ b/core/include/JellyfinQt/loader/http/createcollection.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Creates a new collection. */ -class CreateCollection : public Jellyfin::Support::HttpLoader { +class CreateCollectionLoader : public Jellyfin::Support::HttpLoader { public: - explicit CreateCollection(ApiClient *apiClient = nullptr); + explicit CreateCollectionLoader(ApiClient *apiClient = nullptr); protected: QString path(const CreateCollectionParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/createplaylist.h b/core/include/JellyfinQt/loader/http/createplaylist.h index 9cc697a..a1f736f 100644 --- a/core/include/JellyfinQt/loader/http/createplaylist.h +++ b/core/include/JellyfinQt/loader/http/createplaylist.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Creates a new playlist. */ -class CreatePlaylist : public Jellyfin::Support::HttpLoader { +class CreatePlaylistLoader : public Jellyfin::Support::HttpLoader { public: - explicit CreatePlaylist(ApiClient *apiClient = nullptr); + explicit CreatePlaylistLoader(ApiClient *apiClient = nullptr); protected: QString path(const CreatePlaylistParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/createuserbyname.h b/core/include/JellyfinQt/loader/http/createuserbyname.h index fde9077..823f8db 100644 --- a/core/include/JellyfinQt/loader/http/createuserbyname.h +++ b/core/include/JellyfinQt/loader/http/createuserbyname.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Creates a user. */ -class CreateUserByName : public Jellyfin::Support::HttpLoader { +class CreateUserByNameLoader : public Jellyfin::Support::HttpLoader { public: - explicit CreateUserByName(ApiClient *apiClient = nullptr); + explicit CreateUserByNameLoader(ApiClient *apiClient = nullptr); protected: QString path(const CreateUserByNameParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/deleteuseritemrating.h b/core/include/JellyfinQt/loader/http/deleteuseritemrating.h index 8dda776..d50d9e9 100644 --- a/core/include/JellyfinQt/loader/http/deleteuseritemrating.h +++ b/core/include/JellyfinQt/loader/http/deleteuseritemrating.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Deletes a user's saved personal rating for an item. */ -class DeleteUserItemRating : public Jellyfin::Support::HttpLoader { +class DeleteUserItemRatingLoader : public Jellyfin::Support::HttpLoader { public: - explicit DeleteUserItemRating(ApiClient *apiClient = nullptr); + explicit DeleteUserItemRatingLoader(ApiClient *apiClient = nullptr); protected: QString path(const DeleteUserItemRatingParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/forgotpassword.h b/core/include/JellyfinQt/loader/http/forgotpassword.h index 27d332d..18db732 100644 --- a/core/include/JellyfinQt/loader/http/forgotpassword.h +++ b/core/include/JellyfinQt/loader/http/forgotpassword.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Initiates the forgot password process for a local user. */ -class ForgotPassword : public Jellyfin::Support::HttpLoader { +class ForgotPasswordLoader : public Jellyfin::Support::HttpLoader { public: - explicit ForgotPassword(ApiClient *apiClient = nullptr); + explicit ForgotPasswordLoader(ApiClient *apiClient = nullptr); protected: QString path(const ForgotPasswordParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/forgotpasswordpin.h b/core/include/JellyfinQt/loader/http/forgotpasswordpin.h index 30e3912..da1cafd 100644 --- a/core/include/JellyfinQt/loader/http/forgotpasswordpin.h +++ b/core/include/JellyfinQt/loader/http/forgotpasswordpin.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Redeems a forgot password pin. */ -class ForgotPasswordPin : public Jellyfin::Support::HttpLoader { +class ForgotPasswordPinLoader : public Jellyfin::Support::HttpLoader { public: - explicit ForgotPasswordPin(ApiClient *apiClient = nullptr); + explicit ForgotPasswordPinLoader(ApiClient *apiClient = nullptr); protected: QString path(const ForgotPasswordPinParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/get.h b/core/include/JellyfinQt/loader/http/get.h index 99f62b2..1049fc9 100644 --- a/core/include/JellyfinQt/loader/http/get.h +++ b/core/include/JellyfinQt/loader/http/get.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets the search hint result. */ -class Get : public Jellyfin::Support::HttpLoader { +class GetLoader : public Jellyfin::Support::HttpLoader { public: - explicit Get(ApiClient *apiClient = nullptr); + explicit GetLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getadditionalpart.h b/core/include/JellyfinQt/loader/http/getadditionalpart.h index d7b37c3..8bd9836 100644 --- a/core/include/JellyfinQt/loader/http/getadditionalpart.h +++ b/core/include/JellyfinQt/loader/http/getadditionalpart.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets additional parts for a video. */ -class GetAdditionalPart : public Jellyfin::Support::HttpLoader { +class GetAdditionalPartLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetAdditionalPart(ApiClient *apiClient = nullptr); + explicit GetAdditionalPartLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetAdditionalPartParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getalbumartists.h b/core/include/JellyfinQt/loader/http/getalbumartists.h index 9fbe27c..4a5d1fb 100644 --- a/core/include/JellyfinQt/loader/http/getalbumartists.h +++ b/core/include/JellyfinQt/loader/http/getalbumartists.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets all album artists from a given item, folder, or the entire library. */ -class GetAlbumArtists : public Jellyfin::Support::HttpLoader { +class GetAlbumArtistsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetAlbumArtists(ApiClient *apiClient = nullptr); + explicit GetAlbumArtistsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetAlbumArtistsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getartistbyname.h b/core/include/JellyfinQt/loader/http/getartistbyname.h index 733de2a..65472a8 100644 --- a/core/include/JellyfinQt/loader/http/getartistbyname.h +++ b/core/include/JellyfinQt/loader/http/getartistbyname.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets an artist by name. */ -class GetArtistByName : public Jellyfin::Support::HttpLoader { +class GetArtistByNameLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetArtistByName(ApiClient *apiClient = nullptr); + explicit GetArtistByNameLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetArtistByNameParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getartists.h b/core/include/JellyfinQt/loader/http/getartists.h index 1ffbcab..8a4ee62 100644 --- a/core/include/JellyfinQt/loader/http/getartists.h +++ b/core/include/JellyfinQt/loader/http/getartists.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets all artists from a given item, folder, or the entire library. */ -class GetArtists : public Jellyfin::Support::HttpLoader { +class GetArtistsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetArtists(ApiClient *apiClient = nullptr); + explicit GetArtistsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetArtistsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getbrandingoptions.h b/core/include/JellyfinQt/loader/http/getbrandingoptions.h index adde201..077d7bb 100644 --- a/core/include/JellyfinQt/loader/http/getbrandingoptions.h +++ b/core/include/JellyfinQt/loader/http/getbrandingoptions.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets branding configuration. */ -class GetBrandingOptions : public Jellyfin::Support::HttpLoader { +class GetBrandingOptionsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetBrandingOptions(ApiClient *apiClient = nullptr); + explicit GetBrandingOptionsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetBrandingOptionsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getchannel.h b/core/include/JellyfinQt/loader/http/getchannel.h index 3e6bd5a..3069142 100644 --- a/core/include/JellyfinQt/loader/http/getchannel.h +++ b/core/include/JellyfinQt/loader/http/getchannel.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a live tv channel. */ -class GetChannel : public Jellyfin::Support::HttpLoader { +class GetChannelLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetChannel(ApiClient *apiClient = nullptr); + explicit GetChannelLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetChannelParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getchannelfeatures.h b/core/include/JellyfinQt/loader/http/getchannelfeatures.h index ac81a5f..3931787 100644 --- a/core/include/JellyfinQt/loader/http/getchannelfeatures.h +++ b/core/include/JellyfinQt/loader/http/getchannelfeatures.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get channel features. */ -class GetChannelFeatures : public Jellyfin::Support::HttpLoader { +class GetChannelFeaturesLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetChannelFeatures(ApiClient *apiClient = nullptr); + explicit GetChannelFeaturesLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetChannelFeaturesParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getchannelitems.h b/core/include/JellyfinQt/loader/http/getchannelitems.h index dd94c58..2333a8c 100644 --- a/core/include/JellyfinQt/loader/http/getchannelitems.h +++ b/core/include/JellyfinQt/loader/http/getchannelitems.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get channel items. */ -class GetChannelItems : public Jellyfin::Support::HttpLoader { +class GetChannelItemsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetChannelItems(ApiClient *apiClient = nullptr); + explicit GetChannelItemsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetChannelItemsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getchannelmappingoptions.h b/core/include/JellyfinQt/loader/http/getchannelmappingoptions.h index 307a628..2852faa 100644 --- a/core/include/JellyfinQt/loader/http/getchannelmappingoptions.h +++ b/core/include/JellyfinQt/loader/http/getchannelmappingoptions.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get channel mapping options. */ -class GetChannelMappingOptions : public Jellyfin::Support::HttpLoader { +class GetChannelMappingOptionsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetChannelMappingOptions(ApiClient *apiClient = nullptr); + explicit GetChannelMappingOptionsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetChannelMappingOptionsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getchannels.h b/core/include/JellyfinQt/loader/http/getchannels.h index 0e75694..c8b4d5e 100644 --- a/core/include/JellyfinQt/loader/http/getchannels.h +++ b/core/include/JellyfinQt/loader/http/getchannels.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets available channels. */ -class GetChannels : public Jellyfin::Support::HttpLoader { +class GetChannelsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetChannels(ApiClient *apiClient = nullptr); + explicit GetChannelsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetChannelsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getconfiguration.h b/core/include/JellyfinQt/loader/http/getconfiguration.h index 002034b..3143899 100644 --- a/core/include/JellyfinQt/loader/http/getconfiguration.h +++ b/core/include/JellyfinQt/loader/http/getconfiguration.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets application configuration. */ -class GetConfiguration : public Jellyfin::Support::HttpLoader { +class GetConfigurationLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetConfiguration(ApiClient *apiClient = nullptr); + explicit GetConfigurationLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetConfigurationParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getcriticreviews.h b/core/include/JellyfinQt/loader/http/getcriticreviews.h index 12e0558..0b11ce4 100644 --- a/core/include/JellyfinQt/loader/http/getcriticreviews.h +++ b/core/include/JellyfinQt/loader/http/getcriticreviews.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets critic review for an item. */ -class GetCriticReviews : public Jellyfin::Support::HttpLoader { +class GetCriticReviewsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetCriticReviews(ApiClient *apiClient = nullptr); + explicit GetCriticReviewsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetCriticReviewsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getcurrentuser.h b/core/include/JellyfinQt/loader/http/getcurrentuser.h index 66a9c4f..d600f94 100644 --- a/core/include/JellyfinQt/loader/http/getcurrentuser.h +++ b/core/include/JellyfinQt/loader/http/getcurrentuser.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets the user based on auth token. */ -class GetCurrentUser : public Jellyfin::Support::HttpLoader { +class GetCurrentUserLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetCurrentUser(ApiClient *apiClient = nullptr); + explicit GetCurrentUserLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetCurrentUserParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getdefaultdirectorybrowser.h b/core/include/JellyfinQt/loader/http/getdefaultdirectorybrowser.h index edea2a4..7739785 100644 --- a/core/include/JellyfinQt/loader/http/getdefaultdirectorybrowser.h +++ b/core/include/JellyfinQt/loader/http/getdefaultdirectorybrowser.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get Default directory browser. */ -class GetDefaultDirectoryBrowser : public Jellyfin::Support::HttpLoader { +class GetDefaultDirectoryBrowserLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetDefaultDirectoryBrowser(ApiClient *apiClient = nullptr); + explicit GetDefaultDirectoryBrowserLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetDefaultDirectoryBrowserParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getdefaultlistingprovider.h b/core/include/JellyfinQt/loader/http/getdefaultlistingprovider.h index 2a21891..87718d0 100644 --- a/core/include/JellyfinQt/loader/http/getdefaultlistingprovider.h +++ b/core/include/JellyfinQt/loader/http/getdefaultlistingprovider.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets default listings provider info. */ -class GetDefaultListingProvider : public Jellyfin::Support::HttpLoader { +class GetDefaultListingProviderLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetDefaultListingProvider(ApiClient *apiClient = nullptr); + explicit GetDefaultListingProviderLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetDefaultListingProviderParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getdefaultmetadataoptions.h b/core/include/JellyfinQt/loader/http/getdefaultmetadataoptions.h index 08a846e..79ec301 100644 --- a/core/include/JellyfinQt/loader/http/getdefaultmetadataoptions.h +++ b/core/include/JellyfinQt/loader/http/getdefaultmetadataoptions.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a default MetadataOptions object. */ -class GetDefaultMetadataOptions : public Jellyfin::Support::HttpLoader { +class GetDefaultMetadataOptionsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetDefaultMetadataOptions(ApiClient *apiClient = nullptr); + explicit GetDefaultMetadataOptionsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetDefaultMetadataOptionsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getdefaultprofile.h b/core/include/JellyfinQt/loader/http/getdefaultprofile.h index efd4960..619e977 100644 --- a/core/include/JellyfinQt/loader/http/getdefaultprofile.h +++ b/core/include/JellyfinQt/loader/http/getdefaultprofile.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets the default profile. */ -class GetDefaultProfile : public Jellyfin::Support::HttpLoader { +class GetDefaultProfileLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetDefaultProfile(ApiClient *apiClient = nullptr); + explicit GetDefaultProfileLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetDefaultProfileParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getdefaulttimer.h b/core/include/JellyfinQt/loader/http/getdefaulttimer.h index c5ee991..0f72c8d 100644 --- a/core/include/JellyfinQt/loader/http/getdefaulttimer.h +++ b/core/include/JellyfinQt/loader/http/getdefaulttimer.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets the default values for a new timer. */ -class GetDefaultTimer : public Jellyfin::Support::HttpLoader { +class GetDefaultTimerLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetDefaultTimer(ApiClient *apiClient = nullptr); + explicit GetDefaultTimerLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetDefaultTimerParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getdeviceinfo.h b/core/include/JellyfinQt/loader/http/getdeviceinfo.h index 714e92c..69ed524 100644 --- a/core/include/JellyfinQt/loader/http/getdeviceinfo.h +++ b/core/include/JellyfinQt/loader/http/getdeviceinfo.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get info for a device. */ -class GetDeviceInfo : public Jellyfin::Support::HttpLoader { +class GetDeviceInfoLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetDeviceInfo(ApiClient *apiClient = nullptr); + explicit GetDeviceInfoLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetDeviceInfoParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getdeviceoptions.h b/core/include/JellyfinQt/loader/http/getdeviceoptions.h index a5a8356..b2e750a 100644 --- a/core/include/JellyfinQt/loader/http/getdeviceoptions.h +++ b/core/include/JellyfinQt/loader/http/getdeviceoptions.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get options for a device. */ -class GetDeviceOptions : public Jellyfin::Support::HttpLoader { +class GetDeviceOptionsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetDeviceOptions(ApiClient *apiClient = nullptr); + explicit GetDeviceOptionsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetDeviceOptionsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getdevices.h b/core/include/JellyfinQt/loader/http/getdevices.h index 6af6773..dca01a9 100644 --- a/core/include/JellyfinQt/loader/http/getdevices.h +++ b/core/include/JellyfinQt/loader/http/getdevices.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get Devices. */ -class GetDevices : public Jellyfin::Support::HttpLoader { +class GetDevicesLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetDevices(ApiClient *apiClient = nullptr); + explicit GetDevicesLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetDevicesParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getdisplaypreferences.h b/core/include/JellyfinQt/loader/http/getdisplaypreferences.h index cb6a65f..bcebb88 100644 --- a/core/include/JellyfinQt/loader/http/getdisplaypreferences.h +++ b/core/include/JellyfinQt/loader/http/getdisplaypreferences.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get Display Preferences. */ -class GetDisplayPreferences : public Jellyfin::Support::HttpLoader { +class GetDisplayPreferencesLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetDisplayPreferences(ApiClient *apiClient = nullptr); + explicit GetDisplayPreferencesLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetDisplayPreferencesParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getendpointinfo.h b/core/include/JellyfinQt/loader/http/getendpointinfo.h index 96f235a..e25114a 100644 --- a/core/include/JellyfinQt/loader/http/getendpointinfo.h +++ b/core/include/JellyfinQt/loader/http/getendpointinfo.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets information about the request endpoint. */ -class GetEndpointInfo : public Jellyfin::Support::HttpLoader { +class GetEndpointInfoLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetEndpointInfo(ApiClient *apiClient = nullptr); + explicit GetEndpointInfoLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetEndpointInfoParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getepisodes.h b/core/include/JellyfinQt/loader/http/getepisodes.h index f04ce7d..e9b565d 100644 --- a/core/include/JellyfinQt/loader/http/getepisodes.h +++ b/core/include/JellyfinQt/loader/http/getepisodes.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets episodes for a tv season. */ -class GetEpisodes : public Jellyfin::Support::HttpLoader { +class GetEpisodesLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetEpisodes(ApiClient *apiClient = nullptr); + explicit GetEpisodesLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetEpisodesParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getfirstuser.h b/core/include/JellyfinQt/loader/http/getfirstuser.h index b3a5cd7..f14f1e6 100644 --- a/core/include/JellyfinQt/loader/http/getfirstuser.h +++ b/core/include/JellyfinQt/loader/http/getfirstuser.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets the first user. */ -class GetFirstUser : public Jellyfin::Support::HttpLoader { +class GetFirstUserLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetFirstUser(ApiClient *apiClient = nullptr); + explicit GetFirstUserLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetFirstUserParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getfirstuser_2.h b/core/include/JellyfinQt/loader/http/getfirstuser_2.h index 6610c06..db51ab3 100644 --- a/core/include/JellyfinQt/loader/http/getfirstuser_2.h +++ b/core/include/JellyfinQt/loader/http/getfirstuser_2.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets the first user. */ -class GetFirstUser_2 : public Jellyfin::Support::HttpLoader { +class GetFirstUser_2Loader : public Jellyfin::Support::HttpLoader { public: - explicit GetFirstUser_2(ApiClient *apiClient = nullptr); + explicit GetFirstUser_2Loader(ApiClient *apiClient = nullptr); protected: QString path(const GetFirstUser_2Params& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getgenre.h b/core/include/JellyfinQt/loader/http/getgenre.h index c1c7c93..630a592 100644 --- a/core/include/JellyfinQt/loader/http/getgenre.h +++ b/core/include/JellyfinQt/loader/http/getgenre.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a genre, by name. */ -class GetGenre : public Jellyfin::Support::HttpLoader { +class GetGenreLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetGenre(ApiClient *apiClient = nullptr); + explicit GetGenreLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetGenreParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getgenres.h b/core/include/JellyfinQt/loader/http/getgenres.h index 070472b..ffa3e42 100644 --- a/core/include/JellyfinQt/loader/http/getgenres.h +++ b/core/include/JellyfinQt/loader/http/getgenres.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets all genres from a given item, folder, or the entire library. */ -class GetGenres : public Jellyfin::Support::HttpLoader { +class GetGenresLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetGenres(ApiClient *apiClient = nullptr); + explicit GetGenresLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetGenresParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getguideinfo.h b/core/include/JellyfinQt/loader/http/getguideinfo.h index 0960e25..0a3ea51 100644 --- a/core/include/JellyfinQt/loader/http/getguideinfo.h +++ b/core/include/JellyfinQt/loader/http/getguideinfo.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get guid info. */ -class GetGuideInfo : public Jellyfin::Support::HttpLoader { +class GetGuideInfoLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetGuideInfo(ApiClient *apiClient = nullptr); + explicit GetGuideInfoLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetGuideInfoParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getinstantmixfromalbum.h b/core/include/JellyfinQt/loader/http/getinstantmixfromalbum.h index d1ada74..4a960b0 100644 --- a/core/include/JellyfinQt/loader/http/getinstantmixfromalbum.h +++ b/core/include/JellyfinQt/loader/http/getinstantmixfromalbum.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Creates an instant playlist based on a given song. */ -class GetInstantMixFromAlbum : public Jellyfin::Support::HttpLoader { +class GetInstantMixFromAlbumLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetInstantMixFromAlbum(ApiClient *apiClient = nullptr); + explicit GetInstantMixFromAlbumLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetInstantMixFromAlbumParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getinstantmixfromartists.h b/core/include/JellyfinQt/loader/http/getinstantmixfromartists.h index 3e1f038..1aa4566 100644 --- a/core/include/JellyfinQt/loader/http/getinstantmixfromartists.h +++ b/core/include/JellyfinQt/loader/http/getinstantmixfromartists.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Creates an instant playlist based on a given song. */ -class GetInstantMixFromArtists : public Jellyfin::Support::HttpLoader { +class GetInstantMixFromArtistsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetInstantMixFromArtists(ApiClient *apiClient = nullptr); + explicit GetInstantMixFromArtistsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetInstantMixFromArtistsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getinstantmixfromitem.h b/core/include/JellyfinQt/loader/http/getinstantmixfromitem.h index dd14984..3ecd52f 100644 --- a/core/include/JellyfinQt/loader/http/getinstantmixfromitem.h +++ b/core/include/JellyfinQt/loader/http/getinstantmixfromitem.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Creates an instant playlist based on a given song. */ -class GetInstantMixFromItem : public Jellyfin::Support::HttpLoader { +class GetInstantMixFromItemLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetInstantMixFromItem(ApiClient *apiClient = nullptr); + explicit GetInstantMixFromItemLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetInstantMixFromItemParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getinstantmixfrommusicgenre.h b/core/include/JellyfinQt/loader/http/getinstantmixfrommusicgenre.h index ad473ec..09d546d 100644 --- a/core/include/JellyfinQt/loader/http/getinstantmixfrommusicgenre.h +++ b/core/include/JellyfinQt/loader/http/getinstantmixfrommusicgenre.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Creates an instant playlist based on a given song. */ -class GetInstantMixFromMusicGenre : public Jellyfin::Support::HttpLoader { +class GetInstantMixFromMusicGenreLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetInstantMixFromMusicGenre(ApiClient *apiClient = nullptr); + explicit GetInstantMixFromMusicGenreLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetInstantMixFromMusicGenreParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getinstantmixfrommusicgenres.h b/core/include/JellyfinQt/loader/http/getinstantmixfrommusicgenres.h index 7d691bc..18274f1 100644 --- a/core/include/JellyfinQt/loader/http/getinstantmixfrommusicgenres.h +++ b/core/include/JellyfinQt/loader/http/getinstantmixfrommusicgenres.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Creates an instant playlist based on a given song. */ -class GetInstantMixFromMusicGenres : public Jellyfin::Support::HttpLoader { +class GetInstantMixFromMusicGenresLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetInstantMixFromMusicGenres(ApiClient *apiClient = nullptr); + explicit GetInstantMixFromMusicGenresLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetInstantMixFromMusicGenresParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getinstantmixfromplaylist.h b/core/include/JellyfinQt/loader/http/getinstantmixfromplaylist.h index 7fe309d..1f9b1cd 100644 --- a/core/include/JellyfinQt/loader/http/getinstantmixfromplaylist.h +++ b/core/include/JellyfinQt/loader/http/getinstantmixfromplaylist.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Creates an instant playlist based on a given song. */ -class GetInstantMixFromPlaylist : public Jellyfin::Support::HttpLoader { +class GetInstantMixFromPlaylistLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetInstantMixFromPlaylist(ApiClient *apiClient = nullptr); + explicit GetInstantMixFromPlaylistLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetInstantMixFromPlaylistParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getinstantmixfromsong.h b/core/include/JellyfinQt/loader/http/getinstantmixfromsong.h index 03322da..005324c 100644 --- a/core/include/JellyfinQt/loader/http/getinstantmixfromsong.h +++ b/core/include/JellyfinQt/loader/http/getinstantmixfromsong.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Creates an instant playlist based on a given song. */ -class GetInstantMixFromSong : public Jellyfin::Support::HttpLoader { +class GetInstantMixFromSongLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetInstantMixFromSong(ApiClient *apiClient = nullptr); + explicit GetInstantMixFromSongLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetInstantMixFromSongParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getintros.h b/core/include/JellyfinQt/loader/http/getintros.h index e34c549..e2059b2 100644 --- a/core/include/JellyfinQt/loader/http/getintros.h +++ b/core/include/JellyfinQt/loader/http/getintros.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets intros to play before the main media item plays. */ -class GetIntros : public Jellyfin::Support::HttpLoader { +class GetIntrosLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetIntros(ApiClient *apiClient = nullptr); + explicit GetIntrosLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetIntrosParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getitem.h b/core/include/JellyfinQt/loader/http/getitem.h index 1bbe694..a0f2851 100644 --- a/core/include/JellyfinQt/loader/http/getitem.h +++ b/core/include/JellyfinQt/loader/http/getitem.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets an item from a user's library. */ -class GetItem : public Jellyfin::Support::HttpLoader { +class GetItemLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetItem(ApiClient *apiClient = nullptr); + explicit GetItemLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetItemParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getitemcounts.h b/core/include/JellyfinQt/loader/http/getitemcounts.h index 740614f..bd45850 100644 --- a/core/include/JellyfinQt/loader/http/getitemcounts.h +++ b/core/include/JellyfinQt/loader/http/getitemcounts.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get item counts. */ -class GetItemCounts : public Jellyfin::Support::HttpLoader { +class GetItemCountsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetItemCounts(ApiClient *apiClient = nullptr); + explicit GetItemCountsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetItemCountsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getitems.h b/core/include/JellyfinQt/loader/http/getitems.h index 5664042..1ffa0f5 100644 --- a/core/include/JellyfinQt/loader/http/getitems.h +++ b/core/include/JellyfinQt/loader/http/getitems.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets items based on a query. */ -class GetItems : public Jellyfin::Support::HttpLoader { +class GetItemsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetItems(ApiClient *apiClient = nullptr); + explicit GetItemsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetItemsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getitemsbyuserid.h b/core/include/JellyfinQt/loader/http/getitemsbyuserid.h index cc5a109..3477f39 100644 --- a/core/include/JellyfinQt/loader/http/getitemsbyuserid.h +++ b/core/include/JellyfinQt/loader/http/getitemsbyuserid.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets items based on a query. */ -class GetItemsByUserId : public Jellyfin::Support::HttpLoader { +class GetItemsByUserIdLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetItemsByUserId(ApiClient *apiClient = nullptr); + explicit GetItemsByUserIdLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetItemsByUserIdParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getkeys.h b/core/include/JellyfinQt/loader/http/getkeys.h index 3e3d010..c289ac5 100644 --- a/core/include/JellyfinQt/loader/http/getkeys.h +++ b/core/include/JellyfinQt/loader/http/getkeys.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get all keys. */ -class GetKeys : public Jellyfin::Support::HttpLoader { +class GetKeysLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetKeys(ApiClient *apiClient = nullptr); + explicit GetKeysLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetKeysParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getlatestchannelitems.h b/core/include/JellyfinQt/loader/http/getlatestchannelitems.h index 1a08aaa..9a6a830 100644 --- a/core/include/JellyfinQt/loader/http/getlatestchannelitems.h +++ b/core/include/JellyfinQt/loader/http/getlatestchannelitems.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets latest channel items. */ -class GetLatestChannelItems : public Jellyfin::Support::HttpLoader { +class GetLatestChannelItemsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetLatestChannelItems(ApiClient *apiClient = nullptr); + explicit GetLatestChannelItemsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetLatestChannelItemsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getlibraryoptionsinfo.h b/core/include/JellyfinQt/loader/http/getlibraryoptionsinfo.h index 9352d78..bf7213d 100644 --- a/core/include/JellyfinQt/loader/http/getlibraryoptionsinfo.h +++ b/core/include/JellyfinQt/loader/http/getlibraryoptionsinfo.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets the library options info. */ -class GetLibraryOptionsInfo : public Jellyfin::Support::HttpLoader { +class GetLibraryOptionsInfoLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetLibraryOptionsInfo(ApiClient *apiClient = nullptr); + explicit GetLibraryOptionsInfoLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetLibraryOptionsInfoParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getlivetvchannels.h b/core/include/JellyfinQt/loader/http/getlivetvchannels.h index 715acd8..92028dc 100644 --- a/core/include/JellyfinQt/loader/http/getlivetvchannels.h +++ b/core/include/JellyfinQt/loader/http/getlivetvchannels.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets available live tv channels. */ -class GetLiveTvChannels : public Jellyfin::Support::HttpLoader { +class GetLiveTvChannelsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetLiveTvChannels(ApiClient *apiClient = nullptr); + explicit GetLiveTvChannelsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetLiveTvChannelsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getlivetvinfo.h b/core/include/JellyfinQt/loader/http/getlivetvinfo.h index 29795a2..7b556d7 100644 --- a/core/include/JellyfinQt/loader/http/getlivetvinfo.h +++ b/core/include/JellyfinQt/loader/http/getlivetvinfo.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets available live tv services. */ -class GetLiveTvInfo : public Jellyfin::Support::HttpLoader { +class GetLiveTvInfoLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetLiveTvInfo(ApiClient *apiClient = nullptr); + explicit GetLiveTvInfoLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetLiveTvInfoParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getlivetvprograms.h b/core/include/JellyfinQt/loader/http/getlivetvprograms.h index 45ab66c..3fd0610 100644 --- a/core/include/JellyfinQt/loader/http/getlivetvprograms.h +++ b/core/include/JellyfinQt/loader/http/getlivetvprograms.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets available live tv epgs. */ -class GetLiveTvPrograms : public Jellyfin::Support::HttpLoader { +class GetLiveTvProgramsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetLiveTvPrograms(ApiClient *apiClient = nullptr); + explicit GetLiveTvProgramsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetLiveTvProgramsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getlogentries.h b/core/include/JellyfinQt/loader/http/getlogentries.h index f5fd295..978f9cf 100644 --- a/core/include/JellyfinQt/loader/http/getlogentries.h +++ b/core/include/JellyfinQt/loader/http/getlogentries.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets activity log entries. */ -class GetLogEntries : public Jellyfin::Support::HttpLoader { +class GetLogEntriesLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetLogEntries(ApiClient *apiClient = nullptr); + explicit GetLogEntriesLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetLogEntriesParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getmediafolders.h b/core/include/JellyfinQt/loader/http/getmediafolders.h index 521cf40..a4daccc 100644 --- a/core/include/JellyfinQt/loader/http/getmediafolders.h +++ b/core/include/JellyfinQt/loader/http/getmediafolders.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets all user media folders. */ -class GetMediaFolders : public Jellyfin::Support::HttpLoader { +class GetMediaFoldersLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetMediaFolders(ApiClient *apiClient = nullptr); + explicit GetMediaFoldersLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetMediaFoldersParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getmetadataeditorinfo.h b/core/include/JellyfinQt/loader/http/getmetadataeditorinfo.h index d31f21e..b88ce7d 100644 --- a/core/include/JellyfinQt/loader/http/getmetadataeditorinfo.h +++ b/core/include/JellyfinQt/loader/http/getmetadataeditorinfo.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets metadata editor info for an item. */ -class GetMetadataEditorInfo : public Jellyfin::Support::HttpLoader { +class GetMetadataEditorInfoLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetMetadataEditorInfo(ApiClient *apiClient = nullptr); + explicit GetMetadataEditorInfoLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetMetadataEditorInfoParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getmusicgenre.h b/core/include/JellyfinQt/loader/http/getmusicgenre.h index 96f1295..308bba0 100644 --- a/core/include/JellyfinQt/loader/http/getmusicgenre.h +++ b/core/include/JellyfinQt/loader/http/getmusicgenre.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a music genre, by name. */ -class GetMusicGenre : public Jellyfin::Support::HttpLoader { +class GetMusicGenreLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetMusicGenre(ApiClient *apiClient = nullptr); + explicit GetMusicGenreLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetMusicGenreParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getmusicgenres.h b/core/include/JellyfinQt/loader/http/getmusicgenres.h index 78fec83..72c376f 100644 --- a/core/include/JellyfinQt/loader/http/getmusicgenres.h +++ b/core/include/JellyfinQt/loader/http/getmusicgenres.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets all music genres from a given item, folder, or the entire library. */ -class GetMusicGenres : public Jellyfin::Support::HttpLoader { +class GetMusicGenresLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetMusicGenres(ApiClient *apiClient = nullptr); + explicit GetMusicGenresLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetMusicGenresParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getnextup.h b/core/include/JellyfinQt/loader/http/getnextup.h index 0f3d2fa..6fda54e 100644 --- a/core/include/JellyfinQt/loader/http/getnextup.h +++ b/core/include/JellyfinQt/loader/http/getnextup.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a list of next up episodes. */ -class GetNextUp : public Jellyfin::Support::HttpLoader { +class GetNextUpLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetNextUp(ApiClient *apiClient = nullptr); + explicit GetNextUpLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetNextUpParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getnotifications.h b/core/include/JellyfinQt/loader/http/getnotifications.h index 78aba61..dc7a7d5 100644 --- a/core/include/JellyfinQt/loader/http/getnotifications.h +++ b/core/include/JellyfinQt/loader/http/getnotifications.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a user's notifications. */ -class GetNotifications : public Jellyfin::Support::HttpLoader { +class GetNotificationsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetNotifications(ApiClient *apiClient = nullptr); + explicit GetNotificationsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetNotificationsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getnotificationssummary.h b/core/include/JellyfinQt/loader/http/getnotificationssummary.h index b9cb164..6c0710c 100644 --- a/core/include/JellyfinQt/loader/http/getnotificationssummary.h +++ b/core/include/JellyfinQt/loader/http/getnotificationssummary.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a user's notification summary. */ -class GetNotificationsSummary : public Jellyfin::Support::HttpLoader { +class GetNotificationsSummaryLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetNotificationsSummary(ApiClient *apiClient = nullptr); + explicit GetNotificationsSummaryLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetNotificationsSummaryParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getpackageinfo.h b/core/include/JellyfinQt/loader/http/getpackageinfo.h index 03fd8ed..517eb73 100644 --- a/core/include/JellyfinQt/loader/http/getpackageinfo.h +++ b/core/include/JellyfinQt/loader/http/getpackageinfo.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a package by name or assembly GUID. */ -class GetPackageInfo : public Jellyfin::Support::HttpLoader { +class GetPackageInfoLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetPackageInfo(ApiClient *apiClient = nullptr); + explicit GetPackageInfoLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetPackageInfoParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getperson.h b/core/include/JellyfinQt/loader/http/getperson.h index 638cb31..ba227b5 100644 --- a/core/include/JellyfinQt/loader/http/getperson.h +++ b/core/include/JellyfinQt/loader/http/getperson.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get person by name. */ -class GetPerson : public Jellyfin::Support::HttpLoader { +class GetPersonLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetPerson(ApiClient *apiClient = nullptr); + explicit GetPersonLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetPersonParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getpersons.h b/core/include/JellyfinQt/loader/http/getpersons.h index da1aaf7..15b17f0 100644 --- a/core/include/JellyfinQt/loader/http/getpersons.h +++ b/core/include/JellyfinQt/loader/http/getpersons.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets all persons. */ -class GetPersons : public Jellyfin::Support::HttpLoader { +class GetPersonsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetPersons(ApiClient *apiClient = nullptr); + explicit GetPersonsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetPersonsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getplaybackinfo.h b/core/include/JellyfinQt/loader/http/getplaybackinfo.h index 88df9c4..7b7eaaa 100644 --- a/core/include/JellyfinQt/loader/http/getplaybackinfo.h +++ b/core/include/JellyfinQt/loader/http/getplaybackinfo.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets live playback media info for an item. */ -class GetPlaybackInfo : public Jellyfin::Support::HttpLoader { +class GetPlaybackInfoLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetPlaybackInfo(ApiClient *apiClient = nullptr); + explicit GetPlaybackInfoLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetPlaybackInfoParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getplaylistitems.h b/core/include/JellyfinQt/loader/http/getplaylistitems.h index 6581b0a..0912b7a 100644 --- a/core/include/JellyfinQt/loader/http/getplaylistitems.h +++ b/core/include/JellyfinQt/loader/http/getplaylistitems.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets the original items of a playlist. */ -class GetPlaylistItems : public Jellyfin::Support::HttpLoader { +class GetPlaylistItemsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetPlaylistItems(ApiClient *apiClient = nullptr); + explicit GetPlaylistItemsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetPlaylistItemsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getpluginconfiguration.h b/core/include/JellyfinQt/loader/http/getpluginconfiguration.h index 946025b..f00aaa2 100644 --- a/core/include/JellyfinQt/loader/http/getpluginconfiguration.h +++ b/core/include/JellyfinQt/loader/http/getpluginconfiguration.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets plugin configuration. */ -class GetPluginConfiguration : public Jellyfin::Support::HttpLoader { +class GetPluginConfigurationLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetPluginConfiguration(ApiClient *apiClient = nullptr); + explicit GetPluginConfigurationLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetPluginConfigurationParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getpostedplaybackinfo.h b/core/include/JellyfinQt/loader/http/getpostedplaybackinfo.h index 0f85f17..f6ee9ac 100644 --- a/core/include/JellyfinQt/loader/http/getpostedplaybackinfo.h +++ b/core/include/JellyfinQt/loader/http/getpostedplaybackinfo.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets live playback media info for an item. */ -class GetPostedPlaybackInfo : public Jellyfin::Support::HttpLoader { +class GetPostedPlaybackInfoLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetPostedPlaybackInfo(ApiClient *apiClient = nullptr); + explicit GetPostedPlaybackInfoLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetPostedPlaybackInfoParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getprofile.h b/core/include/JellyfinQt/loader/http/getprofile.h index 70383b3..9d2355e 100644 --- a/core/include/JellyfinQt/loader/http/getprofile.h +++ b/core/include/JellyfinQt/loader/http/getprofile.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a single profile. */ -class GetProfile : public Jellyfin::Support::HttpLoader { +class GetProfileLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetProfile(ApiClient *apiClient = nullptr); + explicit GetProfileLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetProfileParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getprogram.h b/core/include/JellyfinQt/loader/http/getprogram.h index 0af3cab..54f26c7 100644 --- a/core/include/JellyfinQt/loader/http/getprogram.h +++ b/core/include/JellyfinQt/loader/http/getprogram.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a live tv program. */ -class GetProgram : public Jellyfin::Support::HttpLoader { +class GetProgramLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetProgram(ApiClient *apiClient = nullptr); + explicit GetProgramLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetProgramParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getprograms.h b/core/include/JellyfinQt/loader/http/getprograms.h index 0d3dcc0..d7138d1 100644 --- a/core/include/JellyfinQt/loader/http/getprograms.h +++ b/core/include/JellyfinQt/loader/http/getprograms.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets available live tv epgs. */ -class GetPrograms : public Jellyfin::Support::HttpLoader { +class GetProgramsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetPrograms(ApiClient *apiClient = nullptr); + explicit GetProgramsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetProgramsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getpublicsysteminfo.h b/core/include/JellyfinQt/loader/http/getpublicsysteminfo.h index 7230f56..3a28a0d 100644 --- a/core/include/JellyfinQt/loader/http/getpublicsysteminfo.h +++ b/core/include/JellyfinQt/loader/http/getpublicsysteminfo.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets public information about the server. */ -class GetPublicSystemInfo : public Jellyfin::Support::HttpLoader { +class GetPublicSystemInfoLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetPublicSystemInfo(ApiClient *apiClient = nullptr); + explicit GetPublicSystemInfoLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetPublicSystemInfoParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getqueryfilters.h b/core/include/JellyfinQt/loader/http/getqueryfilters.h index 561630c..00c56b8 100644 --- a/core/include/JellyfinQt/loader/http/getqueryfilters.h +++ b/core/include/JellyfinQt/loader/http/getqueryfilters.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets query filters. */ -class GetQueryFilters : public Jellyfin::Support::HttpLoader { +class GetQueryFiltersLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetQueryFilters(ApiClient *apiClient = nullptr); + explicit GetQueryFiltersLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetQueryFiltersParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getqueryfilterslegacy.h b/core/include/JellyfinQt/loader/http/getqueryfilterslegacy.h index ac035a5..4f51557 100644 --- a/core/include/JellyfinQt/loader/http/getqueryfilterslegacy.h +++ b/core/include/JellyfinQt/loader/http/getqueryfilterslegacy.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets legacy query filters. */ -class GetQueryFiltersLegacy : public Jellyfin::Support::HttpLoader { +class GetQueryFiltersLegacyLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetQueryFiltersLegacy(ApiClient *apiClient = nullptr); + explicit GetQueryFiltersLegacyLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetQueryFiltersLegacyParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getrecommendedprograms.h b/core/include/JellyfinQt/loader/http/getrecommendedprograms.h index d363f94..9de768e 100644 --- a/core/include/JellyfinQt/loader/http/getrecommendedprograms.h +++ b/core/include/JellyfinQt/loader/http/getrecommendedprograms.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets recommended live tv epgs. */ -class GetRecommendedPrograms : public Jellyfin::Support::HttpLoader { +class GetRecommendedProgramsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetRecommendedPrograms(ApiClient *apiClient = nullptr); + explicit GetRecommendedProgramsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetRecommendedProgramsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getrecording.h b/core/include/JellyfinQt/loader/http/getrecording.h index 3c97013..7cde68c 100644 --- a/core/include/JellyfinQt/loader/http/getrecording.h +++ b/core/include/JellyfinQt/loader/http/getrecording.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a live tv recording. */ -class GetRecording : public Jellyfin::Support::HttpLoader { +class GetRecordingLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetRecording(ApiClient *apiClient = nullptr); + explicit GetRecordingLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetRecordingParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getrecordingfolders.h b/core/include/JellyfinQt/loader/http/getrecordingfolders.h index 663fa5f..53b13ae 100644 --- a/core/include/JellyfinQt/loader/http/getrecordingfolders.h +++ b/core/include/JellyfinQt/loader/http/getrecordingfolders.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets recording folders. */ -class GetRecordingFolders : public Jellyfin::Support::HttpLoader { +class GetRecordingFoldersLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetRecordingFolders(ApiClient *apiClient = nullptr); + explicit GetRecordingFoldersLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetRecordingFoldersParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getrecordinggroups.h b/core/include/JellyfinQt/loader/http/getrecordinggroups.h index bb00c3f..73064dc 100644 --- a/core/include/JellyfinQt/loader/http/getrecordinggroups.h +++ b/core/include/JellyfinQt/loader/http/getrecordinggroups.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets live tv recording groups. */ -class GetRecordingGroups : public Jellyfin::Support::HttpLoader { +class GetRecordingGroupsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetRecordingGroups(ApiClient *apiClient = nullptr); + explicit GetRecordingGroupsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetRecordingGroupsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getrecordings.h b/core/include/JellyfinQt/loader/http/getrecordings.h index ec18f40..3b68324 100644 --- a/core/include/JellyfinQt/loader/http/getrecordings.h +++ b/core/include/JellyfinQt/loader/http/getrecordings.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets live tv recordings. */ -class GetRecordings : public Jellyfin::Support::HttpLoader { +class GetRecordingsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetRecordings(ApiClient *apiClient = nullptr); + explicit GetRecordingsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetRecordingsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getrecordingsseries.h b/core/include/JellyfinQt/loader/http/getrecordingsseries.h index f379ce5..6722d59 100644 --- a/core/include/JellyfinQt/loader/http/getrecordingsseries.h +++ b/core/include/JellyfinQt/loader/http/getrecordingsseries.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets live tv recording series. */ -class GetRecordingsSeries : public Jellyfin::Support::HttpLoader { +class GetRecordingsSeriesLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetRecordingsSeries(ApiClient *apiClient = nullptr); + explicit GetRecordingsSeriesLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetRecordingsSeriesParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getremoteimages.h b/core/include/JellyfinQt/loader/http/getremoteimages.h index 053ebec..6be9b2e 100644 --- a/core/include/JellyfinQt/loader/http/getremoteimages.h +++ b/core/include/JellyfinQt/loader/http/getremoteimages.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets available remote images for an item. */ -class GetRemoteImages : public Jellyfin::Support::HttpLoader { +class GetRemoteImagesLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetRemoteImages(ApiClient *apiClient = nullptr); + explicit GetRemoteImagesLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetRemoteImagesParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getresumeitems.h b/core/include/JellyfinQt/loader/http/getresumeitems.h index b44e44c..30ee752 100644 --- a/core/include/JellyfinQt/loader/http/getresumeitems.h +++ b/core/include/JellyfinQt/loader/http/getresumeitems.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets items based on a query. */ -class GetResumeItems : public Jellyfin::Support::HttpLoader { +class GetResumeItemsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetResumeItems(ApiClient *apiClient = nullptr); + explicit GetResumeItemsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetResumeItemsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getrootfolder.h b/core/include/JellyfinQt/loader/http/getrootfolder.h index 868765e..5345032 100644 --- a/core/include/JellyfinQt/loader/http/getrootfolder.h +++ b/core/include/JellyfinQt/loader/http/getrootfolder.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets the root folder from a user's library. */ -class GetRootFolder : public Jellyfin::Support::HttpLoader { +class GetRootFolderLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetRootFolder(ApiClient *apiClient = nullptr); + explicit GetRootFolderLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetRootFolderParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getseasons.h b/core/include/JellyfinQt/loader/http/getseasons.h index 00b1e68..d288dc2 100644 --- a/core/include/JellyfinQt/loader/http/getseasons.h +++ b/core/include/JellyfinQt/loader/http/getseasons.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets seasons for a tv series. */ -class GetSeasons : public Jellyfin::Support::HttpLoader { +class GetSeasonsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetSeasons(ApiClient *apiClient = nullptr); + explicit GetSeasonsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetSeasonsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getseriestimer.h b/core/include/JellyfinQt/loader/http/getseriestimer.h index dfe193a..a57e1d3 100644 --- a/core/include/JellyfinQt/loader/http/getseriestimer.h +++ b/core/include/JellyfinQt/loader/http/getseriestimer.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a live tv series timer. */ -class GetSeriesTimer : public Jellyfin::Support::HttpLoader { +class GetSeriesTimerLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetSeriesTimer(ApiClient *apiClient = nullptr); + explicit GetSeriesTimerLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetSeriesTimerParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getseriestimers.h b/core/include/JellyfinQt/loader/http/getseriestimers.h index 4c2bf06..934867a 100644 --- a/core/include/JellyfinQt/loader/http/getseriestimers.h +++ b/core/include/JellyfinQt/loader/http/getseriestimers.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets live tv series timers. */ -class GetSeriesTimers : public Jellyfin::Support::HttpLoader { +class GetSeriesTimersLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetSeriesTimers(ApiClient *apiClient = nullptr); + explicit GetSeriesTimersLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetSeriesTimersParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getsimilaralbums.h b/core/include/JellyfinQt/loader/http/getsimilaralbums.h index f4ab011..c6f18f8 100644 --- a/core/include/JellyfinQt/loader/http/getsimilaralbums.h +++ b/core/include/JellyfinQt/loader/http/getsimilaralbums.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets similar items. */ -class GetSimilarAlbums : public Jellyfin::Support::HttpLoader { +class GetSimilarAlbumsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetSimilarAlbums(ApiClient *apiClient = nullptr); + explicit GetSimilarAlbumsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetSimilarAlbumsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getsimilarartists.h b/core/include/JellyfinQt/loader/http/getsimilarartists.h index 1f7e879..c78d46e 100644 --- a/core/include/JellyfinQt/loader/http/getsimilarartists.h +++ b/core/include/JellyfinQt/loader/http/getsimilarartists.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets similar items. */ -class GetSimilarArtists : public Jellyfin::Support::HttpLoader { +class GetSimilarArtistsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetSimilarArtists(ApiClient *apiClient = nullptr); + explicit GetSimilarArtistsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetSimilarArtistsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getsimilaritems.h b/core/include/JellyfinQt/loader/http/getsimilaritems.h index ffcec8f..44e6e41 100644 --- a/core/include/JellyfinQt/loader/http/getsimilaritems.h +++ b/core/include/JellyfinQt/loader/http/getsimilaritems.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets similar items. */ -class GetSimilarItems : public Jellyfin::Support::HttpLoader { +class GetSimilarItemsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetSimilarItems(ApiClient *apiClient = nullptr); + explicit GetSimilarItemsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetSimilarItemsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getsimilarmovies.h b/core/include/JellyfinQt/loader/http/getsimilarmovies.h index 33d0793..dcb165b 100644 --- a/core/include/JellyfinQt/loader/http/getsimilarmovies.h +++ b/core/include/JellyfinQt/loader/http/getsimilarmovies.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets similar items. */ -class GetSimilarMovies : public Jellyfin::Support::HttpLoader { +class GetSimilarMoviesLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetSimilarMovies(ApiClient *apiClient = nullptr); + explicit GetSimilarMoviesLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetSimilarMoviesParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getsimilarshows.h b/core/include/JellyfinQt/loader/http/getsimilarshows.h index 8ca159c..c81bb1a 100644 --- a/core/include/JellyfinQt/loader/http/getsimilarshows.h +++ b/core/include/JellyfinQt/loader/http/getsimilarshows.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets similar items. */ -class GetSimilarShows : public Jellyfin::Support::HttpLoader { +class GetSimilarShowsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetSimilarShows(ApiClient *apiClient = nullptr); + explicit GetSimilarShowsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetSimilarShowsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getsimilartrailers.h b/core/include/JellyfinQt/loader/http/getsimilartrailers.h index 99d6473..a0b6c01 100644 --- a/core/include/JellyfinQt/loader/http/getsimilartrailers.h +++ b/core/include/JellyfinQt/loader/http/getsimilartrailers.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets similar items. */ -class GetSimilarTrailers : public Jellyfin::Support::HttpLoader { +class GetSimilarTrailersLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetSimilarTrailers(ApiClient *apiClient = nullptr); + explicit GetSimilarTrailersLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetSimilarTrailersParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getstartupconfiguration.h b/core/include/JellyfinQt/loader/http/getstartupconfiguration.h index 759a8f8..fb65c44 100644 --- a/core/include/JellyfinQt/loader/http/getstartupconfiguration.h +++ b/core/include/JellyfinQt/loader/http/getstartupconfiguration.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets the initial startup wizard configuration. */ -class GetStartupConfiguration : public Jellyfin::Support::HttpLoader { +class GetStartupConfigurationLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetStartupConfiguration(ApiClient *apiClient = nullptr); + explicit GetStartupConfigurationLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetStartupConfigurationParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getstatus.h b/core/include/JellyfinQt/loader/http/getstatus.h index 0515eea..d8590b3 100644 --- a/core/include/JellyfinQt/loader/http/getstatus.h +++ b/core/include/JellyfinQt/loader/http/getstatus.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets the current quick connect state. */ -class GetStatus : public Jellyfin::Support::HttpLoader { +class GetStatusLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetStatus(ApiClient *apiClient = nullptr); + explicit GetStatusLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetStatusParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getstudio.h b/core/include/JellyfinQt/loader/http/getstudio.h index 9f1d2a6..1ca51a2 100644 --- a/core/include/JellyfinQt/loader/http/getstudio.h +++ b/core/include/JellyfinQt/loader/http/getstudio.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a studio by name. */ -class GetStudio : public Jellyfin::Support::HttpLoader { +class GetStudioLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetStudio(ApiClient *apiClient = nullptr); + explicit GetStudioLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetStudioParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getstudios.h b/core/include/JellyfinQt/loader/http/getstudios.h index 4e373bd..2f76ee0 100644 --- a/core/include/JellyfinQt/loader/http/getstudios.h +++ b/core/include/JellyfinQt/loader/http/getstudios.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets all studios from a given item, folder, or the entire library. */ -class GetStudios : public Jellyfin::Support::HttpLoader { +class GetStudiosLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetStudios(ApiClient *apiClient = nullptr); + explicit GetStudiosLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetStudiosParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getsuggestions.h b/core/include/JellyfinQt/loader/http/getsuggestions.h index 1d79490..c4a270a 100644 --- a/core/include/JellyfinQt/loader/http/getsuggestions.h +++ b/core/include/JellyfinQt/loader/http/getsuggestions.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets suggestions. */ -class GetSuggestions : public Jellyfin::Support::HttpLoader { +class GetSuggestionsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetSuggestions(ApiClient *apiClient = nullptr); + explicit GetSuggestionsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetSuggestionsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getsysteminfo.h b/core/include/JellyfinQt/loader/http/getsysteminfo.h index 03f0491..0faa57b 100644 --- a/core/include/JellyfinQt/loader/http/getsysteminfo.h +++ b/core/include/JellyfinQt/loader/http/getsysteminfo.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets information about the server. */ -class GetSystemInfo : public Jellyfin::Support::HttpLoader { +class GetSystemInfoLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetSystemInfo(ApiClient *apiClient = nullptr); + explicit GetSystemInfoLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetSystemInfoParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/gettask.h b/core/include/JellyfinQt/loader/http/gettask.h index bf3b32a..6f0f617 100644 --- a/core/include/JellyfinQt/loader/http/gettask.h +++ b/core/include/JellyfinQt/loader/http/gettask.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get task by id. */ -class GetTask : public Jellyfin::Support::HttpLoader { +class GetTaskLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetTask(ApiClient *apiClient = nullptr); + explicit GetTaskLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetTaskParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getthememedia.h b/core/include/JellyfinQt/loader/http/getthememedia.h index d2d73c9..213b90d 100644 --- a/core/include/JellyfinQt/loader/http/getthememedia.h +++ b/core/include/JellyfinQt/loader/http/getthememedia.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get theme songs and videos for an item. */ -class GetThemeMedia : public Jellyfin::Support::HttpLoader { +class GetThemeMediaLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetThemeMedia(ApiClient *apiClient = nullptr); + explicit GetThemeMediaLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetThemeMediaParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getthemesongs.h b/core/include/JellyfinQt/loader/http/getthemesongs.h index 9d7c564..cd3ddbd 100644 --- a/core/include/JellyfinQt/loader/http/getthemesongs.h +++ b/core/include/JellyfinQt/loader/http/getthemesongs.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get theme songs for an item. */ -class GetThemeSongs : public Jellyfin::Support::HttpLoader { +class GetThemeSongsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetThemeSongs(ApiClient *apiClient = nullptr); + explicit GetThemeSongsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetThemeSongsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getthemevideos.h b/core/include/JellyfinQt/loader/http/getthemevideos.h index b136226..afd7d5c 100644 --- a/core/include/JellyfinQt/loader/http/getthemevideos.h +++ b/core/include/JellyfinQt/loader/http/getthemevideos.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get theme videos for an item. */ -class GetThemeVideos : public Jellyfin::Support::HttpLoader { +class GetThemeVideosLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetThemeVideos(ApiClient *apiClient = nullptr); + explicit GetThemeVideosLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetThemeVideosParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/gettimer.h b/core/include/JellyfinQt/loader/http/gettimer.h index 7e80ad3..578ca78 100644 --- a/core/include/JellyfinQt/loader/http/gettimer.h +++ b/core/include/JellyfinQt/loader/http/gettimer.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a timer. */ -class GetTimer : public Jellyfin::Support::HttpLoader { +class GetTimerLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetTimer(ApiClient *apiClient = nullptr); + explicit GetTimerLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetTimerParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/gettimers.h b/core/include/JellyfinQt/loader/http/gettimers.h index 3fc7e02..d430b05 100644 --- a/core/include/JellyfinQt/loader/http/gettimers.h +++ b/core/include/JellyfinQt/loader/http/gettimers.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets the live tv timers. */ -class GetTimers : public Jellyfin::Support::HttpLoader { +class GetTimersLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetTimers(ApiClient *apiClient = nullptr); + explicit GetTimersLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetTimersParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/gettrailers.h b/core/include/JellyfinQt/loader/http/gettrailers.h index 0f04c8e..2712658 100644 --- a/core/include/JellyfinQt/loader/http/gettrailers.h +++ b/core/include/JellyfinQt/loader/http/gettrailers.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Finds movies and trailers similar to a given trailer. */ -class GetTrailers : public Jellyfin::Support::HttpLoader { +class GetTrailersLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetTrailers(ApiClient *apiClient = nullptr); + explicit GetTrailersLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetTrailersParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getupcomingepisodes.h b/core/include/JellyfinQt/loader/http/getupcomingepisodes.h index 55b2ddf..5aca5c4 100644 --- a/core/include/JellyfinQt/loader/http/getupcomingepisodes.h +++ b/core/include/JellyfinQt/loader/http/getupcomingepisodes.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a list of upcoming episodes. */ -class GetUpcomingEpisodes : public Jellyfin::Support::HttpLoader { +class GetUpcomingEpisodesLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetUpcomingEpisodes(ApiClient *apiClient = nullptr); + explicit GetUpcomingEpisodesLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetUpcomingEpisodesParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getuserbyid.h b/core/include/JellyfinQt/loader/http/getuserbyid.h index 4cafdd4..b0c3287 100644 --- a/core/include/JellyfinQt/loader/http/getuserbyid.h +++ b/core/include/JellyfinQt/loader/http/getuserbyid.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a user by Id. */ -class GetUserById : public Jellyfin::Support::HttpLoader { +class GetUserByIdLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetUserById(ApiClient *apiClient = nullptr); + explicit GetUserByIdLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetUserByIdParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getuserviews.h b/core/include/JellyfinQt/loader/http/getuserviews.h index 1011d6b..a3dec25 100644 --- a/core/include/JellyfinQt/loader/http/getuserviews.h +++ b/core/include/JellyfinQt/loader/http/getuserviews.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get user views. */ -class GetUserViews : public Jellyfin::Support::HttpLoader { +class GetUserViewsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetUserViews(ApiClient *apiClient = nullptr); + explicit GetUserViewsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetUserViewsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getutctime.h b/core/include/JellyfinQt/loader/http/getutctime.h index ba77ddf..8eab80e 100644 --- a/core/include/JellyfinQt/loader/http/getutctime.h +++ b/core/include/JellyfinQt/loader/http/getutctime.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets the current UTC time. */ -class GetUtcTime : public Jellyfin::Support::HttpLoader { +class GetUtcTimeLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetUtcTime(ApiClient *apiClient = nullptr); + explicit GetUtcTimeLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetUtcTimeParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getyear.h b/core/include/JellyfinQt/loader/http/getyear.h index 1087e61..2f59899 100644 --- a/core/include/JellyfinQt/loader/http/getyear.h +++ b/core/include/JellyfinQt/loader/http/getyear.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Gets a year. */ -class GetYear : public Jellyfin::Support::HttpLoader { +class GetYearLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetYear(ApiClient *apiClient = nullptr); + explicit GetYearLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetYearParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/getyears.h b/core/include/JellyfinQt/loader/http/getyears.h index f9ee5a8..a66d7a5 100644 --- a/core/include/JellyfinQt/loader/http/getyears.h +++ b/core/include/JellyfinQt/loader/http/getyears.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Get years. */ -class GetYears : public Jellyfin::Support::HttpLoader { +class GetYearsLoader : public Jellyfin::Support::HttpLoader { public: - explicit GetYears(ApiClient *apiClient = nullptr); + explicit GetYearsLoader(ApiClient *apiClient = nullptr); protected: QString path(const GetYearsParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/initiate.h b/core/include/JellyfinQt/loader/http/initiate.h index 8cc7a0d..276b5e0 100644 --- a/core/include/JellyfinQt/loader/http/initiate.h +++ b/core/include/JellyfinQt/loader/http/initiate.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Initiate a new quick connect request. */ -class Initiate : public Jellyfin::Support::HttpLoader { +class InitiateLoader : public Jellyfin::Support::HttpLoader { public: - explicit Initiate(ApiClient *apiClient = nullptr); + explicit InitiateLoader(ApiClient *apiClient = nullptr); protected: QString path(const InitiateParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/markfavoriteitem.h b/core/include/JellyfinQt/loader/http/markfavoriteitem.h index 695f0cb..c49ebbd 100644 --- a/core/include/JellyfinQt/loader/http/markfavoriteitem.h +++ b/core/include/JellyfinQt/loader/http/markfavoriteitem.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Marks an item as a favorite. */ -class MarkFavoriteItem : public Jellyfin::Support::HttpLoader { +class MarkFavoriteItemLoader : public Jellyfin::Support::HttpLoader { public: - explicit MarkFavoriteItem(ApiClient *apiClient = nullptr); + explicit MarkFavoriteItemLoader(ApiClient *apiClient = nullptr); protected: QString path(const MarkFavoriteItemParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/markplayeditem.h b/core/include/JellyfinQt/loader/http/markplayeditem.h index 5ee0499..94dedef 100644 --- a/core/include/JellyfinQt/loader/http/markplayeditem.h +++ b/core/include/JellyfinQt/loader/http/markplayeditem.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Marks an item as played for user. */ -class MarkPlayedItem : public Jellyfin::Support::HttpLoader { +class MarkPlayedItemLoader : public Jellyfin::Support::HttpLoader { public: - explicit MarkPlayedItem(ApiClient *apiClient = nullptr); + explicit MarkPlayedItemLoader(ApiClient *apiClient = nullptr); protected: QString path(const MarkPlayedItemParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/markunplayeditem.h b/core/include/JellyfinQt/loader/http/markunplayeditem.h index c48ee90..3f89bcc 100644 --- a/core/include/JellyfinQt/loader/http/markunplayeditem.h +++ b/core/include/JellyfinQt/loader/http/markunplayeditem.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Marks an item as unplayed for user. */ -class MarkUnplayedItem : public Jellyfin::Support::HttpLoader { +class MarkUnplayedItemLoader : public Jellyfin::Support::HttpLoader { public: - explicit MarkUnplayedItem(ApiClient *apiClient = nullptr); + explicit MarkUnplayedItemLoader(ApiClient *apiClient = nullptr); protected: QString path(const MarkUnplayedItemParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/openlivestream.h b/core/include/JellyfinQt/loader/http/openlivestream.h index 0345a5f..ab65af1 100644 --- a/core/include/JellyfinQt/loader/http/openlivestream.h +++ b/core/include/JellyfinQt/loader/http/openlivestream.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Opens a media source. */ -class OpenLiveStream : public Jellyfin::Support::HttpLoader { +class OpenLiveStreamLoader : public Jellyfin::Support::HttpLoader { public: - explicit OpenLiveStream(ApiClient *apiClient = nullptr); + explicit OpenLiveStreamLoader(ApiClient *apiClient = nullptr); protected: QString path(const OpenLiveStreamParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/setchannelmapping.h b/core/include/JellyfinQt/loader/http/setchannelmapping.h index 8584abc..fd2da23 100644 --- a/core/include/JellyfinQt/loader/http/setchannelmapping.h +++ b/core/include/JellyfinQt/loader/http/setchannelmapping.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Set channel mappings. */ -class SetChannelMapping : public Jellyfin::Support::HttpLoader { +class SetChannelMappingLoader : public Jellyfin::Support::HttpLoader { public: - explicit SetChannelMapping(ApiClient *apiClient = nullptr); + explicit SetChannelMappingLoader(ApiClient *apiClient = nullptr); protected: QString path(const SetChannelMappingParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/unmarkfavoriteitem.h b/core/include/JellyfinQt/loader/http/unmarkfavoriteitem.h index 75cd33a..db61c99 100644 --- a/core/include/JellyfinQt/loader/http/unmarkfavoriteitem.h +++ b/core/include/JellyfinQt/loader/http/unmarkfavoriteitem.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Unmarks item as a favorite. */ -class UnmarkFavoriteItem : public Jellyfin::Support::HttpLoader { +class UnmarkFavoriteItemLoader : public Jellyfin::Support::HttpLoader { public: - explicit UnmarkFavoriteItem(ApiClient *apiClient = nullptr); + explicit UnmarkFavoriteItemLoader(ApiClient *apiClient = nullptr); protected: QString path(const UnmarkFavoriteItemParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/http/updateuseritemrating.h b/core/include/JellyfinQt/loader/http/updateuseritemrating.h index 2f58355..a0874f7 100644 --- a/core/include/JellyfinQt/loader/http/updateuseritemrating.h +++ b/core/include/JellyfinQt/loader/http/updateuseritemrating.h @@ -45,9 +45,9 @@ namespace HTTP { /** * @brief Updates a user's rating for an item. */ -class UpdateUserItemRating : public Jellyfin::Support::HttpLoader { +class UpdateUserItemRatingLoader : public Jellyfin::Support::HttpLoader { public: - explicit UpdateUserItemRating(ApiClient *apiClient = nullptr); + explicit UpdateUserItemRatingLoader(ApiClient *apiClient = nullptr); protected: QString path(const UpdateUserItemRatingParams& parameters) const override; diff --git a/core/include/JellyfinQt/loader/requesttypes.h b/core/include/JellyfinQt/loader/requesttypes.h index d4ac41e..6099466 100644 --- a/core/include/JellyfinQt/loader/requesttypes.h +++ b/core/include/JellyfinQt/loader/requesttypes.h @@ -33,6 +33,7 @@ #include #include #include +#include #include #include "JellyfinQt/dto/channeltype.h" diff --git a/core/include/JellyfinQt/support/loader.h b/core/include/JellyfinQt/support/loader.h index e389397..a0fd5e7 100644 --- a/core/include/JellyfinQt/support/loader.h +++ b/core/include/JellyfinQt/support/loader.h @@ -41,6 +41,9 @@ public: explicit LoadException(const QString &message) : m_message(message.toStdString()) {} virtual const char *what() const noexcept override; + + virtual QException *clone() const override; + virtual void raise() const override; private: std::string m_message; }; @@ -51,6 +54,10 @@ static const int HTTP_TIMEOUT = 30000; // 30 seconds; * Interface describing a way to load items. Used to abstract away * the difference between loading from a cache or loading over the network. * + * @note: Loaders should NEVER call load() again while load() is running on another + * thread or change the apiClient while running. This will result in undefined behaviour. + * Please use a Mutex to enforce this. + * * @tparam R the type of data that should be fetched, R for result. * @tparam P the type of paramaters given, to determine which resource should * be loaded. @@ -67,7 +74,7 @@ public: */ virtual std::optional load(const P ¶meters) const { Q_UNUSED(parameters) - throw new LoadException(QStringLiteral("Loader not set")); + throw LoadException(QStringLiteral("Loader not set")); } /** * @brief Heuristic to determine if this resource can be loaded via this loaded. @@ -77,6 +84,8 @@ public: * @return True if this loader is available, false otherwise. */ virtual bool isAvailable() const { return false; }; + void setApiClient(ApiClient *newApiClient) { m_apiClient = newApiClient; } + ApiClient *apiClient() const { return m_apiClient; } protected: Jellyfin::ApiClient *m_apiClient; }; @@ -98,7 +107,7 @@ public: try { std::optional res = it->load(parameters); if (res.has_value()) return res; - } catch (LoadException e) { + } catch (LoadException &e) { qDebug() << "Error while loading: " << e.what(); } } diff --git a/core/include/JellyfinQt/viewmodel/item.h b/core/include/JellyfinQt/viewmodel/item.h index ddfb84f..f3ef7b8 100644 --- a/core/include/JellyfinQt/viewmodel/item.h +++ b/core/include/JellyfinQt/viewmodel/item.h @@ -46,7 +46,6 @@ #include "loader.h" namespace Jellyfin { - namespace ViewModel { class Item : public QObject { diff --git a/core/include/JellyfinQt/viewmodel/itemmodel.h b/core/include/JellyfinQt/viewmodel/itemmodel.h new file mode 100644 index 0000000..ddc0ff1 --- /dev/null +++ b/core/include/JellyfinQt/viewmodel/itemmodel.h @@ -0,0 +1,152 @@ +/* + * Sailfin: a Jellyfin client written using Qt + * Copyright (C) 2021 Chris Josten and the Sailfin Contributors. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#ifndef JELLYFIN_VIEWMODEL_ITEMMODEL_H +#define JELLYFIN_VIEWMODEL_ITEMMODEL_H + +#include +#include + +#include "propertyhelper.h" +#include "../dto/baseitemdto.h" +#include "../dto/baseitemdtoqueryresult.h" +#include "../loader/http/getuserviews.h" +#include "../loader/requesttypes.h" +#include "../model/item.h" +#include "../apimodel.h" + +// Jellyfin Forward Read/Write Property +#define FWDPROP(type, propName, propSetName) JF_FWD_RW_PROP(type, propName, propSetName, this->m_parameters) + +namespace Jellyfin { + +namespace ViewModel { + +// JellyFinRoleName +#define JFRN(name) {RoleNames::name, #name} + +// This file contains all models that expose a Model::Item + +using UserViewsLoaderBase = LoaderModelLoader; +class UserViewsLoader : public UserViewsLoaderBase { + Q_OBJECT +public: + explicit UserViewsLoader(QObject *parent = nullptr); + + FWDPROP(bool, includeExternalContent, IncludeExternalContent) + FWDPROP(bool, includeHidden, IncludeHidden) + FWDPROP(QStringList, presetViews, PresetViews) +private slots: + void apiClientChanged(ApiClient *newApiClient); + void userIdChanged(const QString &newUserId); +}; + +using UserItemsLoaderBase = LoaderModelLoader; +class UserItemsLoader : public UserItemsLoaderBase { + Q_OBJECT +public: + explicit UserItemsLoader(QObject *parent = nullptr); + + FWDPROP(QString, adjacentTo, AdjacentTo) + FWDPROP(QStringList, albumArtistIds, AlbumArtistIds) + FWDPROP(QStringList, albumIds, AlbumIds) + FWDPROP(QStringList, albums, Albums) + FWDPROP(QStringList, artistIds, ArtistIds) + FWDPROP(QStringList, artists, Artists) + FWDPROP(bool, recursive, Recursive) + //FWDPROP(bool, collapseBoxSetItems) +private slots: + void apiClientChanged(ApiClient *newApiClient); + void userIdChanged(const QString &newUserId); +}; +/** + * @brief Base class for each model that works with items. + */ + +class ItemModel : public ApiModel { + Q_OBJECT +public: + enum RoleNames { + jellyfinId = Qt::UserRole + 1, + name, + originalTitle, + serverId, + etag, + sourceType, + playlistItemId, + dateCreated, + dateLastMediaAdded, + extraType + }; + + explicit ItemModel (QObject *parent = nullptr); + + QHash roleNames() const override { + return { + JFRN(jellyfinId), + JFRN(name), + JFRN(originalTitle), + JFRN(serverId), + JFRN(etag), + JFRN(sourceType), + JFRN(playlistItemId), + JFRN(dateCreated), + JFRN(dateLastMediaAdded), + JFRN(extraType) + }; + } + QVariant data(const QModelIndex &index, int role) const override; +}; + +/*class UserItemModel : public ItemModel { +public: + explicit UserItemModel (QObject *parent = nullptr); +}; + +class UserItemResumeModel : public ItemModel { +public: + explicit UserItemResumeModel (QObject *parent = nullptr); +}; + +class UserItemLatestModel : public ItemModel { +public: + explicit UserItemLatestModel (QObject *parent = nullptr); +}; + +class ShowNextUpModel : public ItemModel { +public: + explicit ShowNextUpModel (QObject *parent = nullptr); +}; + +class ShowSeasonsModel : public ItemModel { +public: + explicit ShowSeasonsModel (QObject *parent = nullptr); +}; + +class ShowEpisodesModel : public ItemModel { +public: + explicit ShowEpisodesModel (QObject *parent = nullptr); +};*/ +#undef JFRN + +} // NS Jellyfin +} // NS ViewModel + +#undef FWDPROP + +#endif // JELLYFIN_VIEWMODEL_ITEMMODEL_H diff --git a/core/include/JellyfinQt/viewmodel/loader.h b/core/include/JellyfinQt/viewmodel/loader.h index 6d94347..faee294 100644 --- a/core/include/JellyfinQt/viewmodel/loader.h +++ b/core/include/JellyfinQt/viewmodel/loader.h @@ -23,6 +23,8 @@ #include #include +#include +#include #include #include "../support/loader.h" @@ -178,9 +180,12 @@ private: * @return empty optional if an error occured, otherwise the result. */ std::optional invokeLoader(P parameters) { + QMutexLocker(&this->m_mutex); + this->m_loader.setApiClient(m_apiClient); try { return this->m_loader.load(parameters); - } catch (Support::LoadException e) { + } catch (Support::LoadException &e) { + qWarning() << "Exception while loading an item: " << e.what(); this->setErrorString(QString(e.what())); return std::nullopt; } @@ -206,6 +211,7 @@ private: setStatus(Error); } } + QMutex m_mutex; }; void registerRemoteTypes(const char *uri); diff --git a/core/include/JellyfinQt/viewmodel/playbackmanager.h b/core/include/JellyfinQt/viewmodel/playbackmanager.h index 12886ed..8743d20 100644 --- a/core/include/JellyfinQt/viewmodel/playbackmanager.h +++ b/core/include/JellyfinQt/viewmodel/playbackmanager.h @@ -38,6 +38,7 @@ #include "../viewmodel/item.h" #include "../apiclient.h" +#include "itemmodel.h" namespace Jellyfin { diff --git a/core/include/JellyfinQt/viewmodel/propertyhelper.h b/core/include/JellyfinQt/viewmodel/propertyhelper.h new file mode 100644 index 0000000..67b6911 --- /dev/null +++ b/core/include/JellyfinQt/viewmodel/propertyhelper.h @@ -0,0 +1,41 @@ +/* + * Sailfin: a Jellyfin client written using Qt + * Copyright (C) 2021 Chris Josten and the Sailfin Contributors. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#ifndef JELLYFIN_VIEWMODEL_PROPERTYHELPER +#define JELLYFIN_VIEWMODEL_PROPERTYHELPER + +// Jellyfin Forward Read/Write Property +#define JF_FWD_RW_PROP(type, propName, propSetName, obj) \ + public: \ + Q_PROPERTY(type propName READ propName WRITE set##propSetName NOTIFY propName##Changed) \ + type propName() const { return obj.propName(); } \ + void set##propSetName(type newValue) { \ + obj.set##propSetName( newValue ); \ + emit propName##Changed(); \ + } \ + Q_SIGNALS: \ + void propName##Changed(); + +// Jellyfin Forward Read Property +#define JF_FWD_R_PROP(type, propName, propSetName, obj) \ + public: \ + Q_PROPERTY(type propName READ propName NOTIFY propName##Changed) \ + type propName() const { return obj.propName(); } \ + signals: \ + void propName##Changed(type newValue); +#endif // JELLYFIN_VIEWMODEL_PROPERTYHELPER diff --git a/core/openapigenerator.d b/core/openapigenerator.d index e2a7865..2144bb7 100755 --- a/core/openapigenerator.d +++ b/core/openapigenerator.d @@ -295,7 +295,7 @@ void writeRequestTypesFile(R)(File headerFile, File implementationFile, R endpoi } string[] systemImports = collectImports(endpoints, e => e.needsSystemImport) - ~ ["QList", "optional"]; + ~ ["QList", "QStringList", "optional"]; string[] userImports = collectImports(endpoints, e => e.needsLocalImport) .map!(e => buildPath(MODEL_FOLDER, e.applyCasePolicy(CasePolicy.PASCAL, CasePolicy.LOWER) ~ ".h")) .array; @@ -667,6 +667,7 @@ MetaTypeInfo getType(ref const string name, const ref Node node, const ref Node case "array": string containedTypeName = "arrayItem"; MetaTypeInfo containedType = getType(containedTypeName, node["items"], allSchemas); + containedType.needsPointer = false; info.needsLocalImport = containedType.needsLocalImport; info.needsSystemImport = true; info.isContainer = true; diff --git a/core/src/apiclient.cpp b/core/src/apiclient.cpp index 9ea9946..35e1b5f 100644 --- a/core/src/apiclient.cpp +++ b/core/src/apiclient.cpp @@ -233,7 +233,14 @@ void ApiClient::deleteSession() { void ApiClient::postCapabilities() { QJsonObject capabilities; - capabilities["SupportedCommands"] = Support::toJsonValue(m_supportedCommands); + QList supportedCommands; + supportedCommands.reserve(m_supportedCommands.size()); + for (int i = 0; i < m_supportedCommands.size(); i++) { + if (m_supportedCommands[i].canConvert()) { + supportedCommands.append(m_supportedCommands[i].value()); + } + } + capabilities["SupportedCommands"] = Support::toJsonValue(supportedCommands); capabilities["SupportsPersistentIdentifier"] = true; capabilities["SupportsMediaControl"] = false; capabilities["SupportsSync"] = false; diff --git a/core/src/apimodel.cpp b/core/src/apimodel.cpp index 3aa820b..0584ded 100644 --- a/core/src/apimodel.cpp +++ b/core/src/apimodel.cpp @@ -32,424 +32,74 @@ namespace DTO { } using User = DTO::UserDto; -BaseApiModel::BaseApiModel(QString path, bool hasRecordResponse, bool addUserId, QObject *parent) - : QAbstractListModel(parent), - m_path(path), - m_hasRecordResponse(hasRecordResponse), - m_addUserId(addUserId) { +BaseModelLoader::BaseModelLoader(QObject *parent) + : QObject(parent) { } +void BaseModelLoader::classBegin() { + m_isBeingParsed = true; } -void BaseApiModel::setApiClient(ApiClient *apiClient) { - m_apiClient = apiClient; - emit apiClientChanged(m_apiClient); +void BaseModelLoader::componentComplete() { + m_isBeingParsed = false; + autoReloadIfNeeded(); } -void BaseApiModel::setLimit(int newLimit) { +void BaseModelLoader::autoReloadIfNeeded() { + if (m_autoReload && m_apiClient != nullptr) { + emit reloadWanted(); + } +} + +void BaseModelLoader::setApiClient(ApiClient *newApiClient) { + bool changed = this->m_apiClient != newApiClient; + m_apiClient = newApiClient; + if (changed) { + emit apiClientChanged(newApiClient); + } +} + +void BaseModelLoader::setLimit(int newLimit) { + int oldLimit = this->m_limit; m_limit = newLimit; - emit limitChanged(newLimit); - if (m_apiClient != nullptr && !m_isBeingParsed) { - load(LOAD_MORE); + if (oldLimit != this->m_limit) { + emit limitChanged(this->m_limit); + } +} + +void BaseModelLoader::setAutoReload(bool newAutoReload) { + if (m_autoReload != newAutoReload) { + m_autoReload = newAutoReload; + emit autoReloadChanged(newAutoReload); } } void BaseApiModel::reload() { - this->setStatus(Loading); - m_startIndex = 0; - load(RELOAD); + qWarning() << " BaseApiModel slot called instead of overloaded method"; } - -void BaseApiModel::load(LoadType type) { - qDebug() << (type == RELOAD ? "RELOAD" : "LOAD_MORE"); - if (m_apiClient == nullptr) { - qWarning() << "Please set the apiClient property before (re)loading"; - return; - } - - QString path(m_path); - replacePathPlaceholders(path); - QUrlQuery query; - addQueryParameters(query); - - QNetworkReply *rep = m_apiClient->get(path, query); - connect(rep, &QNetworkReply::finished, this, [this, type, rep]() { - qDebug() << rep->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() << ": " << rep->request().url(); - QJsonDocument doc = QJsonDocument::fromJson(rep->readAll()); - if (doc.isNull()) { - qWarning() << "JSON parse error"; - this->setStatus(Error); - } - if (!m_hasRecordResponse) { - if (!doc.isArray()) { - qWarning() << "Object is not an array!"; - this->setStatus(Error); - return; - } - QJsonArray items = doc.array(); - setModelData(items); - } else { - if (!doc.isObject()) { - qWarning() << "Object is not an object!"; - this->setStatus(Error); - return; - } - QJsonObject obj = doc.object(); - if (!obj.contains("Items")) { - qWarning() << "Object doesn't contain items!"; - this->setStatus(Error); - return; - } - if (m_limit < 0) { - // Javascript is beautiful - if (obj.contains("TotalRecordCount") && obj["TotalRecordCount"].isDouble()) { - m_totalRecordCount = obj["TotalRecordCount"].toInt(); - m_startIndex += DEFAULT_LIMIT; - } else { - qWarning() << "Record-response does not have a total record count"; - this->setStatus(Error); - return; - } - } - if (!obj["Items"].isArray()) { - qWarning() << "Items is not an array!"; - this->setStatus(Error); - return; - } - QJsonArray items = obj["Items"].toArray(); - switch(type) { - case RELOAD: - setModelData(items); - break; - case LOAD_MORE: - appendModelData(items); - break; - } - } - this->setStatus(Ready); - rep->deleteLater(); - }); +void setStartIndex(Loader::GetUserViewsParams ¶ms, int startIndex) { + // Not supported + Q_UNUSED(params) + Q_UNUSED(startIndex) } -void BaseApiModel::addQueryParameters(QUrlQuery &query) { - if (m_limit >= 0) { - query.addQueryItem("Limit", QString::number(m_limit)); - } else { - query.addQueryItem("Limit", QString::number(DEFAULT_LIMIT)); - } - if (m_startIndex > 0) { - query.addQueryItem("StartIndex", QString::number(m_startIndex)); - } - if (!m_sortBy.empty()) { - query.addQueryItem("SortBy", m_sortBy.join(",")); - } - if (m_sortOrder != Unspecified) { - query.addQueryItem("SortOrder", m_sortOrder == Ascending ? "Ascending" : "Descending"); - } - if (!m_fields.empty()) { - query.addQueryItem("Fields", m_fields.join(",")); - } - if (m_addUserId) { - query.addQueryItem("userId", m_apiClient->userId()); - } +void setLimit(Loader::GetUserViewsParams ¶ms, int limit) { + Q_UNUSED(params) + Q_UNUSED(limit) } -void BaseApiModel::replacePathPlaceholders(QString &path) { - if (path.contains("{{user}}")) { - path = path.replace("{{user}}", m_apiClient->userId()); - } +QList extractRecords(const DTO::BaseItemDtoQueryResult &result) { + return result.items(); } -void BaseApiModel::classBegin() { - m_isBeingParsed = true; +int extractTotalRecordCount(const DTO::BaseItemDtoQueryResult &result) { + return result.totalRecordCount(); } -void BaseApiModel::componentComplete() { - m_isBeingParsed = false; -} - -// ApiModel -template -ApiModel::ApiModel(QString path, bool hasRecordResponse, bool addUserId, QObject *parent) - : BaseApiModel(path, hasRecordResponse, addUserId, parent) { - // If based on QObject, we know our role names before the first request - generateFields(); -} - -template <> -ApiModel::ApiModel(QString path, bool hasRecordResponse, bool addUserId, QObject *parent) - : BaseApiModel(path, hasRecordResponse, addUserId, parent) { - // But we only know our role names after our first request. -} - - -template -T *ApiModel::deserializeResult(QJsonValueRef source) { - T *result = T::fromJSON(source.toObject(), this); - return result; -} - -template <> -QJsonValue *ApiModel::deserializeResult(QJsonValueRef source) { - QJsonValue *result = new QJsonValue(source); - JsonHelper::convertToCamelCase(*result); - return result; -} - -template -void ApiModel::generateFields() { - const QMetaObject *obj = &T::staticMetaObject; - m_roles[Qt::UserRole + 1] = "qtObject"; - for (int i = 0; i < obj->propertyCount(); i++) { - QMetaProperty property = obj->property(i); - m_roles.insert(Qt::UserRole + 2 + i, property.name()); - } -} - -template <> -void ApiModel::generateFields() { - // We can only generate field names if there is a first item. Redefining role names later leads to - // unexpected results, so prevent it as well. - if (m_array.size() == 0 || m_roles.size() > 0) return; - int i = Qt::UserRole + 1; - if (!m_array[0]->isObject()) { - qWarning() << "Iterator is not an object?"; - return; - } - // Walks over the keys in the first record and adds them to the rolenames. - // This assumes the back-end has the same keys for every record. I could technically - // go over all records to be really sure, but no-one got time for a O(n) algorithm, so - // this heuristic hopefully suffices. - QJsonObject ob = m_array[0]->toObject(); - for (auto jt = ob.begin(); jt != ob.end(); jt++) { - QString keyName = jt.key(); - keyName[0] = keyName[0].toLower(); - QByteArray keyArr = keyName.toUtf8(); - if (!m_roles.values().contains(keyArr)) { - m_roles.insert(i++, keyArr); - } - } -} - -template -void ApiModel::setModelData(QJsonArray &data) { - this->beginResetModel(); - for (T* value : m_array) { - value->deleteLater(); - } - m_array.clear(); - for(QJsonValueRef value : data) { - m_array.append(deserializeResult(value)); - } - this->endResetModel(); -} - -template <> -void ApiModel::setModelData(QJsonArray &data) { - generateFields(); - this->beginResetModel(); - for (QJsonValue* value : m_array) { - delete value; - } - m_array.clear(); - for(QJsonValueRef value : data) { - m_array.append(deserializeResult(value)); - } - this->endResetModel(); -} - -template -void ApiModel::appendModelData(QJsonArray &data) { - this->beginInsertRows(QModelIndex(), m_array.size(), m_array.size() + data.size() - 1); - // QJsonArray apparently doesn't allow concatenating lists like QList or std::vector - for (auto it = data.begin(); it != data.end(); it++) { - JsonHelper::convertToCamelCase(*it); - } - for(QJsonValueRef val : data) { - m_array.append(deserializeResult(val)); - } - this->endInsertRows(); -} - -template -QVariant ApiModel::data(const QModelIndex &index, int role) const { - // Ignore roles we don't know - if (role <= Qt::UserRole || role >= Qt::UserRole + m_roles.size()) return QVariant(); - // Ignore invalid indices. - if (!index.isValid()) return QVariant(); - - - T* obj = m_array.at(index.row()); - // m_roleNames[role] == "qtObject" - if (role == Qt::UserRole + 1) { - return QVariant::fromValue(obj); - } - - const QString &key = m_roles[role]; - - if (role - Qt::UserRole - 2 < obj->metaObject()->propertyCount() ) { - return obj->property(key.toLocal8Bit()); - } - return QVariant(); -} -template <> -QVariant ApiModel::data(const QModelIndex &index, int role) const { - // Ignore roles we don't know - if (role <= Qt::UserRole || role >= Qt::UserRole + m_roles.size()) return QVariant(); - // Ignore invalid indices. - if (!index.isValid()) return QVariant(); - - - QJsonObject obj = m_array.at(index.row())->toObject(); - - const QString &key = m_roles[role]; - - if (obj.contains(key)) { - return obj[key].toVariant(); - } - return QVariant(); -} - - -template -bool ApiModel::canFetchMore(const QModelIndex &parent) const { - if (parent.isValid()) return false; - switch(m_status) { - case Uninitialised: - case Loading: - case LoadingMore: - return false; - default: - break; - } - - if (m_limit < 0) { - return m_startIndex <= m_totalRecordCount; - } else { - return false; - } -} - -template -void ApiModel::fetchMore(const QModelIndex &parent) { - if (parent.isValid()) return; - this->setStatus(LoadingMore); - load(LOAD_MORE); -} - -template -void ApiModel::addQueryParameters(QUrlQuery &query) { - BaseApiModel::addQueryParameters(query); -} - -template -void ApiModel::replacePathPlaceholders(QString &path) { - BaseApiModel::replacePathPlaceholders(path); -} - -template -void ApiModel::insert(int index, T* object) { - Q_ASSERT(index >=0 && index <= size()); - this->beginInsertRows(QModelIndex(), index, index); - m_array.insert(index, object); - this->endInsertRows(); -} - -template -void ApiModel::removeAt(int index) { - this->beginRemoveRows(QModelIndex(), index, index); - m_array.removeAt(index); - this->endRemoveRows(); -} - -template -void ApiModel::removeOne(T* object) { - int idx = m_array.indexOf(object); - if (idx >= 0) { - removeAt(idx); - } -} - -// Itemmodel -ItemModel::ItemModel(QString path, bool hasRecordFields, bool replaceUser, QObject *parent) - : ApiModel (path, hasRecordFields, replaceUser, parent){ - QObject::connect(this, &BaseApiModel::apiClientChanged, static_cast(this), [this](ApiClient *newApiClient) { - QObject::connect(newApiClient, &ApiClient::userDataChanged, this, &ItemModel::onUserDataChanged); - }); -} - -void ItemModel::onUserDataChanged(const QString &itemId, DTO::UserData *userData) { - int i = 0; - /*for (DTO::BaseItemDto *val: m_array) { - if (val->userData() != nullptr && val->jellyfinId() == itemId) { - QModelIndex cell = this->index(i); - // val->userData()->onUpdated(userData); - this->dataChanged(cell, cell); - } - i++; - }*/ -} - -void ItemModel::addQueryParameters(QUrlQuery &query) { - ApiModel::addQueryParameters(query); - if (!m_parentId.isEmpty()) { - query.addQueryItem("ParentId", m_parentId); - } - if (!m_imageTypes.empty()) { - query.addQueryItem("ImageTypes", m_imageTypes.join(",")); - } - if (!m_includeItemTypes.empty()) { - query.addQueryItem("IncludeItemTypes", m_includeItemTypes.join(",")); - } - if (!m_seasonId.isEmpty()) { - query.addQueryItem("seasonId", m_seasonId); - } - if (m_recursive) { - query.addQueryItem("Recursive", "true"); - } -} - -void ItemModel::replacePathPlaceholders(QString &path) { - ApiModel::replacePathPlaceholders(path); - if (path.contains("{{show}}") && !m_show.isEmpty()) { - path = m_path.replace("{{show}}", m_show); - } -} - -PublicUserModel::PublicUserModel(QObject *parent) - : ApiModel ("/users/public", false, false, parent) { } - -UserViewModel::UserViewModel(QObject *parent) - : ItemModel ("/Users/{{user}}/Views", true, false, parent) {} - -UserItemModel::UserItemModel(QObject *parent) - : ItemModel ("/Users/{{user}}/Items", true, false, parent) {} - -UserItemResumeModel::UserItemResumeModel(QObject *parent) - : ItemModel ("/Users/{{user}}/Items/Resume", true, false, parent) {} - -UserItemLatestModel::UserItemLatestModel(QObject *parent) - : ItemModel ("/Users/{{user}}/Items/Latest", false, false, parent) {} - -ShowNextUpModel::ShowNextUpModel(QObject *parent) - : ItemModel("/Shows/NextUp", true, true, parent) {} - -ShowSeasonsModel::ShowSeasonsModel(QObject *parent) - : ItemModel ("/Shows/{{show}}/Seasons", true, true, parent) {} - -ShowEpisodesModel::ShowEpisodesModel(QObject *parent) - : ItemModel ("/Shows/{{show}}/Episodes", true, true, parent) {} void registerModels(const char *URI) { - qmlRegisterUncreatableType(URI, 1, 0, "ApiModel", "Is enum and base class"); - qmlRegisterUncreatableType(URI, 1, 0, "SortOptions", "Is enum"); - qmlRegisterType(URI, 1, 0, "PublicUserModel"); - qmlRegisterType(URI, 1, 0, "UserViewModel"); - qmlRegisterType(URI, 1, 0, "UserItemModel"); - qmlRegisterType(URI, 1, 0, "UserItemLatestModel"); - qmlRegisterType(URI, 1, 0, "UserItemResumeModel"); - qmlRegisterType(URI, 1, 0, "ShowNextUpModel"); - qmlRegisterType(URI, 1, 0, "ShowSeasonsModel"); - qmlRegisterType(URI, 1, 0, "ShowEpisodesModel"); + Q_UNUSED(URI) + //qmlRegisterUncreatableType(URI, 1, 0, "ApiModel", "Is enum and base class"); + //qmlRegisterType(URI, 1, 0, "PublicUserModel"); } } diff --git a/core/src/dto/activitylogentryqueryresult.cpp b/core/src/dto/activitylogentryqueryresult.cpp index e8bb1c3..24e1b54 100644 --- a/core/src/dto/activitylogentryqueryresult.cpp +++ b/core/src/dto/activitylogentryqueryresult.cpp @@ -55,7 +55,7 @@ ActivityLogEntryQueryResult ActivityLogEntryQueryResult::fromJson(QJsonObject so void ActivityLogEntryQueryResult::setFromJson(QJsonObject source) { - m_items = Jellyfin::Support::fromJsonValue>>(source["Items"]); + m_items = Jellyfin::Support::fromJsonValue>(source["Items"]); m_totalRecordCount = Jellyfin::Support::fromJsonValue(source["TotalRecordCount"]); m_startIndex = Jellyfin::Support::fromJsonValue(source["StartIndex"]); @@ -63,16 +63,16 @@ void ActivityLogEntryQueryResult::setFromJson(QJsonObject source) { QJsonObject ActivityLogEntryQueryResult::toJson() { QJsonObject result; - result["Items"] = Jellyfin::Support::toJsonValue>>(m_items); + result["Items"] = Jellyfin::Support::toJsonValue>(m_items); result["TotalRecordCount"] = Jellyfin::Support::toJsonValue(m_totalRecordCount); result["StartIndex"] = Jellyfin::Support::toJsonValue(m_startIndex); return result; } -QList> ActivityLogEntryQueryResult::items() const { return m_items; } +QList ActivityLogEntryQueryResult::items() const { return m_items; } -void ActivityLogEntryQueryResult::setItems(QList> newItems) { +void ActivityLogEntryQueryResult::setItems(QList newItems) { m_items = newItems; } bool ActivityLogEntryQueryResult::itemsNull() const { diff --git a/core/src/dto/albuminfo.cpp b/core/src/dto/albuminfo.cpp index 6f022fd..abd9926 100644 --- a/core/src/dto/albuminfo.cpp +++ b/core/src/dto/albuminfo.cpp @@ -87,7 +87,7 @@ void AlbumInfo::setFromJson(QJsonObject source) { m_isAutomated = Jellyfin::Support::fromJsonValue(source["IsAutomated"]); m_albumArtists = Jellyfin::Support::fromJsonValue(source["AlbumArtists"]); m_artistProviderIds = Jellyfin::Support::fromJsonValue>(source["ArtistProviderIds"]); - m_songInfos = Jellyfin::Support::fromJsonValue>>(source["SongInfos"]); + m_songInfos = Jellyfin::Support::fromJsonValue>(source["SongInfos"]); } @@ -105,7 +105,7 @@ QJsonObject AlbumInfo::toJson() { result["IsAutomated"] = Jellyfin::Support::toJsonValue(m_isAutomated); result["AlbumArtists"] = Jellyfin::Support::toJsonValue(m_albumArtists); result["ArtistProviderIds"] = Jellyfin::Support::toJsonValue>(m_artistProviderIds); - result["SongInfos"] = Jellyfin::Support::toJsonValue>>(m_songInfos); + result["SongInfos"] = Jellyfin::Support::toJsonValue>(m_songInfos); return result; } @@ -259,9 +259,9 @@ void AlbumInfo::setArtistProviderIdsNull() { m_artistProviderIds = std::nullopt; } -QList> AlbumInfo::songInfos() const { return m_songInfos; } +QList AlbumInfo::songInfos() const { return m_songInfos; } -void AlbumInfo::setSongInfos(QList> newSongInfos) { +void AlbumInfo::setSongInfos(QList newSongInfos) { m_songInfos = newSongInfos; } bool AlbumInfo::songInfosNull() const { diff --git a/core/src/dto/artistinfo.cpp b/core/src/dto/artistinfo.cpp index 72a43e7..5a35745 100644 --- a/core/src/dto/artistinfo.cpp +++ b/core/src/dto/artistinfo.cpp @@ -81,7 +81,7 @@ void ArtistInfo::setFromJson(QJsonObject source) { m_parentIndexNumber = Jellyfin::Support::fromJsonValue>(source["ParentIndexNumber"]); m_premiereDate = Jellyfin::Support::fromJsonValue(source["PremiereDate"]); m_isAutomated = Jellyfin::Support::fromJsonValue(source["IsAutomated"]); - m_songInfos = Jellyfin::Support::fromJsonValue>>(source["SongInfos"]); + m_songInfos = Jellyfin::Support::fromJsonValue>(source["SongInfos"]); } @@ -97,7 +97,7 @@ QJsonObject ArtistInfo::toJson() { result["ParentIndexNumber"] = Jellyfin::Support::toJsonValue>(m_parentIndexNumber); result["PremiereDate"] = Jellyfin::Support::toJsonValue(m_premiereDate); result["IsAutomated"] = Jellyfin::Support::toJsonValue(m_isAutomated); - result["SongInfos"] = Jellyfin::Support::toJsonValue>>(m_songInfos); + result["SongInfos"] = Jellyfin::Support::toJsonValue>(m_songInfos); return result; } @@ -225,9 +225,9 @@ void ArtistInfo::setIsAutomated(bool newIsAutomated) { m_isAutomated = newIsAutomated; } -QList> ArtistInfo::songInfos() const { return m_songInfos; } +QList ArtistInfo::songInfos() const { return m_songInfos; } -void ArtistInfo::setSongInfos(QList> newSongInfos) { +void ArtistInfo::setSongInfos(QList newSongInfos) { m_songInfos = newSongInfos; } bool ArtistInfo::songInfosNull() const { diff --git a/core/src/dto/authenticationinfoqueryresult.cpp b/core/src/dto/authenticationinfoqueryresult.cpp index 62ae4f0..abce850 100644 --- a/core/src/dto/authenticationinfoqueryresult.cpp +++ b/core/src/dto/authenticationinfoqueryresult.cpp @@ -55,7 +55,7 @@ AuthenticationInfoQueryResult AuthenticationInfoQueryResult::fromJson(QJsonObjec void AuthenticationInfoQueryResult::setFromJson(QJsonObject source) { - m_items = Jellyfin::Support::fromJsonValue>>(source["Items"]); + m_items = Jellyfin::Support::fromJsonValue>(source["Items"]); m_totalRecordCount = Jellyfin::Support::fromJsonValue(source["TotalRecordCount"]); m_startIndex = Jellyfin::Support::fromJsonValue(source["StartIndex"]); @@ -63,16 +63,16 @@ void AuthenticationInfoQueryResult::setFromJson(QJsonObject source) { QJsonObject AuthenticationInfoQueryResult::toJson() { QJsonObject result; - result["Items"] = Jellyfin::Support::toJsonValue>>(m_items); + result["Items"] = Jellyfin::Support::toJsonValue>(m_items); result["TotalRecordCount"] = Jellyfin::Support::toJsonValue(m_totalRecordCount); result["StartIndex"] = Jellyfin::Support::toJsonValue(m_startIndex); return result; } -QList> AuthenticationInfoQueryResult::items() const { return m_items; } +QList AuthenticationInfoQueryResult::items() const { return m_items; } -void AuthenticationInfoQueryResult::setItems(QList> newItems) { +void AuthenticationInfoQueryResult::setItems(QList newItems) { m_items = newItems; } bool AuthenticationInfoQueryResult::itemsNull() const { diff --git a/core/src/dto/baseitem.cpp b/core/src/dto/baseitem.cpp index 65311e2..7d8b7f8 100644 --- a/core/src/dto/baseitem.cpp +++ b/core/src/dto/baseitem.cpp @@ -74,7 +74,7 @@ void BaseItem::setFromJson(QJsonObject source) { m_size = Jellyfin::Support::fromJsonValue>(source["Size"]); m_container = Jellyfin::Support::fromJsonValue(source["Container"]); m_dateLastSaved = Jellyfin::Support::fromJsonValue(source["DateLastSaved"]); - m_remoteTrailers = Jellyfin::Support::fromJsonValue>>(source["RemoteTrailers"]); + m_remoteTrailers = Jellyfin::Support::fromJsonValue>(source["RemoteTrailers"]); m_isHD = Jellyfin::Support::fromJsonValue(source["IsHD"]); m_isShortcut = Jellyfin::Support::fromJsonValue(source["IsShortcut"]); m_shortcutPath = Jellyfin::Support::fromJsonValue(source["ShortcutPath"]); @@ -90,7 +90,7 @@ QJsonObject BaseItem::toJson() { result["Size"] = Jellyfin::Support::toJsonValue>(m_size); result["Container"] = Jellyfin::Support::toJsonValue(m_container); result["DateLastSaved"] = Jellyfin::Support::toJsonValue(m_dateLastSaved); - result["RemoteTrailers"] = Jellyfin::Support::toJsonValue>>(m_remoteTrailers); + result["RemoteTrailers"] = Jellyfin::Support::toJsonValue>(m_remoteTrailers); result["IsHD"] = Jellyfin::Support::toJsonValue(m_isHD); result["IsShortcut"] = Jellyfin::Support::toJsonValue(m_isShortcut); result["ShortcutPath"] = Jellyfin::Support::toJsonValue(m_shortcutPath); @@ -134,9 +134,9 @@ void BaseItem::setDateLastSaved(QDateTime newDateLastSaved) { m_dateLastSaved = newDateLastSaved; } -QList> BaseItem::remoteTrailers() const { return m_remoteTrailers; } +QList BaseItem::remoteTrailers() const { return m_remoteTrailers; } -void BaseItem::setRemoteTrailers(QList> newRemoteTrailers) { +void BaseItem::setRemoteTrailers(QList newRemoteTrailers) { m_remoteTrailers = newRemoteTrailers; } bool BaseItem::remoteTrailersNull() const { diff --git a/core/src/dto/baseitemdto.cpp b/core/src/dto/baseitemdto.cpp index 2c75939..65f3a05 100644 --- a/core/src/dto/baseitemdto.cpp +++ b/core/src/dto/baseitemdto.cpp @@ -375,8 +375,8 @@ void BaseItemDto::setFromJson(QJsonObject source) { m_forcedSortName = Jellyfin::Support::fromJsonValue(source["ForcedSortName"]); m_video3DFormat = Jellyfin::Support::fromJsonValue(source["Video3DFormat"]); m_premiereDate = Jellyfin::Support::fromJsonValue(source["PremiereDate"]); - m_externalUrls = Jellyfin::Support::fromJsonValue>>(source["ExternalUrls"]); - m_mediaSources = Jellyfin::Support::fromJsonValue>>(source["MediaSources"]); + m_externalUrls = Jellyfin::Support::fromJsonValue>(source["ExternalUrls"]); + m_mediaSources = Jellyfin::Support::fromJsonValue>(source["MediaSources"]); m_criticRating = Jellyfin::Support::fromJsonValue>(source["CriticRating"]); m_productionLocations = Jellyfin::Support::fromJsonValue(source["ProductionLocations"]); m_path = Jellyfin::Support::fromJsonValue(source["Path"]); @@ -400,15 +400,15 @@ void BaseItemDto::setFromJson(QJsonObject source) { m_indexNumber = Jellyfin::Support::fromJsonValue>(source["IndexNumber"]); m_indexNumberEnd = Jellyfin::Support::fromJsonValue>(source["IndexNumberEnd"]); m_parentIndexNumber = Jellyfin::Support::fromJsonValue>(source["ParentIndexNumber"]); - m_remoteTrailers = Jellyfin::Support::fromJsonValue>>(source["RemoteTrailers"]); + m_remoteTrailers = Jellyfin::Support::fromJsonValue>(source["RemoteTrailers"]); m_providerIds = Jellyfin::Support::fromJsonValue>(source["ProviderIds"]); m_isHD = Jellyfin::Support::fromJsonValue>(source["IsHD"]); m_isFolder = Jellyfin::Support::fromJsonValue>(source["IsFolder"]); m_parentId = Jellyfin::Support::fromJsonValue(source["ParentId"]); m_type = Jellyfin::Support::fromJsonValue(source["Type"]); - m_people = Jellyfin::Support::fromJsonValue>>(source["People"]); - m_studios = Jellyfin::Support::fromJsonValue>>(source["Studios"]); - m_genreItems = Jellyfin::Support::fromJsonValue>>(source["GenreItems"]); + m_people = Jellyfin::Support::fromJsonValue>(source["People"]); + m_studios = Jellyfin::Support::fromJsonValue>(source["Studios"]); + m_genreItems = Jellyfin::Support::fromJsonValue>(source["GenreItems"]); m_parentLogoItemId = Jellyfin::Support::fromJsonValue(source["ParentLogoItemId"]); m_parentBackdropItemId = Jellyfin::Support::fromJsonValue(source["ParentBackdropItemId"]); m_parentBackdropImageTags = Jellyfin::Support::fromJsonValue(source["ParentBackdropImageTags"]); @@ -427,7 +427,7 @@ void BaseItemDto::setFromJson(QJsonObject source) { m_tags = Jellyfin::Support::fromJsonValue(source["Tags"]); m_primaryImageAspectRatio = Jellyfin::Support::fromJsonValue>(source["PrimaryImageAspectRatio"]); m_artists = Jellyfin::Support::fromJsonValue(source["Artists"]); - m_artistItems = Jellyfin::Support::fromJsonValue>>(source["ArtistItems"]); + m_artistItems = Jellyfin::Support::fromJsonValue>(source["ArtistItems"]); m_album = Jellyfin::Support::fromJsonValue(source["Album"]); m_collectionType = Jellyfin::Support::fromJsonValue(source["CollectionType"]); m_displayOrder = Jellyfin::Support::fromJsonValue(source["DisplayOrder"]); @@ -435,9 +435,9 @@ void BaseItemDto::setFromJson(QJsonObject source) { m_albumPrimaryImageTag = Jellyfin::Support::fromJsonValue(source["AlbumPrimaryImageTag"]); m_seriesPrimaryImageTag = Jellyfin::Support::fromJsonValue(source["SeriesPrimaryImageTag"]); m_albumArtist = Jellyfin::Support::fromJsonValue(source["AlbumArtist"]); - m_albumArtists = Jellyfin::Support::fromJsonValue>>(source["AlbumArtists"]); + m_albumArtists = Jellyfin::Support::fromJsonValue>(source["AlbumArtists"]); m_seasonName = Jellyfin::Support::fromJsonValue(source["SeasonName"]); - m_mediaStreams = Jellyfin::Support::fromJsonValue>>(source["MediaStreams"]); + m_mediaStreams = Jellyfin::Support::fromJsonValue>(source["MediaStreams"]); m_videoType = Jellyfin::Support::fromJsonValue(source["VideoType"]); m_partCount = Jellyfin::Support::fromJsonValue>(source["PartCount"]); m_mediaSourceCount = Jellyfin::Support::fromJsonValue>(source["MediaSourceCount"]); @@ -454,7 +454,7 @@ void BaseItemDto::setFromJson(QJsonObject source) { m_parentThumbImageTag = Jellyfin::Support::fromJsonValue(source["ParentThumbImageTag"]); m_parentPrimaryImageItemId = Jellyfin::Support::fromJsonValue(source["ParentPrimaryImageItemId"]); m_parentPrimaryImageTag = Jellyfin::Support::fromJsonValue(source["ParentPrimaryImageTag"]); - m_chapters = Jellyfin::Support::fromJsonValue>>(source["Chapters"]); + m_chapters = Jellyfin::Support::fromJsonValue>(source["Chapters"]); m_locationType = Jellyfin::Support::fromJsonValue(source["LocationType"]); m_isoType = Jellyfin::Support::fromJsonValue(source["IsoType"]); m_mediaType = Jellyfin::Support::fromJsonValue(source["MediaType"]); @@ -531,8 +531,8 @@ QJsonObject BaseItemDto::toJson() { result["ForcedSortName"] = Jellyfin::Support::toJsonValue(m_forcedSortName); result["Video3DFormat"] = Jellyfin::Support::toJsonValue(m_video3DFormat); result["PremiereDate"] = Jellyfin::Support::toJsonValue(m_premiereDate); - result["ExternalUrls"] = Jellyfin::Support::toJsonValue>>(m_externalUrls); - result["MediaSources"] = Jellyfin::Support::toJsonValue>>(m_mediaSources); + result["ExternalUrls"] = Jellyfin::Support::toJsonValue>(m_externalUrls); + result["MediaSources"] = Jellyfin::Support::toJsonValue>(m_mediaSources); result["CriticRating"] = Jellyfin::Support::toJsonValue>(m_criticRating); result["ProductionLocations"] = Jellyfin::Support::toJsonValue(m_productionLocations); result["Path"] = Jellyfin::Support::toJsonValue(m_path); @@ -556,15 +556,15 @@ QJsonObject BaseItemDto::toJson() { result["IndexNumber"] = Jellyfin::Support::toJsonValue>(m_indexNumber); result["IndexNumberEnd"] = Jellyfin::Support::toJsonValue>(m_indexNumberEnd); result["ParentIndexNumber"] = Jellyfin::Support::toJsonValue>(m_parentIndexNumber); - result["RemoteTrailers"] = Jellyfin::Support::toJsonValue>>(m_remoteTrailers); + result["RemoteTrailers"] = Jellyfin::Support::toJsonValue>(m_remoteTrailers); result["ProviderIds"] = Jellyfin::Support::toJsonValue>(m_providerIds); result["IsHD"] = Jellyfin::Support::toJsonValue>(m_isHD); result["IsFolder"] = Jellyfin::Support::toJsonValue>(m_isFolder); result["ParentId"] = Jellyfin::Support::toJsonValue(m_parentId); result["Type"] = Jellyfin::Support::toJsonValue(m_type); - result["People"] = Jellyfin::Support::toJsonValue>>(m_people); - result["Studios"] = Jellyfin::Support::toJsonValue>>(m_studios); - result["GenreItems"] = Jellyfin::Support::toJsonValue>>(m_genreItems); + result["People"] = Jellyfin::Support::toJsonValue>(m_people); + result["Studios"] = Jellyfin::Support::toJsonValue>(m_studios); + result["GenreItems"] = Jellyfin::Support::toJsonValue>(m_genreItems); result["ParentLogoItemId"] = Jellyfin::Support::toJsonValue(m_parentLogoItemId); result["ParentBackdropItemId"] = Jellyfin::Support::toJsonValue(m_parentBackdropItemId); result["ParentBackdropImageTags"] = Jellyfin::Support::toJsonValue(m_parentBackdropImageTags); @@ -583,7 +583,7 @@ QJsonObject BaseItemDto::toJson() { result["Tags"] = Jellyfin::Support::toJsonValue(m_tags); result["PrimaryImageAspectRatio"] = Jellyfin::Support::toJsonValue>(m_primaryImageAspectRatio); result["Artists"] = Jellyfin::Support::toJsonValue(m_artists); - result["ArtistItems"] = Jellyfin::Support::toJsonValue>>(m_artistItems); + result["ArtistItems"] = Jellyfin::Support::toJsonValue>(m_artistItems); result["Album"] = Jellyfin::Support::toJsonValue(m_album); result["CollectionType"] = Jellyfin::Support::toJsonValue(m_collectionType); result["DisplayOrder"] = Jellyfin::Support::toJsonValue(m_displayOrder); @@ -591,9 +591,9 @@ QJsonObject BaseItemDto::toJson() { result["AlbumPrimaryImageTag"] = Jellyfin::Support::toJsonValue(m_albumPrimaryImageTag); result["SeriesPrimaryImageTag"] = Jellyfin::Support::toJsonValue(m_seriesPrimaryImageTag); result["AlbumArtist"] = Jellyfin::Support::toJsonValue(m_albumArtist); - result["AlbumArtists"] = Jellyfin::Support::toJsonValue>>(m_albumArtists); + result["AlbumArtists"] = Jellyfin::Support::toJsonValue>(m_albumArtists); result["SeasonName"] = Jellyfin::Support::toJsonValue(m_seasonName); - result["MediaStreams"] = Jellyfin::Support::toJsonValue>>(m_mediaStreams); + result["MediaStreams"] = Jellyfin::Support::toJsonValue>(m_mediaStreams); result["VideoType"] = Jellyfin::Support::toJsonValue(m_videoType); result["PartCount"] = Jellyfin::Support::toJsonValue>(m_partCount); result["MediaSourceCount"] = Jellyfin::Support::toJsonValue>(m_mediaSourceCount); @@ -610,7 +610,7 @@ QJsonObject BaseItemDto::toJson() { result["ParentThumbImageTag"] = Jellyfin::Support::toJsonValue(m_parentThumbImageTag); result["ParentPrimaryImageItemId"] = Jellyfin::Support::toJsonValue(m_parentPrimaryImageItemId); result["ParentPrimaryImageTag"] = Jellyfin::Support::toJsonValue(m_parentPrimaryImageTag); - result["Chapters"] = Jellyfin::Support::toJsonValue>>(m_chapters); + result["Chapters"] = Jellyfin::Support::toJsonValue>(m_chapters); result["LocationType"] = Jellyfin::Support::toJsonValue(m_locationType); result["IsoType"] = Jellyfin::Support::toJsonValue(m_isoType); result["MediaType"] = Jellyfin::Support::toJsonValue(m_mediaType); @@ -960,9 +960,9 @@ void BaseItemDto::setPremiereDateNull() { m_premiereDate= QDateTime(); } -QList> BaseItemDto::externalUrls() const { return m_externalUrls; } +QList BaseItemDto::externalUrls() const { return m_externalUrls; } -void BaseItemDto::setExternalUrls(QList> newExternalUrls) { +void BaseItemDto::setExternalUrls(QList newExternalUrls) { m_externalUrls = newExternalUrls; } bool BaseItemDto::externalUrlsNull() const { @@ -973,9 +973,9 @@ void BaseItemDto::setExternalUrlsNull() { m_externalUrls.clear(); } -QList> BaseItemDto::mediaSources() const { return m_mediaSources; } +QList BaseItemDto::mediaSources() const { return m_mediaSources; } -void BaseItemDto::setMediaSources(QList> newMediaSources) { +void BaseItemDto::setMediaSources(QList newMediaSources) { m_mediaSources = newMediaSources; } bool BaseItemDto::mediaSourcesNull() const { @@ -1278,9 +1278,9 @@ void BaseItemDto::setParentIndexNumberNull() { m_parentIndexNumber = std::nullopt; } -QList> BaseItemDto::remoteTrailers() const { return m_remoteTrailers; } +QList BaseItemDto::remoteTrailers() const { return m_remoteTrailers; } -void BaseItemDto::setRemoteTrailers(QList> newRemoteTrailers) { +void BaseItemDto::setRemoteTrailers(QList newRemoteTrailers) { m_remoteTrailers = newRemoteTrailers; } bool BaseItemDto::remoteTrailersNull() const { @@ -1356,9 +1356,9 @@ void BaseItemDto::setTypeNull() { m_type.clear(); } -QList> BaseItemDto::people() const { return m_people; } +QList BaseItemDto::people() const { return m_people; } -void BaseItemDto::setPeople(QList> newPeople) { +void BaseItemDto::setPeople(QList newPeople) { m_people = newPeople; } bool BaseItemDto::peopleNull() const { @@ -1369,9 +1369,9 @@ void BaseItemDto::setPeopleNull() { m_people.clear(); } -QList> BaseItemDto::studios() const { return m_studios; } +QList BaseItemDto::studios() const { return m_studios; } -void BaseItemDto::setStudios(QList> newStudios) { +void BaseItemDto::setStudios(QList newStudios) { m_studios = newStudios; } bool BaseItemDto::studiosNull() const { @@ -1382,9 +1382,9 @@ void BaseItemDto::setStudiosNull() { m_studios.clear(); } -QList> BaseItemDto::genreItems() const { return m_genreItems; } +QList BaseItemDto::genreItems() const { return m_genreItems; } -void BaseItemDto::setGenreItems(QList> newGenreItems) { +void BaseItemDto::setGenreItems(QList newGenreItems) { m_genreItems = newGenreItems; } bool BaseItemDto::genreItemsNull() const { @@ -1622,9 +1622,9 @@ void BaseItemDto::setArtistsNull() { m_artists.clear(); } -QList> BaseItemDto::artistItems() const { return m_artistItems; } +QList BaseItemDto::artistItems() const { return m_artistItems; } -void BaseItemDto::setArtistItems(QList> newArtistItems) { +void BaseItemDto::setArtistItems(QList newArtistItems) { m_artistItems = newArtistItems; } bool BaseItemDto::artistItemsNull() const { @@ -1726,9 +1726,9 @@ void BaseItemDto::setAlbumArtistNull() { m_albumArtist.clear(); } -QList> BaseItemDto::albumArtists() const { return m_albumArtists; } +QList BaseItemDto::albumArtists() const { return m_albumArtists; } -void BaseItemDto::setAlbumArtists(QList> newAlbumArtists) { +void BaseItemDto::setAlbumArtists(QList newAlbumArtists) { m_albumArtists = newAlbumArtists; } bool BaseItemDto::albumArtistsNull() const { @@ -1752,9 +1752,9 @@ void BaseItemDto::setSeasonNameNull() { m_seasonName.clear(); } -QList> BaseItemDto::mediaStreams() const { return m_mediaStreams; } +QList BaseItemDto::mediaStreams() const { return m_mediaStreams; } -void BaseItemDto::setMediaStreams(QList> newMediaStreams) { +void BaseItemDto::setMediaStreams(QList newMediaStreams) { m_mediaStreams = newMediaStreams; } bool BaseItemDto::mediaStreamsNull() const { @@ -1966,9 +1966,9 @@ void BaseItemDto::setParentPrimaryImageTagNull() { m_parentPrimaryImageTag.clear(); } -QList> BaseItemDto::chapters() const { return m_chapters; } +QList BaseItemDto::chapters() const { return m_chapters; } -void BaseItemDto::setChapters(QList> newChapters) { +void BaseItemDto::setChapters(QList newChapters) { m_chapters = newChapters; } bool BaseItemDto::chaptersNull() const { diff --git a/core/src/dto/baseitemdtoqueryresult.cpp b/core/src/dto/baseitemdtoqueryresult.cpp index 816c62a..2ba00f7 100644 --- a/core/src/dto/baseitemdtoqueryresult.cpp +++ b/core/src/dto/baseitemdtoqueryresult.cpp @@ -55,7 +55,7 @@ BaseItemDtoQueryResult BaseItemDtoQueryResult::fromJson(QJsonObject source) { void BaseItemDtoQueryResult::setFromJson(QJsonObject source) { - m_items = Jellyfin::Support::fromJsonValue>>(source["Items"]); + m_items = Jellyfin::Support::fromJsonValue>(source["Items"]); m_totalRecordCount = Jellyfin::Support::fromJsonValue(source["TotalRecordCount"]); m_startIndex = Jellyfin::Support::fromJsonValue(source["StartIndex"]); @@ -63,16 +63,16 @@ void BaseItemDtoQueryResult::setFromJson(QJsonObject source) { QJsonObject BaseItemDtoQueryResult::toJson() { QJsonObject result; - result["Items"] = Jellyfin::Support::toJsonValue>>(m_items); + result["Items"] = Jellyfin::Support::toJsonValue>(m_items); result["TotalRecordCount"] = Jellyfin::Support::toJsonValue(m_totalRecordCount); result["StartIndex"] = Jellyfin::Support::toJsonValue(m_startIndex); return result; } -QList> BaseItemDtoQueryResult::items() const { return m_items; } +QList BaseItemDtoQueryResult::items() const { return m_items; } -void BaseItemDtoQueryResult::setItems(QList> newItems) { +void BaseItemDtoQueryResult::setItems(QList newItems) { m_items = newItems; } bool BaseItemDtoQueryResult::itemsNull() const { diff --git a/core/src/dto/channelmappingoptionsdto.cpp b/core/src/dto/channelmappingoptionsdto.cpp index e56e824..6510982 100644 --- a/core/src/dto/channelmappingoptionsdto.cpp +++ b/core/src/dto/channelmappingoptionsdto.cpp @@ -57,26 +57,26 @@ ChannelMappingOptionsDto ChannelMappingOptionsDto::fromJson(QJsonObject source) void ChannelMappingOptionsDto::setFromJson(QJsonObject source) { - m_tunerChannels = Jellyfin::Support::fromJsonValue>>(source["TunerChannels"]); - m_providerChannels = Jellyfin::Support::fromJsonValue>>(source["ProviderChannels"]); - m_mappings = Jellyfin::Support::fromJsonValue>>(source["Mappings"]); + m_tunerChannels = Jellyfin::Support::fromJsonValue>(source["TunerChannels"]); + m_providerChannels = Jellyfin::Support::fromJsonValue>(source["ProviderChannels"]); + m_mappings = Jellyfin::Support::fromJsonValue>(source["Mappings"]); m_providerName = Jellyfin::Support::fromJsonValue(source["ProviderName"]); } QJsonObject ChannelMappingOptionsDto::toJson() { QJsonObject result; - result["TunerChannels"] = Jellyfin::Support::toJsonValue>>(m_tunerChannels); - result["ProviderChannels"] = Jellyfin::Support::toJsonValue>>(m_providerChannels); - result["Mappings"] = Jellyfin::Support::toJsonValue>>(m_mappings); + result["TunerChannels"] = Jellyfin::Support::toJsonValue>(m_tunerChannels); + result["ProviderChannels"] = Jellyfin::Support::toJsonValue>(m_providerChannels); + result["Mappings"] = Jellyfin::Support::toJsonValue>(m_mappings); result["ProviderName"] = Jellyfin::Support::toJsonValue(m_providerName); return result; } -QList> ChannelMappingOptionsDto::tunerChannels() const { return m_tunerChannels; } +QList ChannelMappingOptionsDto::tunerChannels() const { return m_tunerChannels; } -void ChannelMappingOptionsDto::setTunerChannels(QList> newTunerChannels) { +void ChannelMappingOptionsDto::setTunerChannels(QList newTunerChannels) { m_tunerChannels = newTunerChannels; } bool ChannelMappingOptionsDto::tunerChannelsNull() const { @@ -87,9 +87,9 @@ void ChannelMappingOptionsDto::setTunerChannelsNull() { m_tunerChannels.clear(); } -QList> ChannelMappingOptionsDto::providerChannels() const { return m_providerChannels; } +QList ChannelMappingOptionsDto::providerChannels() const { return m_providerChannels; } -void ChannelMappingOptionsDto::setProviderChannels(QList> newProviderChannels) { +void ChannelMappingOptionsDto::setProviderChannels(QList newProviderChannels) { m_providerChannels = newProviderChannels; } bool ChannelMappingOptionsDto::providerChannelsNull() const { @@ -100,9 +100,9 @@ void ChannelMappingOptionsDto::setProviderChannelsNull() { m_providerChannels.clear(); } -QList> ChannelMappingOptionsDto::mappings() const { return m_mappings; } +QList ChannelMappingOptionsDto::mappings() const { return m_mappings; } -void ChannelMappingOptionsDto::setMappings(QList> newMappings) { +void ChannelMappingOptionsDto::setMappings(QList newMappings) { m_mappings = newMappings; } bool ChannelMappingOptionsDto::mappingsNull() const { diff --git a/core/src/dto/codecprofile.cpp b/core/src/dto/codecprofile.cpp index 2a45fd1..f17c0ba 100644 --- a/core/src/dto/codecprofile.cpp +++ b/core/src/dto/codecprofile.cpp @@ -60,8 +60,8 @@ CodecProfile CodecProfile::fromJson(QJsonObject source) { void CodecProfile::setFromJson(QJsonObject source) { m_type = Jellyfin::Support::fromJsonValue(source["Type"]); - m_conditions = Jellyfin::Support::fromJsonValue>>(source["Conditions"]); - m_applyConditions = Jellyfin::Support::fromJsonValue>>(source["ApplyConditions"]); + m_conditions = Jellyfin::Support::fromJsonValue>(source["Conditions"]); + m_applyConditions = Jellyfin::Support::fromJsonValue>(source["ApplyConditions"]); m_codec = Jellyfin::Support::fromJsonValue(source["Codec"]); m_container = Jellyfin::Support::fromJsonValue(source["Container"]); @@ -70,8 +70,8 @@ void CodecProfile::setFromJson(QJsonObject source) { QJsonObject CodecProfile::toJson() { QJsonObject result; result["Type"] = Jellyfin::Support::toJsonValue(m_type); - result["Conditions"] = Jellyfin::Support::toJsonValue>>(m_conditions); - result["ApplyConditions"] = Jellyfin::Support::toJsonValue>>(m_applyConditions); + result["Conditions"] = Jellyfin::Support::toJsonValue>(m_conditions); + result["ApplyConditions"] = Jellyfin::Support::toJsonValue>(m_applyConditions); result["Codec"] = Jellyfin::Support::toJsonValue(m_codec); result["Container"] = Jellyfin::Support::toJsonValue(m_container); @@ -84,9 +84,9 @@ void CodecProfile::setType(CodecType newType) { m_type = newType; } -QList> CodecProfile::conditions() const { return m_conditions; } +QList CodecProfile::conditions() const { return m_conditions; } -void CodecProfile::setConditions(QList> newConditions) { +void CodecProfile::setConditions(QList newConditions) { m_conditions = newConditions; } bool CodecProfile::conditionsNull() const { @@ -97,9 +97,9 @@ void CodecProfile::setConditionsNull() { m_conditions.clear(); } -QList> CodecProfile::applyConditions() const { return m_applyConditions; } +QList CodecProfile::applyConditions() const { return m_applyConditions; } -void CodecProfile::setApplyConditions(QList> newApplyConditions) { +void CodecProfile::setApplyConditions(QList newApplyConditions) { m_applyConditions = newApplyConditions; } bool CodecProfile::applyConditionsNull() const { diff --git a/core/src/dto/containerprofile.cpp b/core/src/dto/containerprofile.cpp index a8eff63..f82aa1c 100644 --- a/core/src/dto/containerprofile.cpp +++ b/core/src/dto/containerprofile.cpp @@ -56,7 +56,7 @@ ContainerProfile ContainerProfile::fromJson(QJsonObject source) { void ContainerProfile::setFromJson(QJsonObject source) { m_type = Jellyfin::Support::fromJsonValue(source["Type"]); - m_conditions = Jellyfin::Support::fromJsonValue>>(source["Conditions"]); + m_conditions = Jellyfin::Support::fromJsonValue>(source["Conditions"]); m_container = Jellyfin::Support::fromJsonValue(source["Container"]); } @@ -64,7 +64,7 @@ void ContainerProfile::setFromJson(QJsonObject source) { QJsonObject ContainerProfile::toJson() { QJsonObject result; result["Type"] = Jellyfin::Support::toJsonValue(m_type); - result["Conditions"] = Jellyfin::Support::toJsonValue>>(m_conditions); + result["Conditions"] = Jellyfin::Support::toJsonValue>(m_conditions); result["Container"] = Jellyfin::Support::toJsonValue(m_container); return result; @@ -76,9 +76,9 @@ void ContainerProfile::setType(DlnaProfileType newType) { m_type = newType; } -QList> ContainerProfile::conditions() const { return m_conditions; } +QList ContainerProfile::conditions() const { return m_conditions; } -void ContainerProfile::setConditions(QList> newConditions) { +void ContainerProfile::setConditions(QList newConditions) { m_conditions = newConditions; } bool ContainerProfile::conditionsNull() const { diff --git a/core/src/dto/deviceidentification.cpp b/core/src/dto/deviceidentification.cpp index 8976aef..2873b70 100644 --- a/core/src/dto/deviceidentification.cpp +++ b/core/src/dto/deviceidentification.cpp @@ -75,7 +75,7 @@ void DeviceIdentification::setFromJson(QJsonObject source) { m_modelUrl = Jellyfin::Support::fromJsonValue(source["ModelUrl"]); m_manufacturer = Jellyfin::Support::fromJsonValue(source["Manufacturer"]); m_manufacturerUrl = Jellyfin::Support::fromJsonValue(source["ManufacturerUrl"]); - m_headers = Jellyfin::Support::fromJsonValue>>(source["Headers"]); + m_headers = Jellyfin::Support::fromJsonValue>(source["Headers"]); } @@ -89,7 +89,7 @@ QJsonObject DeviceIdentification::toJson() { result["ModelUrl"] = Jellyfin::Support::toJsonValue(m_modelUrl); result["Manufacturer"] = Jellyfin::Support::toJsonValue(m_manufacturer); result["ManufacturerUrl"] = Jellyfin::Support::toJsonValue(m_manufacturerUrl); - result["Headers"] = Jellyfin::Support::toJsonValue>>(m_headers); + result["Headers"] = Jellyfin::Support::toJsonValue>(m_headers); return result; } @@ -198,9 +198,9 @@ void DeviceIdentification::setManufacturerUrlNull() { m_manufacturerUrl.clear(); } -QList> DeviceIdentification::headers() const { return m_headers; } +QList DeviceIdentification::headers() const { return m_headers; } -void DeviceIdentification::setHeaders(QList> newHeaders) { +void DeviceIdentification::setHeaders(QList newHeaders) { m_headers = newHeaders; } bool DeviceIdentification::headersNull() const { diff --git a/core/src/dto/deviceinfoqueryresult.cpp b/core/src/dto/deviceinfoqueryresult.cpp index d34687e..9d0df8e 100644 --- a/core/src/dto/deviceinfoqueryresult.cpp +++ b/core/src/dto/deviceinfoqueryresult.cpp @@ -55,7 +55,7 @@ DeviceInfoQueryResult DeviceInfoQueryResult::fromJson(QJsonObject source) { void DeviceInfoQueryResult::setFromJson(QJsonObject source) { - m_items = Jellyfin::Support::fromJsonValue>>(source["Items"]); + m_items = Jellyfin::Support::fromJsonValue>(source["Items"]); m_totalRecordCount = Jellyfin::Support::fromJsonValue(source["TotalRecordCount"]); m_startIndex = Jellyfin::Support::fromJsonValue(source["StartIndex"]); @@ -63,16 +63,16 @@ void DeviceInfoQueryResult::setFromJson(QJsonObject source) { QJsonObject DeviceInfoQueryResult::toJson() { QJsonObject result; - result["Items"] = Jellyfin::Support::toJsonValue>>(m_items); + result["Items"] = Jellyfin::Support::toJsonValue>(m_items); result["TotalRecordCount"] = Jellyfin::Support::toJsonValue(m_totalRecordCount); result["StartIndex"] = Jellyfin::Support::toJsonValue(m_startIndex); return result; } -QList> DeviceInfoQueryResult::items() const { return m_items; } +QList DeviceInfoQueryResult::items() const { return m_items; } -void DeviceInfoQueryResult::setItems(QList> newItems) { +void DeviceInfoQueryResult::setItems(QList newItems) { m_items = newItems; } bool DeviceInfoQueryResult::itemsNull() const { diff --git a/core/src/dto/deviceprofile.cpp b/core/src/dto/deviceprofile.cpp index 34ddb3e..4c52d6f 100644 --- a/core/src/dto/deviceprofile.cpp +++ b/core/src/dto/deviceprofile.cpp @@ -159,13 +159,13 @@ void DeviceProfile::setFromJson(QJsonObject source) { m_requiresPlainFolders = Jellyfin::Support::fromJsonValue(source["RequiresPlainFolders"]); m_enableMSMediaReceiverRegistrar = Jellyfin::Support::fromJsonValue(source["EnableMSMediaReceiverRegistrar"]); m_ignoreTranscodeByteRangeRequests = Jellyfin::Support::fromJsonValue(source["IgnoreTranscodeByteRangeRequests"]); - m_xmlRootAttributes = Jellyfin::Support::fromJsonValue>>(source["XmlRootAttributes"]); - m_directPlayProfiles = Jellyfin::Support::fromJsonValue>>(source["DirectPlayProfiles"]); - m_transcodingProfiles = Jellyfin::Support::fromJsonValue>>(source["TranscodingProfiles"]); - m_containerProfiles = Jellyfin::Support::fromJsonValue>>(source["ContainerProfiles"]); - m_codecProfiles = Jellyfin::Support::fromJsonValue>>(source["CodecProfiles"]); - m_responseProfiles = Jellyfin::Support::fromJsonValue>>(source["ResponseProfiles"]); - m_subtitleProfiles = Jellyfin::Support::fromJsonValue>>(source["SubtitleProfiles"]); + m_xmlRootAttributes = Jellyfin::Support::fromJsonValue>(source["XmlRootAttributes"]); + m_directPlayProfiles = Jellyfin::Support::fromJsonValue>(source["DirectPlayProfiles"]); + m_transcodingProfiles = Jellyfin::Support::fromJsonValue>(source["TranscodingProfiles"]); + m_containerProfiles = Jellyfin::Support::fromJsonValue>(source["ContainerProfiles"]); + m_codecProfiles = Jellyfin::Support::fromJsonValue>(source["CodecProfiles"]); + m_responseProfiles = Jellyfin::Support::fromJsonValue>(source["ResponseProfiles"]); + m_subtitleProfiles = Jellyfin::Support::fromJsonValue>(source["SubtitleProfiles"]); } @@ -203,13 +203,13 @@ QJsonObject DeviceProfile::toJson() { result["RequiresPlainFolders"] = Jellyfin::Support::toJsonValue(m_requiresPlainFolders); result["EnableMSMediaReceiverRegistrar"] = Jellyfin::Support::toJsonValue(m_enableMSMediaReceiverRegistrar); result["IgnoreTranscodeByteRangeRequests"] = Jellyfin::Support::toJsonValue(m_ignoreTranscodeByteRangeRequests); - result["XmlRootAttributes"] = Jellyfin::Support::toJsonValue>>(m_xmlRootAttributes); - result["DirectPlayProfiles"] = Jellyfin::Support::toJsonValue>>(m_directPlayProfiles); - result["TranscodingProfiles"] = Jellyfin::Support::toJsonValue>>(m_transcodingProfiles); - result["ContainerProfiles"] = Jellyfin::Support::toJsonValue>>(m_containerProfiles); - result["CodecProfiles"] = Jellyfin::Support::toJsonValue>>(m_codecProfiles); - result["ResponseProfiles"] = Jellyfin::Support::toJsonValue>>(m_responseProfiles); - result["SubtitleProfiles"] = Jellyfin::Support::toJsonValue>>(m_subtitleProfiles); + result["XmlRootAttributes"] = Jellyfin::Support::toJsonValue>(m_xmlRootAttributes); + result["DirectPlayProfiles"] = Jellyfin::Support::toJsonValue>(m_directPlayProfiles); + result["TranscodingProfiles"] = Jellyfin::Support::toJsonValue>(m_transcodingProfiles); + result["ContainerProfiles"] = Jellyfin::Support::toJsonValue>(m_containerProfiles); + result["CodecProfiles"] = Jellyfin::Support::toJsonValue>(m_codecProfiles); + result["ResponseProfiles"] = Jellyfin::Support::toJsonValue>(m_responseProfiles); + result["SubtitleProfiles"] = Jellyfin::Support::toJsonValue>(m_subtitleProfiles); return result; } @@ -553,9 +553,9 @@ void DeviceProfile::setIgnoreTranscodeByteRangeRequests(bool newIgnoreTranscodeB m_ignoreTranscodeByteRangeRequests = newIgnoreTranscodeByteRangeRequests; } -QList> DeviceProfile::xmlRootAttributes() const { return m_xmlRootAttributes; } +QList DeviceProfile::xmlRootAttributes() const { return m_xmlRootAttributes; } -void DeviceProfile::setXmlRootAttributes(QList> newXmlRootAttributes) { +void DeviceProfile::setXmlRootAttributes(QList newXmlRootAttributes) { m_xmlRootAttributes = newXmlRootAttributes; } bool DeviceProfile::xmlRootAttributesNull() const { @@ -566,9 +566,9 @@ void DeviceProfile::setXmlRootAttributesNull() { m_xmlRootAttributes.clear(); } -QList> DeviceProfile::directPlayProfiles() const { return m_directPlayProfiles; } +QList DeviceProfile::directPlayProfiles() const { return m_directPlayProfiles; } -void DeviceProfile::setDirectPlayProfiles(QList> newDirectPlayProfiles) { +void DeviceProfile::setDirectPlayProfiles(QList newDirectPlayProfiles) { m_directPlayProfiles = newDirectPlayProfiles; } bool DeviceProfile::directPlayProfilesNull() const { @@ -579,9 +579,9 @@ void DeviceProfile::setDirectPlayProfilesNull() { m_directPlayProfiles.clear(); } -QList> DeviceProfile::transcodingProfiles() const { return m_transcodingProfiles; } +QList DeviceProfile::transcodingProfiles() const { return m_transcodingProfiles; } -void DeviceProfile::setTranscodingProfiles(QList> newTranscodingProfiles) { +void DeviceProfile::setTranscodingProfiles(QList newTranscodingProfiles) { m_transcodingProfiles = newTranscodingProfiles; } bool DeviceProfile::transcodingProfilesNull() const { @@ -592,9 +592,9 @@ void DeviceProfile::setTranscodingProfilesNull() { m_transcodingProfiles.clear(); } -QList> DeviceProfile::containerProfiles() const { return m_containerProfiles; } +QList DeviceProfile::containerProfiles() const { return m_containerProfiles; } -void DeviceProfile::setContainerProfiles(QList> newContainerProfiles) { +void DeviceProfile::setContainerProfiles(QList newContainerProfiles) { m_containerProfiles = newContainerProfiles; } bool DeviceProfile::containerProfilesNull() const { @@ -605,9 +605,9 @@ void DeviceProfile::setContainerProfilesNull() { m_containerProfiles.clear(); } -QList> DeviceProfile::codecProfiles() const { return m_codecProfiles; } +QList DeviceProfile::codecProfiles() const { return m_codecProfiles; } -void DeviceProfile::setCodecProfiles(QList> newCodecProfiles) { +void DeviceProfile::setCodecProfiles(QList newCodecProfiles) { m_codecProfiles = newCodecProfiles; } bool DeviceProfile::codecProfilesNull() const { @@ -618,9 +618,9 @@ void DeviceProfile::setCodecProfilesNull() { m_codecProfiles.clear(); } -QList> DeviceProfile::responseProfiles() const { return m_responseProfiles; } +QList DeviceProfile::responseProfiles() const { return m_responseProfiles; } -void DeviceProfile::setResponseProfiles(QList> newResponseProfiles) { +void DeviceProfile::setResponseProfiles(QList newResponseProfiles) { m_responseProfiles = newResponseProfiles; } bool DeviceProfile::responseProfilesNull() const { @@ -631,9 +631,9 @@ void DeviceProfile::setResponseProfilesNull() { m_responseProfiles.clear(); } -QList> DeviceProfile::subtitleProfiles() const { return m_subtitleProfiles; } +QList DeviceProfile::subtitleProfiles() const { return m_subtitleProfiles; } -void DeviceProfile::setSubtitleProfiles(QList> newSubtitleProfiles) { +void DeviceProfile::setSubtitleProfiles(QList newSubtitleProfiles) { m_subtitleProfiles = newSubtitleProfiles; } bool DeviceProfile::subtitleProfilesNull() const { diff --git a/core/src/dto/libraryoptions.cpp b/core/src/dto/libraryoptions.cpp index 7af7dd4..c4690f8 100644 --- a/core/src/dto/libraryoptions.cpp +++ b/core/src/dto/libraryoptions.cpp @@ -103,7 +103,7 @@ void LibraryOptions::setFromJson(QJsonObject source) { m_enableRealtimeMonitor = Jellyfin::Support::fromJsonValue(source["EnableRealtimeMonitor"]); m_enableChapterImageExtraction = Jellyfin::Support::fromJsonValue(source["EnableChapterImageExtraction"]); m_extractChapterImagesDuringLibraryScan = Jellyfin::Support::fromJsonValue(source["ExtractChapterImagesDuringLibraryScan"]); - m_pathInfos = Jellyfin::Support::fromJsonValue>>(source["PathInfos"]); + m_pathInfos = Jellyfin::Support::fromJsonValue>(source["PathInfos"]); m_saveLocalMetadata = Jellyfin::Support::fromJsonValue(source["SaveLocalMetadata"]); m_enableInternetProviders = Jellyfin::Support::fromJsonValue(source["EnableInternetProviders"]); m_enableAutomaticSeriesGrouping = Jellyfin::Support::fromJsonValue(source["EnableAutomaticSeriesGrouping"]); @@ -123,7 +123,7 @@ void LibraryOptions::setFromJson(QJsonObject source) { m_subtitleDownloadLanguages = Jellyfin::Support::fromJsonValue(source["SubtitleDownloadLanguages"]); m_requirePerfectSubtitleMatch = Jellyfin::Support::fromJsonValue(source["RequirePerfectSubtitleMatch"]); m_saveSubtitlesWithMedia = Jellyfin::Support::fromJsonValue(source["SaveSubtitlesWithMedia"]); - m_typeOptions = Jellyfin::Support::fromJsonValue>>(source["TypeOptions"]); + m_typeOptions = Jellyfin::Support::fromJsonValue>(source["TypeOptions"]); } @@ -133,7 +133,7 @@ QJsonObject LibraryOptions::toJson() { result["EnableRealtimeMonitor"] = Jellyfin::Support::toJsonValue(m_enableRealtimeMonitor); result["EnableChapterImageExtraction"] = Jellyfin::Support::toJsonValue(m_enableChapterImageExtraction); result["ExtractChapterImagesDuringLibraryScan"] = Jellyfin::Support::toJsonValue(m_extractChapterImagesDuringLibraryScan); - result["PathInfos"] = Jellyfin::Support::toJsonValue>>(m_pathInfos); + result["PathInfos"] = Jellyfin::Support::toJsonValue>(m_pathInfos); result["SaveLocalMetadata"] = Jellyfin::Support::toJsonValue(m_saveLocalMetadata); result["EnableInternetProviders"] = Jellyfin::Support::toJsonValue(m_enableInternetProviders); result["EnableAutomaticSeriesGrouping"] = Jellyfin::Support::toJsonValue(m_enableAutomaticSeriesGrouping); @@ -153,7 +153,7 @@ QJsonObject LibraryOptions::toJson() { result["SubtitleDownloadLanguages"] = Jellyfin::Support::toJsonValue(m_subtitleDownloadLanguages); result["RequirePerfectSubtitleMatch"] = Jellyfin::Support::toJsonValue(m_requirePerfectSubtitleMatch); result["SaveSubtitlesWithMedia"] = Jellyfin::Support::toJsonValue(m_saveSubtitlesWithMedia); - result["TypeOptions"] = Jellyfin::Support::toJsonValue>>(m_typeOptions); + result["TypeOptions"] = Jellyfin::Support::toJsonValue>(m_typeOptions); return result; } @@ -182,9 +182,9 @@ void LibraryOptions::setExtractChapterImagesDuringLibraryScan(bool newExtractCha m_extractChapterImagesDuringLibraryScan = newExtractChapterImagesDuringLibraryScan; } -QList> LibraryOptions::pathInfos() const { return m_pathInfos; } +QList LibraryOptions::pathInfos() const { return m_pathInfos; } -void LibraryOptions::setPathInfos(QList> newPathInfos) { +void LibraryOptions::setPathInfos(QList newPathInfos) { m_pathInfos = newPathInfos; } bool LibraryOptions::pathInfosNull() const { @@ -372,9 +372,9 @@ void LibraryOptions::setSaveSubtitlesWithMedia(bool newSaveSubtitlesWithMedia) { m_saveSubtitlesWithMedia = newSaveSubtitlesWithMedia; } -QList> LibraryOptions::typeOptions() const { return m_typeOptions; } +QList LibraryOptions::typeOptions() const { return m_typeOptions; } -void LibraryOptions::setTypeOptions(QList> newTypeOptions) { +void LibraryOptions::setTypeOptions(QList newTypeOptions) { m_typeOptions = newTypeOptions; } bool LibraryOptions::typeOptionsNull() const { diff --git a/core/src/dto/libraryoptionsresultdto.cpp b/core/src/dto/libraryoptionsresultdto.cpp index ee7a53d..7e32433 100644 --- a/core/src/dto/libraryoptionsresultdto.cpp +++ b/core/src/dto/libraryoptionsresultdto.cpp @@ -57,26 +57,26 @@ LibraryOptionsResultDto LibraryOptionsResultDto::fromJson(QJsonObject source) { void LibraryOptionsResultDto::setFromJson(QJsonObject source) { - m_metadataSavers = Jellyfin::Support::fromJsonValue>>(source["MetadataSavers"]); - m_metadataReaders = Jellyfin::Support::fromJsonValue>>(source["MetadataReaders"]); - m_subtitleFetchers = Jellyfin::Support::fromJsonValue>>(source["SubtitleFetchers"]); - m_typeOptions = Jellyfin::Support::fromJsonValue>>(source["TypeOptions"]); + m_metadataSavers = Jellyfin::Support::fromJsonValue>(source["MetadataSavers"]); + m_metadataReaders = Jellyfin::Support::fromJsonValue>(source["MetadataReaders"]); + m_subtitleFetchers = Jellyfin::Support::fromJsonValue>(source["SubtitleFetchers"]); + m_typeOptions = Jellyfin::Support::fromJsonValue>(source["TypeOptions"]); } QJsonObject LibraryOptionsResultDto::toJson() { QJsonObject result; - result["MetadataSavers"] = Jellyfin::Support::toJsonValue>>(m_metadataSavers); - result["MetadataReaders"] = Jellyfin::Support::toJsonValue>>(m_metadataReaders); - result["SubtitleFetchers"] = Jellyfin::Support::toJsonValue>>(m_subtitleFetchers); - result["TypeOptions"] = Jellyfin::Support::toJsonValue>>(m_typeOptions); + result["MetadataSavers"] = Jellyfin::Support::toJsonValue>(m_metadataSavers); + result["MetadataReaders"] = Jellyfin::Support::toJsonValue>(m_metadataReaders); + result["SubtitleFetchers"] = Jellyfin::Support::toJsonValue>(m_subtitleFetchers); + result["TypeOptions"] = Jellyfin::Support::toJsonValue>(m_typeOptions); return result; } -QList> LibraryOptionsResultDto::metadataSavers() const { return m_metadataSavers; } +QList LibraryOptionsResultDto::metadataSavers() const { return m_metadataSavers; } -void LibraryOptionsResultDto::setMetadataSavers(QList> newMetadataSavers) { +void LibraryOptionsResultDto::setMetadataSavers(QList newMetadataSavers) { m_metadataSavers = newMetadataSavers; } bool LibraryOptionsResultDto::metadataSaversNull() const { @@ -87,9 +87,9 @@ void LibraryOptionsResultDto::setMetadataSaversNull() { m_metadataSavers.clear(); } -QList> LibraryOptionsResultDto::metadataReaders() const { return m_metadataReaders; } +QList LibraryOptionsResultDto::metadataReaders() const { return m_metadataReaders; } -void LibraryOptionsResultDto::setMetadataReaders(QList> newMetadataReaders) { +void LibraryOptionsResultDto::setMetadataReaders(QList newMetadataReaders) { m_metadataReaders = newMetadataReaders; } bool LibraryOptionsResultDto::metadataReadersNull() const { @@ -100,9 +100,9 @@ void LibraryOptionsResultDto::setMetadataReadersNull() { m_metadataReaders.clear(); } -QList> LibraryOptionsResultDto::subtitleFetchers() const { return m_subtitleFetchers; } +QList LibraryOptionsResultDto::subtitleFetchers() const { return m_subtitleFetchers; } -void LibraryOptionsResultDto::setSubtitleFetchers(QList> newSubtitleFetchers) { +void LibraryOptionsResultDto::setSubtitleFetchers(QList newSubtitleFetchers) { m_subtitleFetchers = newSubtitleFetchers; } bool LibraryOptionsResultDto::subtitleFetchersNull() const { @@ -113,9 +113,9 @@ void LibraryOptionsResultDto::setSubtitleFetchersNull() { m_subtitleFetchers.clear(); } -QList> LibraryOptionsResultDto::typeOptions() const { return m_typeOptions; } +QList LibraryOptionsResultDto::typeOptions() const { return m_typeOptions; } -void LibraryOptionsResultDto::setTypeOptions(QList> newTypeOptions) { +void LibraryOptionsResultDto::setTypeOptions(QList newTypeOptions) { m_typeOptions = newTypeOptions; } bool LibraryOptionsResultDto::typeOptionsNull() const { diff --git a/core/src/dto/librarytypeoptionsdto.cpp b/core/src/dto/librarytypeoptionsdto.cpp index 7f72ce8..7e50112 100644 --- a/core/src/dto/librarytypeoptionsdto.cpp +++ b/core/src/dto/librarytypeoptionsdto.cpp @@ -60,20 +60,20 @@ LibraryTypeOptionsDto LibraryTypeOptionsDto::fromJson(QJsonObject source) { void LibraryTypeOptionsDto::setFromJson(QJsonObject source) { m_type = Jellyfin::Support::fromJsonValue(source["Type"]); - m_metadataFetchers = Jellyfin::Support::fromJsonValue>>(source["MetadataFetchers"]); - m_imageFetchers = Jellyfin::Support::fromJsonValue>>(source["ImageFetchers"]); + m_metadataFetchers = Jellyfin::Support::fromJsonValue>(source["MetadataFetchers"]); + m_imageFetchers = Jellyfin::Support::fromJsonValue>(source["ImageFetchers"]); m_supportedImageTypes = Jellyfin::Support::fromJsonValue>(source["SupportedImageTypes"]); - m_defaultImageOptions = Jellyfin::Support::fromJsonValue>>(source["DefaultImageOptions"]); + m_defaultImageOptions = Jellyfin::Support::fromJsonValue>(source["DefaultImageOptions"]); } QJsonObject LibraryTypeOptionsDto::toJson() { QJsonObject result; result["Type"] = Jellyfin::Support::toJsonValue(m_type); - result["MetadataFetchers"] = Jellyfin::Support::toJsonValue>>(m_metadataFetchers); - result["ImageFetchers"] = Jellyfin::Support::toJsonValue>>(m_imageFetchers); + result["MetadataFetchers"] = Jellyfin::Support::toJsonValue>(m_metadataFetchers); + result["ImageFetchers"] = Jellyfin::Support::toJsonValue>(m_imageFetchers); result["SupportedImageTypes"] = Jellyfin::Support::toJsonValue>(m_supportedImageTypes); - result["DefaultImageOptions"] = Jellyfin::Support::toJsonValue>>(m_defaultImageOptions); + result["DefaultImageOptions"] = Jellyfin::Support::toJsonValue>(m_defaultImageOptions); return result; } @@ -91,9 +91,9 @@ void LibraryTypeOptionsDto::setTypeNull() { m_type.clear(); } -QList> LibraryTypeOptionsDto::metadataFetchers() const { return m_metadataFetchers; } +QList LibraryTypeOptionsDto::metadataFetchers() const { return m_metadataFetchers; } -void LibraryTypeOptionsDto::setMetadataFetchers(QList> newMetadataFetchers) { +void LibraryTypeOptionsDto::setMetadataFetchers(QList newMetadataFetchers) { m_metadataFetchers = newMetadataFetchers; } bool LibraryTypeOptionsDto::metadataFetchersNull() const { @@ -104,9 +104,9 @@ void LibraryTypeOptionsDto::setMetadataFetchersNull() { m_metadataFetchers.clear(); } -QList> LibraryTypeOptionsDto::imageFetchers() const { return m_imageFetchers; } +QList LibraryTypeOptionsDto::imageFetchers() const { return m_imageFetchers; } -void LibraryTypeOptionsDto::setImageFetchers(QList> newImageFetchers) { +void LibraryTypeOptionsDto::setImageFetchers(QList newImageFetchers) { m_imageFetchers = newImageFetchers; } bool LibraryTypeOptionsDto::imageFetchersNull() const { @@ -130,9 +130,9 @@ void LibraryTypeOptionsDto::setSupportedImageTypesNull() { m_supportedImageTypes.clear(); } -QList> LibraryTypeOptionsDto::defaultImageOptions() const { return m_defaultImageOptions; } +QList LibraryTypeOptionsDto::defaultImageOptions() const { return m_defaultImageOptions; } -void LibraryTypeOptionsDto::setDefaultImageOptions(QList> newDefaultImageOptions) { +void LibraryTypeOptionsDto::setDefaultImageOptions(QList newDefaultImageOptions) { m_defaultImageOptions = newDefaultImageOptions; } bool LibraryTypeOptionsDto::defaultImageOptionsNull() const { diff --git a/core/src/dto/listingsproviderinfo.cpp b/core/src/dto/listingsproviderinfo.cpp index 17b8656..de6dc30 100644 --- a/core/src/dto/listingsproviderinfo.cpp +++ b/core/src/dto/listingsproviderinfo.cpp @@ -99,7 +99,7 @@ void ListingsProviderInfo::setFromJson(QJsonObject source) { m_sportsCategories = Jellyfin::Support::fromJsonValue(source["SportsCategories"]); m_kidsCategories = Jellyfin::Support::fromJsonValue(source["KidsCategories"]); m_movieCategories = Jellyfin::Support::fromJsonValue(source["MovieCategories"]); - m_channelMappings = Jellyfin::Support::fromJsonValue>>(source["ChannelMappings"]); + m_channelMappings = Jellyfin::Support::fromJsonValue>(source["ChannelMappings"]); m_moviePrefix = Jellyfin::Support::fromJsonValue(source["MoviePrefix"]); m_preferredLanguage = Jellyfin::Support::fromJsonValue(source["PreferredLanguage"]); m_userAgent = Jellyfin::Support::fromJsonValue(source["UserAgent"]); @@ -122,7 +122,7 @@ QJsonObject ListingsProviderInfo::toJson() { result["SportsCategories"] = Jellyfin::Support::toJsonValue(m_sportsCategories); result["KidsCategories"] = Jellyfin::Support::toJsonValue(m_kidsCategories); result["MovieCategories"] = Jellyfin::Support::toJsonValue(m_movieCategories); - result["ChannelMappings"] = Jellyfin::Support::toJsonValue>>(m_channelMappings); + result["ChannelMappings"] = Jellyfin::Support::toJsonValue>(m_channelMappings); result["MoviePrefix"] = Jellyfin::Support::toJsonValue(m_moviePrefix); result["PreferredLanguage"] = Jellyfin::Support::toJsonValue(m_preferredLanguage); result["UserAgent"] = Jellyfin::Support::toJsonValue(m_userAgent); @@ -305,9 +305,9 @@ void ListingsProviderInfo::setMovieCategoriesNull() { m_movieCategories.clear(); } -QList> ListingsProviderInfo::channelMappings() const { return m_channelMappings; } +QList ListingsProviderInfo::channelMappings() const { return m_channelMappings; } -void ListingsProviderInfo::setChannelMappings(QList> newChannelMappings) { +void ListingsProviderInfo::setChannelMappings(QList newChannelMappings) { m_channelMappings = newChannelMappings; } bool ListingsProviderInfo::channelMappingsNull() const { diff --git a/core/src/dto/livetvinfo.cpp b/core/src/dto/livetvinfo.cpp index 69902dd..19611c1 100644 --- a/core/src/dto/livetvinfo.cpp +++ b/core/src/dto/livetvinfo.cpp @@ -55,7 +55,7 @@ LiveTvInfo LiveTvInfo::fromJson(QJsonObject source) { void LiveTvInfo::setFromJson(QJsonObject source) { - m_services = Jellyfin::Support::fromJsonValue>>(source["Services"]); + m_services = Jellyfin::Support::fromJsonValue>(source["Services"]); m_isEnabled = Jellyfin::Support::fromJsonValue(source["IsEnabled"]); m_enabledUsers = Jellyfin::Support::fromJsonValue(source["EnabledUsers"]); @@ -63,16 +63,16 @@ void LiveTvInfo::setFromJson(QJsonObject source) { QJsonObject LiveTvInfo::toJson() { QJsonObject result; - result["Services"] = Jellyfin::Support::toJsonValue>>(m_services); + result["Services"] = Jellyfin::Support::toJsonValue>(m_services); result["IsEnabled"] = Jellyfin::Support::toJsonValue(m_isEnabled); result["EnabledUsers"] = Jellyfin::Support::toJsonValue(m_enabledUsers); return result; } -QList> LiveTvInfo::services() const { return m_services; } +QList LiveTvInfo::services() const { return m_services; } -void LiveTvInfo::setServices(QList> newServices) { +void LiveTvInfo::setServices(QList newServices) { m_services = newServices; } bool LiveTvInfo::servicesNull() const { diff --git a/core/src/dto/mediasourceinfo.cpp b/core/src/dto/mediasourceinfo.cpp index 17ffd14..68791c0 100644 --- a/core/src/dto/mediasourceinfo.cpp +++ b/core/src/dto/mediasourceinfo.cpp @@ -163,8 +163,8 @@ void MediaSourceInfo::setFromJson(QJsonObject source) { m_videoType = Jellyfin::Support::fromJsonValue(source["VideoType"]); m_isoType = Jellyfin::Support::fromJsonValue(source["IsoType"]); m_video3DFormat = Jellyfin::Support::fromJsonValue(source["Video3DFormat"]); - m_mediaStreams = Jellyfin::Support::fromJsonValue>>(source["MediaStreams"]); - m_mediaAttachments = Jellyfin::Support::fromJsonValue>>(source["MediaAttachments"]); + m_mediaStreams = Jellyfin::Support::fromJsonValue>(source["MediaStreams"]); + m_mediaAttachments = Jellyfin::Support::fromJsonValue>(source["MediaAttachments"]); m_formats = Jellyfin::Support::fromJsonValue(source["Formats"]); m_bitrate = Jellyfin::Support::fromJsonValue>(source["Bitrate"]); m_timestamp = Jellyfin::Support::fromJsonValue(source["Timestamp"]); @@ -210,8 +210,8 @@ QJsonObject MediaSourceInfo::toJson() { result["VideoType"] = Jellyfin::Support::toJsonValue(m_videoType); result["IsoType"] = Jellyfin::Support::toJsonValue(m_isoType); result["Video3DFormat"] = Jellyfin::Support::toJsonValue(m_video3DFormat); - result["MediaStreams"] = Jellyfin::Support::toJsonValue>>(m_mediaStreams); - result["MediaAttachments"] = Jellyfin::Support::toJsonValue>>(m_mediaAttachments); + result["MediaStreams"] = Jellyfin::Support::toJsonValue>(m_mediaStreams); + result["MediaAttachments"] = Jellyfin::Support::toJsonValue>(m_mediaAttachments); result["Formats"] = Jellyfin::Support::toJsonValue(m_formats); result["Bitrate"] = Jellyfin::Support::toJsonValue>(m_bitrate); result["Timestamp"] = Jellyfin::Support::toJsonValue(m_timestamp); @@ -483,9 +483,9 @@ void MediaSourceInfo::setVideo3DFormat(Video3DFormat newVideo3DFormat) { m_video3DFormat = newVideo3DFormat; } -QList> MediaSourceInfo::mediaStreams() const { return m_mediaStreams; } +QList MediaSourceInfo::mediaStreams() const { return m_mediaStreams; } -void MediaSourceInfo::setMediaStreams(QList> newMediaStreams) { +void MediaSourceInfo::setMediaStreams(QList newMediaStreams) { m_mediaStreams = newMediaStreams; } bool MediaSourceInfo::mediaStreamsNull() const { @@ -496,9 +496,9 @@ void MediaSourceInfo::setMediaStreamsNull() { m_mediaStreams.clear(); } -QList> MediaSourceInfo::mediaAttachments() const { return m_mediaAttachments; } +QList MediaSourceInfo::mediaAttachments() const { return m_mediaAttachments; } -void MediaSourceInfo::setMediaAttachments(QList> newMediaAttachments) { +void MediaSourceInfo::setMediaAttachments(QList newMediaAttachments) { m_mediaAttachments = newMediaAttachments; } bool MediaSourceInfo::mediaAttachmentsNull() const { diff --git a/core/src/dto/metadataeditorinfo.cpp b/core/src/dto/metadataeditorinfo.cpp index 28093fb..c734b37 100644 --- a/core/src/dto/metadataeditorinfo.cpp +++ b/core/src/dto/metadataeditorinfo.cpp @@ -61,30 +61,30 @@ MetadataEditorInfo MetadataEditorInfo::fromJson(QJsonObject source) { void MetadataEditorInfo::setFromJson(QJsonObject source) { - m_parentalRatingOptions = Jellyfin::Support::fromJsonValue>>(source["ParentalRatingOptions"]); - m_countries = Jellyfin::Support::fromJsonValue>>(source["Countries"]); - m_cultures = Jellyfin::Support::fromJsonValue>>(source["Cultures"]); - m_externalIdInfos = Jellyfin::Support::fromJsonValue>>(source["ExternalIdInfos"]); + m_parentalRatingOptions = Jellyfin::Support::fromJsonValue>(source["ParentalRatingOptions"]); + m_countries = Jellyfin::Support::fromJsonValue>(source["Countries"]); + m_cultures = Jellyfin::Support::fromJsonValue>(source["Cultures"]); + m_externalIdInfos = Jellyfin::Support::fromJsonValue>(source["ExternalIdInfos"]); m_contentType = Jellyfin::Support::fromJsonValue(source["ContentType"]); - m_contentTypeOptions = Jellyfin::Support::fromJsonValue>>(source["ContentTypeOptions"]); + m_contentTypeOptions = Jellyfin::Support::fromJsonValue>(source["ContentTypeOptions"]); } QJsonObject MetadataEditorInfo::toJson() { QJsonObject result; - result["ParentalRatingOptions"] = Jellyfin::Support::toJsonValue>>(m_parentalRatingOptions); - result["Countries"] = Jellyfin::Support::toJsonValue>>(m_countries); - result["Cultures"] = Jellyfin::Support::toJsonValue>>(m_cultures); - result["ExternalIdInfos"] = Jellyfin::Support::toJsonValue>>(m_externalIdInfos); + result["ParentalRatingOptions"] = Jellyfin::Support::toJsonValue>(m_parentalRatingOptions); + result["Countries"] = Jellyfin::Support::toJsonValue>(m_countries); + result["Cultures"] = Jellyfin::Support::toJsonValue>(m_cultures); + result["ExternalIdInfos"] = Jellyfin::Support::toJsonValue>(m_externalIdInfos); result["ContentType"] = Jellyfin::Support::toJsonValue(m_contentType); - result["ContentTypeOptions"] = Jellyfin::Support::toJsonValue>>(m_contentTypeOptions); + result["ContentTypeOptions"] = Jellyfin::Support::toJsonValue>(m_contentTypeOptions); return result; } -QList> MetadataEditorInfo::parentalRatingOptions() const { return m_parentalRatingOptions; } +QList MetadataEditorInfo::parentalRatingOptions() const { return m_parentalRatingOptions; } -void MetadataEditorInfo::setParentalRatingOptions(QList> newParentalRatingOptions) { +void MetadataEditorInfo::setParentalRatingOptions(QList newParentalRatingOptions) { m_parentalRatingOptions = newParentalRatingOptions; } bool MetadataEditorInfo::parentalRatingOptionsNull() const { @@ -95,9 +95,9 @@ void MetadataEditorInfo::setParentalRatingOptionsNull() { m_parentalRatingOptions.clear(); } -QList> MetadataEditorInfo::countries() const { return m_countries; } +QList MetadataEditorInfo::countries() const { return m_countries; } -void MetadataEditorInfo::setCountries(QList> newCountries) { +void MetadataEditorInfo::setCountries(QList newCountries) { m_countries = newCountries; } bool MetadataEditorInfo::countriesNull() const { @@ -108,9 +108,9 @@ void MetadataEditorInfo::setCountriesNull() { m_countries.clear(); } -QList> MetadataEditorInfo::cultures() const { return m_cultures; } +QList MetadataEditorInfo::cultures() const { return m_cultures; } -void MetadataEditorInfo::setCultures(QList> newCultures) { +void MetadataEditorInfo::setCultures(QList newCultures) { m_cultures = newCultures; } bool MetadataEditorInfo::culturesNull() const { @@ -121,9 +121,9 @@ void MetadataEditorInfo::setCulturesNull() { m_cultures.clear(); } -QList> MetadataEditorInfo::externalIdInfos() const { return m_externalIdInfos; } +QList MetadataEditorInfo::externalIdInfos() const { return m_externalIdInfos; } -void MetadataEditorInfo::setExternalIdInfos(QList> newExternalIdInfos) { +void MetadataEditorInfo::setExternalIdInfos(QList newExternalIdInfos) { m_externalIdInfos = newExternalIdInfos; } bool MetadataEditorInfo::externalIdInfosNull() const { @@ -147,9 +147,9 @@ void MetadataEditorInfo::setContentTypeNull() { m_contentType.clear(); } -QList> MetadataEditorInfo::contentTypeOptions() const { return m_contentTypeOptions; } +QList MetadataEditorInfo::contentTypeOptions() const { return m_contentTypeOptions; } -void MetadataEditorInfo::setContentTypeOptions(QList> newContentTypeOptions) { +void MetadataEditorInfo::setContentTypeOptions(QList newContentTypeOptions) { m_contentTypeOptions = newContentTypeOptions; } bool MetadataEditorInfo::contentTypeOptionsNull() const { diff --git a/core/src/dto/notificationresultdto.cpp b/core/src/dto/notificationresultdto.cpp index 16221a8..39b53f4 100644 --- a/core/src/dto/notificationresultdto.cpp +++ b/core/src/dto/notificationresultdto.cpp @@ -53,22 +53,22 @@ NotificationResultDto NotificationResultDto::fromJson(QJsonObject source) { void NotificationResultDto::setFromJson(QJsonObject source) { - m_notifications = Jellyfin::Support::fromJsonValue>>(source["Notifications"]); + m_notifications = Jellyfin::Support::fromJsonValue>(source["Notifications"]); m_totalRecordCount = Jellyfin::Support::fromJsonValue(source["TotalRecordCount"]); } QJsonObject NotificationResultDto::toJson() { QJsonObject result; - result["Notifications"] = Jellyfin::Support::toJsonValue>>(m_notifications); + result["Notifications"] = Jellyfin::Support::toJsonValue>(m_notifications); result["TotalRecordCount"] = Jellyfin::Support::toJsonValue(m_totalRecordCount); return result; } -QList> NotificationResultDto::notifications() const { return m_notifications; } +QList NotificationResultDto::notifications() const { return m_notifications; } -void NotificationResultDto::setNotifications(QList> newNotifications) { +void NotificationResultDto::setNotifications(QList newNotifications) { m_notifications = newNotifications; } bool NotificationResultDto::notificationsNull() const { diff --git a/core/src/dto/packageinfo.cpp b/core/src/dto/packageinfo.cpp index 2e7ce1d..cd16b77 100644 --- a/core/src/dto/packageinfo.cpp +++ b/core/src/dto/packageinfo.cpp @@ -71,7 +71,7 @@ void PackageInfo::setFromJson(QJsonObject source) { m_owner = Jellyfin::Support::fromJsonValue(source["owner"]); m_category = Jellyfin::Support::fromJsonValue(source["category"]); m_guid = Jellyfin::Support::fromJsonValue(source["guid"]); - m_versions = Jellyfin::Support::fromJsonValue>>(source["versions"]); + m_versions = Jellyfin::Support::fromJsonValue>(source["versions"]); m_imageUrl = Jellyfin::Support::fromJsonValue(source["imageUrl"]); } @@ -84,7 +84,7 @@ QJsonObject PackageInfo::toJson() { result["owner"] = Jellyfin::Support::toJsonValue(m_owner); result["category"] = Jellyfin::Support::toJsonValue(m_category); result["guid"] = Jellyfin::Support::toJsonValue(m_guid); - result["versions"] = Jellyfin::Support::toJsonValue>>(m_versions); + result["versions"] = Jellyfin::Support::toJsonValue>(m_versions); result["imageUrl"] = Jellyfin::Support::toJsonValue(m_imageUrl); return result; @@ -168,9 +168,9 @@ void PackageInfo::setGuidNull() { m_guid.clear(); } -QList> PackageInfo::versions() const { return m_versions; } +QList PackageInfo::versions() const { return m_versions; } -void PackageInfo::setVersions(QList> newVersions) { +void PackageInfo::setVersions(QList newVersions) { m_versions = newVersions; } bool PackageInfo::versionsNull() const { diff --git a/core/src/dto/playbackinforesponse.cpp b/core/src/dto/playbackinforesponse.cpp index 4d1d81b..0a57b78 100644 --- a/core/src/dto/playbackinforesponse.cpp +++ b/core/src/dto/playbackinforesponse.cpp @@ -55,7 +55,7 @@ PlaybackInfoResponse PlaybackInfoResponse::fromJson(QJsonObject source) { void PlaybackInfoResponse::setFromJson(QJsonObject source) { - m_mediaSources = Jellyfin::Support::fromJsonValue>>(source["MediaSources"]); + m_mediaSources = Jellyfin::Support::fromJsonValue>(source["MediaSources"]); m_playSessionId = Jellyfin::Support::fromJsonValue(source["PlaySessionId"]); m_errorCode = Jellyfin::Support::fromJsonValue(source["ErrorCode"]); @@ -63,16 +63,16 @@ void PlaybackInfoResponse::setFromJson(QJsonObject source) { QJsonObject PlaybackInfoResponse::toJson() { QJsonObject result; - result["MediaSources"] = Jellyfin::Support::toJsonValue>>(m_mediaSources); + result["MediaSources"] = Jellyfin::Support::toJsonValue>(m_mediaSources); result["PlaySessionId"] = Jellyfin::Support::toJsonValue(m_playSessionId); result["ErrorCode"] = Jellyfin::Support::toJsonValue(m_errorCode); return result; } -QList> PlaybackInfoResponse::mediaSources() const { return m_mediaSources; } +QList PlaybackInfoResponse::mediaSources() const { return m_mediaSources; } -void PlaybackInfoResponse::setMediaSources(QList> newMediaSources) { +void PlaybackInfoResponse::setMediaSources(QList newMediaSources) { m_mediaSources = newMediaSources; } bool PlaybackInfoResponse::mediaSourcesNull() const { diff --git a/core/src/dto/playbackprogressinfo.cpp b/core/src/dto/playbackprogressinfo.cpp index d1f460d..0f9548e 100644 --- a/core/src/dto/playbackprogressinfo.cpp +++ b/core/src/dto/playbackprogressinfo.cpp @@ -107,7 +107,7 @@ void PlaybackProgressInfo::setFromJson(QJsonObject source) { m_liveStreamId = Jellyfin::Support::fromJsonValue(source["LiveStreamId"]); m_playSessionId = Jellyfin::Support::fromJsonValue(source["PlaySessionId"]); m_repeatMode = Jellyfin::Support::fromJsonValue(source["RepeatMode"]); - m_nowPlayingQueue = Jellyfin::Support::fromJsonValue>>(source["NowPlayingQueue"]); + m_nowPlayingQueue = Jellyfin::Support::fromJsonValue>(source["NowPlayingQueue"]); m_playlistItemId = Jellyfin::Support::fromJsonValue(source["PlaylistItemId"]); } @@ -132,7 +132,7 @@ QJsonObject PlaybackProgressInfo::toJson() { result["LiveStreamId"] = Jellyfin::Support::toJsonValue(m_liveStreamId); result["PlaySessionId"] = Jellyfin::Support::toJsonValue(m_playSessionId); result["RepeatMode"] = Jellyfin::Support::toJsonValue(m_repeatMode); - result["NowPlayingQueue"] = Jellyfin::Support::toJsonValue>>(m_nowPlayingQueue); + result["NowPlayingQueue"] = Jellyfin::Support::toJsonValue>(m_nowPlayingQueue); result["PlaylistItemId"] = Jellyfin::Support::toJsonValue(m_playlistItemId); return result; @@ -323,9 +323,9 @@ void PlaybackProgressInfo::setRepeatMode(RepeatMode newRepeatMode) { m_repeatMode = newRepeatMode; } -QList> PlaybackProgressInfo::nowPlayingQueue() const { return m_nowPlayingQueue; } +QList PlaybackProgressInfo::nowPlayingQueue() const { return m_nowPlayingQueue; } -void PlaybackProgressInfo::setNowPlayingQueue(QList> newNowPlayingQueue) { +void PlaybackProgressInfo::setNowPlayingQueue(QList newNowPlayingQueue) { m_nowPlayingQueue = newNowPlayingQueue; } bool PlaybackProgressInfo::nowPlayingQueueNull() const { diff --git a/core/src/dto/playbackstartinfo.cpp b/core/src/dto/playbackstartinfo.cpp index 6330889..d56525d 100644 --- a/core/src/dto/playbackstartinfo.cpp +++ b/core/src/dto/playbackstartinfo.cpp @@ -107,7 +107,7 @@ void PlaybackStartInfo::setFromJson(QJsonObject source) { m_liveStreamId = Jellyfin::Support::fromJsonValue(source["LiveStreamId"]); m_playSessionId = Jellyfin::Support::fromJsonValue(source["PlaySessionId"]); m_repeatMode = Jellyfin::Support::fromJsonValue(source["RepeatMode"]); - m_nowPlayingQueue = Jellyfin::Support::fromJsonValue>>(source["NowPlayingQueue"]); + m_nowPlayingQueue = Jellyfin::Support::fromJsonValue>(source["NowPlayingQueue"]); m_playlistItemId = Jellyfin::Support::fromJsonValue(source["PlaylistItemId"]); } @@ -132,7 +132,7 @@ QJsonObject PlaybackStartInfo::toJson() { result["LiveStreamId"] = Jellyfin::Support::toJsonValue(m_liveStreamId); result["PlaySessionId"] = Jellyfin::Support::toJsonValue(m_playSessionId); result["RepeatMode"] = Jellyfin::Support::toJsonValue(m_repeatMode); - result["NowPlayingQueue"] = Jellyfin::Support::toJsonValue>>(m_nowPlayingQueue); + result["NowPlayingQueue"] = Jellyfin::Support::toJsonValue>(m_nowPlayingQueue); result["PlaylistItemId"] = Jellyfin::Support::toJsonValue(m_playlistItemId); return result; @@ -323,9 +323,9 @@ void PlaybackStartInfo::setRepeatMode(RepeatMode newRepeatMode) { m_repeatMode = newRepeatMode; } -QList> PlaybackStartInfo::nowPlayingQueue() const { return m_nowPlayingQueue; } +QList PlaybackStartInfo::nowPlayingQueue() const { return m_nowPlayingQueue; } -void PlaybackStartInfo::setNowPlayingQueue(QList> newNowPlayingQueue) { +void PlaybackStartInfo::setNowPlayingQueue(QList newNowPlayingQueue) { m_nowPlayingQueue = newNowPlayingQueue; } bool PlaybackStartInfo::nowPlayingQueueNull() const { diff --git a/core/src/dto/playbackstopinfo.cpp b/core/src/dto/playbackstopinfo.cpp index 755197f..c403900 100644 --- a/core/src/dto/playbackstopinfo.cpp +++ b/core/src/dto/playbackstopinfo.cpp @@ -81,7 +81,7 @@ void PlaybackStopInfo::setFromJson(QJsonObject source) { m_failed = Jellyfin::Support::fromJsonValue(source["Failed"]); m_nextMediaType = Jellyfin::Support::fromJsonValue(source["NextMediaType"]); m_playlistItemId = Jellyfin::Support::fromJsonValue(source["PlaylistItemId"]); - m_nowPlayingQueue = Jellyfin::Support::fromJsonValue>>(source["NowPlayingQueue"]); + m_nowPlayingQueue = Jellyfin::Support::fromJsonValue>(source["NowPlayingQueue"]); } @@ -97,7 +97,7 @@ QJsonObject PlaybackStopInfo::toJson() { result["Failed"] = Jellyfin::Support::toJsonValue(m_failed); result["NextMediaType"] = Jellyfin::Support::toJsonValue(m_nextMediaType); result["PlaylistItemId"] = Jellyfin::Support::toJsonValue(m_playlistItemId); - result["NowPlayingQueue"] = Jellyfin::Support::toJsonValue>>(m_nowPlayingQueue); + result["NowPlayingQueue"] = Jellyfin::Support::toJsonValue>(m_nowPlayingQueue); return result; } @@ -211,9 +211,9 @@ void PlaybackStopInfo::setPlaylistItemIdNull() { m_playlistItemId.clear(); } -QList> PlaybackStopInfo::nowPlayingQueue() const { return m_nowPlayingQueue; } +QList PlaybackStopInfo::nowPlayingQueue() const { return m_nowPlayingQueue; } -void PlaybackStopInfo::setNowPlayingQueue(QList> newNowPlayingQueue) { +void PlaybackStopInfo::setNowPlayingQueue(QList newNowPlayingQueue) { m_nowPlayingQueue = newNowPlayingQueue; } bool PlaybackStopInfo::nowPlayingQueueNull() const { diff --git a/core/src/dto/queryfilters.cpp b/core/src/dto/queryfilters.cpp index 4a7a786..1739903 100644 --- a/core/src/dto/queryfilters.cpp +++ b/core/src/dto/queryfilters.cpp @@ -53,22 +53,22 @@ QueryFilters QueryFilters::fromJson(QJsonObject source) { void QueryFilters::setFromJson(QJsonObject source) { - m_genres = Jellyfin::Support::fromJsonValue>>(source["Genres"]); + m_genres = Jellyfin::Support::fromJsonValue>(source["Genres"]); m_tags = Jellyfin::Support::fromJsonValue(source["Tags"]); } QJsonObject QueryFilters::toJson() { QJsonObject result; - result["Genres"] = Jellyfin::Support::toJsonValue>>(m_genres); + result["Genres"] = Jellyfin::Support::toJsonValue>(m_genres); result["Tags"] = Jellyfin::Support::toJsonValue(m_tags); return result; } -QList> QueryFilters::genres() const { return m_genres; } +QList QueryFilters::genres() const { return m_genres; } -void QueryFilters::setGenres(QList> newGenres) { +void QueryFilters::setGenres(QList newGenres) { m_genres = newGenres; } bool QueryFilters::genresNull() const { diff --git a/core/src/dto/recommendationdto.cpp b/core/src/dto/recommendationdto.cpp index dafab5a..6ff5c2f 100644 --- a/core/src/dto/recommendationdto.cpp +++ b/core/src/dto/recommendationdto.cpp @@ -57,7 +57,7 @@ RecommendationDto RecommendationDto::fromJson(QJsonObject source) { void RecommendationDto::setFromJson(QJsonObject source) { - m_items = Jellyfin::Support::fromJsonValue>>(source["Items"]); + m_items = Jellyfin::Support::fromJsonValue>(source["Items"]); m_recommendationType = Jellyfin::Support::fromJsonValue(source["RecommendationType"]); m_baselineItemName = Jellyfin::Support::fromJsonValue(source["BaselineItemName"]); m_categoryId = Jellyfin::Support::fromJsonValue(source["CategoryId"]); @@ -66,7 +66,7 @@ void RecommendationDto::setFromJson(QJsonObject source) { QJsonObject RecommendationDto::toJson() { QJsonObject result; - result["Items"] = Jellyfin::Support::toJsonValue>>(m_items); + result["Items"] = Jellyfin::Support::toJsonValue>(m_items); result["RecommendationType"] = Jellyfin::Support::toJsonValue(m_recommendationType); result["BaselineItemName"] = Jellyfin::Support::toJsonValue(m_baselineItemName); result["CategoryId"] = Jellyfin::Support::toJsonValue(m_categoryId); @@ -74,9 +74,9 @@ QJsonObject RecommendationDto::toJson() { return result; } -QList> RecommendationDto::items() const { return m_items; } +QList RecommendationDto::items() const { return m_items; } -void RecommendationDto::setItems(QList> newItems) { +void RecommendationDto::setItems(QList newItems) { m_items = newItems; } bool RecommendationDto::itemsNull() const { diff --git a/core/src/dto/remoteimageresult.cpp b/core/src/dto/remoteimageresult.cpp index fa48f03..2fe5d5b 100644 --- a/core/src/dto/remoteimageresult.cpp +++ b/core/src/dto/remoteimageresult.cpp @@ -55,7 +55,7 @@ RemoteImageResult RemoteImageResult::fromJson(QJsonObject source) { void RemoteImageResult::setFromJson(QJsonObject source) { - m_images = Jellyfin::Support::fromJsonValue>>(source["Images"]); + m_images = Jellyfin::Support::fromJsonValue>(source["Images"]); m_totalRecordCount = Jellyfin::Support::fromJsonValue(source["TotalRecordCount"]); m_providers = Jellyfin::Support::fromJsonValue(source["Providers"]); @@ -63,16 +63,16 @@ void RemoteImageResult::setFromJson(QJsonObject source) { QJsonObject RemoteImageResult::toJson() { QJsonObject result; - result["Images"] = Jellyfin::Support::toJsonValue>>(m_images); + result["Images"] = Jellyfin::Support::toJsonValue>(m_images); result["TotalRecordCount"] = Jellyfin::Support::toJsonValue(m_totalRecordCount); result["Providers"] = Jellyfin::Support::toJsonValue(m_providers); return result; } -QList> RemoteImageResult::images() const { return m_images; } +QList RemoteImageResult::images() const { return m_images; } -void RemoteImageResult::setImages(QList> newImages) { +void RemoteImageResult::setImages(QList newImages) { m_images = newImages; } bool RemoteImageResult::imagesNull() const { diff --git a/core/src/dto/remotesearchresult.cpp b/core/src/dto/remotesearchresult.cpp index 35492ea..a5b6059 100644 --- a/core/src/dto/remotesearchresult.cpp +++ b/core/src/dto/remotesearchresult.cpp @@ -84,7 +84,7 @@ void RemoteSearchResult::setFromJson(QJsonObject source) { m_searchProviderName = Jellyfin::Support::fromJsonValue(source["SearchProviderName"]); m_overview = Jellyfin::Support::fromJsonValue(source["Overview"]); m_albumArtist = Jellyfin::Support::fromJsonValue>(source["AlbumArtist"]); - m_artists = Jellyfin::Support::fromJsonValue>>(source["Artists"]); + m_artists = Jellyfin::Support::fromJsonValue>(source["Artists"]); } @@ -101,7 +101,7 @@ QJsonObject RemoteSearchResult::toJson() { result["SearchProviderName"] = Jellyfin::Support::toJsonValue(m_searchProviderName); result["Overview"] = Jellyfin::Support::toJsonValue(m_overview); result["AlbumArtist"] = Jellyfin::Support::toJsonValue>(m_albumArtist); - result["Artists"] = Jellyfin::Support::toJsonValue>>(m_artists); + result["Artists"] = Jellyfin::Support::toJsonValue>(m_artists); return result; } @@ -242,9 +242,9 @@ void RemoteSearchResult::setAlbumArtist(QSharedPointer newAl m_albumArtist = newAlbumArtist; } -QList> RemoteSearchResult::artists() const { return m_artists; } +QList RemoteSearchResult::artists() const { return m_artists; } -void RemoteSearchResult::setArtists(QList> newArtists) { +void RemoteSearchResult::setArtists(QList newArtists) { m_artists = newArtists; } bool RemoteSearchResult::artistsNull() const { diff --git a/core/src/dto/responseprofile.cpp b/core/src/dto/responseprofile.cpp index 25d935f..339b12b 100644 --- a/core/src/dto/responseprofile.cpp +++ b/core/src/dto/responseprofile.cpp @@ -69,7 +69,7 @@ void ResponseProfile::setFromJson(QJsonObject source) { m_type = Jellyfin::Support::fromJsonValue(source["Type"]); m_orgPn = Jellyfin::Support::fromJsonValue(source["OrgPn"]); m_mimeType = Jellyfin::Support::fromJsonValue(source["MimeType"]); - m_conditions = Jellyfin::Support::fromJsonValue>>(source["Conditions"]); + m_conditions = Jellyfin::Support::fromJsonValue>(source["Conditions"]); } @@ -81,7 +81,7 @@ QJsonObject ResponseProfile::toJson() { result["Type"] = Jellyfin::Support::toJsonValue(m_type); result["OrgPn"] = Jellyfin::Support::toJsonValue(m_orgPn); result["MimeType"] = Jellyfin::Support::toJsonValue(m_mimeType); - result["Conditions"] = Jellyfin::Support::toJsonValue>>(m_conditions); + result["Conditions"] = Jellyfin::Support::toJsonValue>(m_conditions); return result; } @@ -157,9 +157,9 @@ void ResponseProfile::setMimeTypeNull() { m_mimeType.clear(); } -QList> ResponseProfile::conditions() const { return m_conditions; } +QList ResponseProfile::conditions() const { return m_conditions; } -void ResponseProfile::setConditions(QList> newConditions) { +void ResponseProfile::setConditions(QList newConditions) { m_conditions = newConditions; } bool ResponseProfile::conditionsNull() const { diff --git a/core/src/dto/searchhintresult.cpp b/core/src/dto/searchhintresult.cpp index 08ce185..13b8de3 100644 --- a/core/src/dto/searchhintresult.cpp +++ b/core/src/dto/searchhintresult.cpp @@ -53,22 +53,22 @@ SearchHintResult SearchHintResult::fromJson(QJsonObject source) { void SearchHintResult::setFromJson(QJsonObject source) { - m_searchHints = Jellyfin::Support::fromJsonValue>>(source["SearchHints"]); + m_searchHints = Jellyfin::Support::fromJsonValue>(source["SearchHints"]); m_totalRecordCount = Jellyfin::Support::fromJsonValue(source["TotalRecordCount"]); } QJsonObject SearchHintResult::toJson() { QJsonObject result; - result["SearchHints"] = Jellyfin::Support::toJsonValue>>(m_searchHints); + result["SearchHints"] = Jellyfin::Support::toJsonValue>(m_searchHints); result["TotalRecordCount"] = Jellyfin::Support::toJsonValue(m_totalRecordCount); return result; } -QList> SearchHintResult::searchHints() const { return m_searchHints; } +QList SearchHintResult::searchHints() const { return m_searchHints; } -void SearchHintResult::setSearchHints(QList> newSearchHints) { +void SearchHintResult::setSearchHints(QList newSearchHints) { m_searchHints = newSearchHints; } bool SearchHintResult::searchHintsNull() const { diff --git a/core/src/dto/seriestimerinfodtoqueryresult.cpp b/core/src/dto/seriestimerinfodtoqueryresult.cpp index 6bed6e0..7d78453 100644 --- a/core/src/dto/seriestimerinfodtoqueryresult.cpp +++ b/core/src/dto/seriestimerinfodtoqueryresult.cpp @@ -55,7 +55,7 @@ SeriesTimerInfoDtoQueryResult SeriesTimerInfoDtoQueryResult::fromJson(QJsonObjec void SeriesTimerInfoDtoQueryResult::setFromJson(QJsonObject source) { - m_items = Jellyfin::Support::fromJsonValue>>(source["Items"]); + m_items = Jellyfin::Support::fromJsonValue>(source["Items"]); m_totalRecordCount = Jellyfin::Support::fromJsonValue(source["TotalRecordCount"]); m_startIndex = Jellyfin::Support::fromJsonValue(source["StartIndex"]); @@ -63,16 +63,16 @@ void SeriesTimerInfoDtoQueryResult::setFromJson(QJsonObject source) { QJsonObject SeriesTimerInfoDtoQueryResult::toJson() { QJsonObject result; - result["Items"] = Jellyfin::Support::toJsonValue>>(m_items); + result["Items"] = Jellyfin::Support::toJsonValue>(m_items); result["TotalRecordCount"] = Jellyfin::Support::toJsonValue(m_totalRecordCount); result["StartIndex"] = Jellyfin::Support::toJsonValue(m_startIndex); return result; } -QList> SeriesTimerInfoDtoQueryResult::items() const { return m_items; } +QList SeriesTimerInfoDtoQueryResult::items() const { return m_items; } -void SeriesTimerInfoDtoQueryResult::setItems(QList> newItems) { +void SeriesTimerInfoDtoQueryResult::setItems(QList newItems) { m_items = newItems; } bool SeriesTimerInfoDtoQueryResult::itemsNull() const { diff --git a/core/src/dto/serverconfiguration.cpp b/core/src/dto/serverconfiguration.cpp index 604b3ad..6a25443 100644 --- a/core/src/dto/serverconfiguration.cpp +++ b/core/src/dto/serverconfiguration.cpp @@ -271,13 +271,13 @@ void ServerConfiguration::setFromJson(QJsonObject source) { m_libraryMonitorDelay = Jellyfin::Support::fromJsonValue(source["LibraryMonitorDelay"]); m_enableDashboardResponseCaching = Jellyfin::Support::fromJsonValue(source["EnableDashboardResponseCaching"]); m_imageSavingConvention = Jellyfin::Support::fromJsonValue(source["ImageSavingConvention"]); - m_metadataOptions = Jellyfin::Support::fromJsonValue>>(source["MetadataOptions"]); + m_metadataOptions = Jellyfin::Support::fromJsonValue>(source["MetadataOptions"]); m_skipDeserializationForBasicTypes = Jellyfin::Support::fromJsonValue(source["SkipDeserializationForBasicTypes"]); m_serverName = Jellyfin::Support::fromJsonValue(source["ServerName"]); m_baseUrl = Jellyfin::Support::fromJsonValue(source["BaseUrl"]); m_uICulture = Jellyfin::Support::fromJsonValue(source["UICulture"]); m_saveMetadataHidden = Jellyfin::Support::fromJsonValue(source["SaveMetadataHidden"]); - m_contentTypes = Jellyfin::Support::fromJsonValue>>(source["ContentTypes"]); + m_contentTypes = Jellyfin::Support::fromJsonValue>(source["ContentTypes"]); m_remoteClientBitrateLimit = Jellyfin::Support::fromJsonValue(source["RemoteClientBitrateLimit"]); m_enableFolderView = Jellyfin::Support::fromJsonValue(source["EnableFolderView"]); m_enableGroupingIntoCollections = Jellyfin::Support::fromJsonValue(source["EnableGroupingIntoCollections"]); @@ -285,14 +285,14 @@ void ServerConfiguration::setFromJson(QJsonObject source) { m_localNetworkSubnets = Jellyfin::Support::fromJsonValue(source["LocalNetworkSubnets"]); m_localNetworkAddresses = Jellyfin::Support::fromJsonValue(source["LocalNetworkAddresses"]); m_codecsUsed = Jellyfin::Support::fromJsonValue(source["CodecsUsed"]); - m_pluginRepositories = Jellyfin::Support::fromJsonValue>>(source["PluginRepositories"]); + m_pluginRepositories = Jellyfin::Support::fromJsonValue>(source["PluginRepositories"]); m_enableExternalContentInSuggestions = Jellyfin::Support::fromJsonValue(source["EnableExternalContentInSuggestions"]); m_requireHttps = Jellyfin::Support::fromJsonValue(source["RequireHttps"]); m_enableNewOmdbSupport = Jellyfin::Support::fromJsonValue(source["EnableNewOmdbSupport"]); m_remoteIPFilter = Jellyfin::Support::fromJsonValue(source["RemoteIPFilter"]); m_isRemoteIPFilterBlacklist = Jellyfin::Support::fromJsonValue(source["IsRemoteIPFilterBlacklist"]); m_imageExtractionTimeoutMs = Jellyfin::Support::fromJsonValue(source["ImageExtractionTimeoutMs"]); - m_pathSubstitutions = Jellyfin::Support::fromJsonValue>>(source["PathSubstitutions"]); + m_pathSubstitutions = Jellyfin::Support::fromJsonValue>(source["PathSubstitutions"]); m_enableSimpleArtistDetection = Jellyfin::Support::fromJsonValue(source["EnableSimpleArtistDetection"]); m_uninstalledPlugins = Jellyfin::Support::fromJsonValue(source["UninstalledPlugins"]); m_enableSlowResponseWarning = Jellyfin::Support::fromJsonValue(source["EnableSlowResponseWarning"]); @@ -361,13 +361,13 @@ QJsonObject ServerConfiguration::toJson() { result["LibraryMonitorDelay"] = Jellyfin::Support::toJsonValue(m_libraryMonitorDelay); result["EnableDashboardResponseCaching"] = Jellyfin::Support::toJsonValue(m_enableDashboardResponseCaching); result["ImageSavingConvention"] = Jellyfin::Support::toJsonValue(m_imageSavingConvention); - result["MetadataOptions"] = Jellyfin::Support::toJsonValue>>(m_metadataOptions); + result["MetadataOptions"] = Jellyfin::Support::toJsonValue>(m_metadataOptions); result["SkipDeserializationForBasicTypes"] = Jellyfin::Support::toJsonValue(m_skipDeserializationForBasicTypes); result["ServerName"] = Jellyfin::Support::toJsonValue(m_serverName); result["BaseUrl"] = Jellyfin::Support::toJsonValue(m_baseUrl); result["UICulture"] = Jellyfin::Support::toJsonValue(m_uICulture); result["SaveMetadataHidden"] = Jellyfin::Support::toJsonValue(m_saveMetadataHidden); - result["ContentTypes"] = Jellyfin::Support::toJsonValue>>(m_contentTypes); + result["ContentTypes"] = Jellyfin::Support::toJsonValue>(m_contentTypes); result["RemoteClientBitrateLimit"] = Jellyfin::Support::toJsonValue(m_remoteClientBitrateLimit); result["EnableFolderView"] = Jellyfin::Support::toJsonValue(m_enableFolderView); result["EnableGroupingIntoCollections"] = Jellyfin::Support::toJsonValue(m_enableGroupingIntoCollections); @@ -375,14 +375,14 @@ QJsonObject ServerConfiguration::toJson() { result["LocalNetworkSubnets"] = Jellyfin::Support::toJsonValue(m_localNetworkSubnets); result["LocalNetworkAddresses"] = Jellyfin::Support::toJsonValue(m_localNetworkAddresses); result["CodecsUsed"] = Jellyfin::Support::toJsonValue(m_codecsUsed); - result["PluginRepositories"] = Jellyfin::Support::toJsonValue>>(m_pluginRepositories); + result["PluginRepositories"] = Jellyfin::Support::toJsonValue>(m_pluginRepositories); result["EnableExternalContentInSuggestions"] = Jellyfin::Support::toJsonValue(m_enableExternalContentInSuggestions); result["RequireHttps"] = Jellyfin::Support::toJsonValue(m_requireHttps); result["EnableNewOmdbSupport"] = Jellyfin::Support::toJsonValue(m_enableNewOmdbSupport); result["RemoteIPFilter"] = Jellyfin::Support::toJsonValue(m_remoteIPFilter); result["IsRemoteIPFilterBlacklist"] = Jellyfin::Support::toJsonValue(m_isRemoteIPFilterBlacklist); result["ImageExtractionTimeoutMs"] = Jellyfin::Support::toJsonValue(m_imageExtractionTimeoutMs); - result["PathSubstitutions"] = Jellyfin::Support::toJsonValue>>(m_pathSubstitutions); + result["PathSubstitutions"] = Jellyfin::Support::toJsonValue>(m_pathSubstitutions); result["EnableSimpleArtistDetection"] = Jellyfin::Support::toJsonValue(m_enableSimpleArtistDetection); result["UninstalledPlugins"] = Jellyfin::Support::toJsonValue(m_uninstalledPlugins); result["EnableSlowResponseWarning"] = Jellyfin::Support::toJsonValue(m_enableSlowResponseWarning); @@ -822,9 +822,9 @@ void ServerConfiguration::setImageSavingConvention(ImageSavingConvention newImag m_imageSavingConvention = newImageSavingConvention; } -QList> ServerConfiguration::metadataOptions() const { return m_metadataOptions; } +QList ServerConfiguration::metadataOptions() const { return m_metadataOptions; } -void ServerConfiguration::setMetadataOptions(QList> newMetadataOptions) { +void ServerConfiguration::setMetadataOptions(QList newMetadataOptions) { m_metadataOptions = newMetadataOptions; } bool ServerConfiguration::metadataOptionsNull() const { @@ -886,9 +886,9 @@ void ServerConfiguration::setSaveMetadataHidden(bool newSaveMetadataHidden) { m_saveMetadataHidden = newSaveMetadataHidden; } -QList> ServerConfiguration::contentTypes() const { return m_contentTypes; } +QList ServerConfiguration::contentTypes() const { return m_contentTypes; } -void ServerConfiguration::setContentTypes(QList> newContentTypes) { +void ServerConfiguration::setContentTypes(QList newContentTypes) { m_contentTypes = newContentTypes; } bool ServerConfiguration::contentTypesNull() const { @@ -962,9 +962,9 @@ void ServerConfiguration::setCodecsUsedNull() { m_codecsUsed.clear(); } -QList> ServerConfiguration::pluginRepositories() const { return m_pluginRepositories; } +QList ServerConfiguration::pluginRepositories() const { return m_pluginRepositories; } -void ServerConfiguration::setPluginRepositories(QList> newPluginRepositories) { +void ServerConfiguration::setPluginRepositories(QList newPluginRepositories) { m_pluginRepositories = newPluginRepositories; } bool ServerConfiguration::pluginRepositoriesNull() const { @@ -1018,9 +1018,9 @@ void ServerConfiguration::setImageExtractionTimeoutMs(qint32 newImageExtractionT m_imageExtractionTimeoutMs = newImageExtractionTimeoutMs; } -QList> ServerConfiguration::pathSubstitutions() const { return m_pathSubstitutions; } +QList ServerConfiguration::pathSubstitutions() const { return m_pathSubstitutions; } -void ServerConfiguration::setPathSubstitutions(QList> newPathSubstitutions) { +void ServerConfiguration::setPathSubstitutions(QList newPathSubstitutions) { m_pathSubstitutions = newPathSubstitutions; } bool ServerConfiguration::pathSubstitutionsNull() const { diff --git a/core/src/dto/sessioninfo.cpp b/core/src/dto/sessioninfo.cpp index cd10405..03bfc03 100644 --- a/core/src/dto/sessioninfo.cpp +++ b/core/src/dto/sessioninfo.cpp @@ -106,7 +106,7 @@ SessionInfo SessionInfo::fromJson(QJsonObject source) { void SessionInfo::setFromJson(QJsonObject source) { m_playState = Jellyfin::Support::fromJsonValue>(source["PlayState"]); - m_additionalUsers = Jellyfin::Support::fromJsonValue>>(source["AdditionalUsers"]); + m_additionalUsers = Jellyfin::Support::fromJsonValue>(source["AdditionalUsers"]); m_capabilities = Jellyfin::Support::fromJsonValue>(source["Capabilities"]); m_remoteEndPoint = Jellyfin::Support::fromJsonValue(source["RemoteEndPoint"]); m_playableMediaTypes = Jellyfin::Support::fromJsonValue(source["PlayableMediaTypes"]); @@ -127,7 +127,7 @@ void SessionInfo::setFromJson(QJsonObject source) { m_isActive = Jellyfin::Support::fromJsonValue(source["IsActive"]); m_supportsMediaControl = Jellyfin::Support::fromJsonValue(source["SupportsMediaControl"]); m_supportsRemoteControl = Jellyfin::Support::fromJsonValue(source["SupportsRemoteControl"]); - m_nowPlayingQueue = Jellyfin::Support::fromJsonValue>>(source["NowPlayingQueue"]); + m_nowPlayingQueue = Jellyfin::Support::fromJsonValue>(source["NowPlayingQueue"]); m_hasCustomDeviceName = Jellyfin::Support::fromJsonValue(source["HasCustomDeviceName"]); m_playlistItemId = Jellyfin::Support::fromJsonValue(source["PlaylistItemId"]); m_serverId = Jellyfin::Support::fromJsonValue(source["ServerId"]); @@ -139,7 +139,7 @@ void SessionInfo::setFromJson(QJsonObject source) { QJsonObject SessionInfo::toJson() { QJsonObject result; result["PlayState"] = Jellyfin::Support::toJsonValue>(m_playState); - result["AdditionalUsers"] = Jellyfin::Support::toJsonValue>>(m_additionalUsers); + result["AdditionalUsers"] = Jellyfin::Support::toJsonValue>(m_additionalUsers); result["Capabilities"] = Jellyfin::Support::toJsonValue>(m_capabilities); result["RemoteEndPoint"] = Jellyfin::Support::toJsonValue(m_remoteEndPoint); result["PlayableMediaTypes"] = Jellyfin::Support::toJsonValue(m_playableMediaTypes); @@ -160,7 +160,7 @@ QJsonObject SessionInfo::toJson() { result["IsActive"] = Jellyfin::Support::toJsonValue(m_isActive); result["SupportsMediaControl"] = Jellyfin::Support::toJsonValue(m_supportsMediaControl); result["SupportsRemoteControl"] = Jellyfin::Support::toJsonValue(m_supportsRemoteControl); - result["NowPlayingQueue"] = Jellyfin::Support::toJsonValue>>(m_nowPlayingQueue); + result["NowPlayingQueue"] = Jellyfin::Support::toJsonValue>(m_nowPlayingQueue); result["HasCustomDeviceName"] = Jellyfin::Support::toJsonValue(m_hasCustomDeviceName); result["PlaylistItemId"] = Jellyfin::Support::toJsonValue(m_playlistItemId); result["ServerId"] = Jellyfin::Support::toJsonValue(m_serverId); @@ -176,9 +176,9 @@ void SessionInfo::setPlayState(QSharedPointer newPlayState) { m_playState = newPlayState; } -QList> SessionInfo::additionalUsers() const { return m_additionalUsers; } +QList SessionInfo::additionalUsers() const { return m_additionalUsers; } -void SessionInfo::setAdditionalUsers(QList> newAdditionalUsers) { +void SessionInfo::setAdditionalUsers(QList newAdditionalUsers) { m_additionalUsers = newAdditionalUsers; } bool SessionInfo::additionalUsersNull() const { @@ -372,9 +372,9 @@ void SessionInfo::setSupportsRemoteControl(bool newSupportsRemoteControl) { m_supportsRemoteControl = newSupportsRemoteControl; } -QList> SessionInfo::nowPlayingQueue() const { return m_nowPlayingQueue; } +QList SessionInfo::nowPlayingQueue() const { return m_nowPlayingQueue; } -void SessionInfo::setNowPlayingQueue(QList> newNowPlayingQueue) { +void SessionInfo::setNowPlayingQueue(QList newNowPlayingQueue) { m_nowPlayingQueue = newNowPlayingQueue; } bool SessionInfo::nowPlayingQueueNull() const { diff --git a/core/src/dto/systeminfo.cpp b/core/src/dto/systeminfo.cpp index 1bd6ce1..1c660ed 100644 --- a/core/src/dto/systeminfo.cpp +++ b/core/src/dto/systeminfo.cpp @@ -114,7 +114,7 @@ void SystemInfo::setFromJson(QJsonObject source) { m_isShuttingDown = Jellyfin::Support::fromJsonValue(source["IsShuttingDown"]); m_supportsLibraryMonitor = Jellyfin::Support::fromJsonValue(source["SupportsLibraryMonitor"]); m_webSocketPortNumber = Jellyfin::Support::fromJsonValue(source["WebSocketPortNumber"]); - m_completedInstallations = Jellyfin::Support::fromJsonValue>>(source["CompletedInstallations"]); + m_completedInstallations = Jellyfin::Support::fromJsonValue>(source["CompletedInstallations"]); m_canSelfRestart = Jellyfin::Support::fromJsonValue(source["CanSelfRestart"]); m_canLaunchWebBrowser = Jellyfin::Support::fromJsonValue(source["CanLaunchWebBrowser"]); m_programDataPath = Jellyfin::Support::fromJsonValue(source["ProgramDataPath"]); @@ -145,7 +145,7 @@ QJsonObject SystemInfo::toJson() { result["IsShuttingDown"] = Jellyfin::Support::toJsonValue(m_isShuttingDown); result["SupportsLibraryMonitor"] = Jellyfin::Support::toJsonValue(m_supportsLibraryMonitor); result["WebSocketPortNumber"] = Jellyfin::Support::toJsonValue(m_webSocketPortNumber); - result["CompletedInstallations"] = Jellyfin::Support::toJsonValue>>(m_completedInstallations); + result["CompletedInstallations"] = Jellyfin::Support::toJsonValue>(m_completedInstallations); result["CanSelfRestart"] = Jellyfin::Support::toJsonValue(m_canSelfRestart); result["CanLaunchWebBrowser"] = Jellyfin::Support::toJsonValue(m_canLaunchWebBrowser); result["ProgramDataPath"] = Jellyfin::Support::toJsonValue(m_programDataPath); @@ -303,9 +303,9 @@ void SystemInfo::setWebSocketPortNumber(qint32 newWebSocketPortNumber) { m_webSocketPortNumber = newWebSocketPortNumber; } -QList> SystemInfo::completedInstallations() const { return m_completedInstallations; } +QList SystemInfo::completedInstallations() const { return m_completedInstallations; } -void SystemInfo::setCompletedInstallations(QList> newCompletedInstallations) { +void SystemInfo::setCompletedInstallations(QList newCompletedInstallations) { m_completedInstallations = newCompletedInstallations; } bool SystemInfo::completedInstallationsNull() const { diff --git a/core/src/dto/taskinfo.cpp b/core/src/dto/taskinfo.cpp index b05ce7f..24fd6ac 100644 --- a/core/src/dto/taskinfo.cpp +++ b/core/src/dto/taskinfo.cpp @@ -74,7 +74,7 @@ void TaskInfo::setFromJson(QJsonObject source) { m_currentProgressPercentage = Jellyfin::Support::fromJsonValue>(source["CurrentProgressPercentage"]); m_jellyfinId = Jellyfin::Support::fromJsonValue(source["Id"]); m_lastExecutionResult = Jellyfin::Support::fromJsonValue>(source["LastExecutionResult"]); - m_triggers = Jellyfin::Support::fromJsonValue>>(source["Triggers"]); + m_triggers = Jellyfin::Support::fromJsonValue>(source["Triggers"]); m_description = Jellyfin::Support::fromJsonValue(source["Description"]); m_category = Jellyfin::Support::fromJsonValue(source["Category"]); m_isHidden = Jellyfin::Support::fromJsonValue(source["IsHidden"]); @@ -89,7 +89,7 @@ QJsonObject TaskInfo::toJson() { result["CurrentProgressPercentage"] = Jellyfin::Support::toJsonValue>(m_currentProgressPercentage); result["Id"] = Jellyfin::Support::toJsonValue(m_jellyfinId); result["LastExecutionResult"] = Jellyfin::Support::toJsonValue>(m_lastExecutionResult); - result["Triggers"] = Jellyfin::Support::toJsonValue>>(m_triggers); + result["Triggers"] = Jellyfin::Support::toJsonValue>(m_triggers); result["Description"] = Jellyfin::Support::toJsonValue(m_description); result["Category"] = Jellyfin::Support::toJsonValue(m_category); result["IsHidden"] = Jellyfin::Support::toJsonValue(m_isHidden); @@ -149,9 +149,9 @@ void TaskInfo::setLastExecutionResult(QSharedPointer newLastExecutio m_lastExecutionResult = newLastExecutionResult; } -QList> TaskInfo::triggers() const { return m_triggers; } +QList TaskInfo::triggers() const { return m_triggers; } -void TaskInfo::setTriggers(QList> newTriggers) { +void TaskInfo::setTriggers(QList newTriggers) { m_triggers = newTriggers; } bool TaskInfo::triggersNull() const { diff --git a/core/src/dto/thememediaresult.cpp b/core/src/dto/thememediaresult.cpp index 4d5bd6d..fcd8469 100644 --- a/core/src/dto/thememediaresult.cpp +++ b/core/src/dto/thememediaresult.cpp @@ -57,7 +57,7 @@ ThemeMediaResult ThemeMediaResult::fromJson(QJsonObject source) { void ThemeMediaResult::setFromJson(QJsonObject source) { - m_items = Jellyfin::Support::fromJsonValue>>(source["Items"]); + m_items = Jellyfin::Support::fromJsonValue>(source["Items"]); m_totalRecordCount = Jellyfin::Support::fromJsonValue(source["TotalRecordCount"]); m_startIndex = Jellyfin::Support::fromJsonValue(source["StartIndex"]); m_ownerId = Jellyfin::Support::fromJsonValue(source["OwnerId"]); @@ -66,7 +66,7 @@ void ThemeMediaResult::setFromJson(QJsonObject source) { QJsonObject ThemeMediaResult::toJson() { QJsonObject result; - result["Items"] = Jellyfin::Support::toJsonValue>>(m_items); + result["Items"] = Jellyfin::Support::toJsonValue>(m_items); result["TotalRecordCount"] = Jellyfin::Support::toJsonValue(m_totalRecordCount); result["StartIndex"] = Jellyfin::Support::toJsonValue(m_startIndex); result["OwnerId"] = Jellyfin::Support::toJsonValue(m_ownerId); @@ -74,9 +74,9 @@ QJsonObject ThemeMediaResult::toJson() { return result; } -QList> ThemeMediaResult::items() const { return m_items; } +QList ThemeMediaResult::items() const { return m_items; } -void ThemeMediaResult::setItems(QList> newItems) { +void ThemeMediaResult::setItems(QList newItems) { m_items = newItems; } bool ThemeMediaResult::itemsNull() const { diff --git a/core/src/dto/timerinfodtoqueryresult.cpp b/core/src/dto/timerinfodtoqueryresult.cpp index b8af595..0df945c 100644 --- a/core/src/dto/timerinfodtoqueryresult.cpp +++ b/core/src/dto/timerinfodtoqueryresult.cpp @@ -55,7 +55,7 @@ TimerInfoDtoQueryResult TimerInfoDtoQueryResult::fromJson(QJsonObject source) { void TimerInfoDtoQueryResult::setFromJson(QJsonObject source) { - m_items = Jellyfin::Support::fromJsonValue>>(source["Items"]); + m_items = Jellyfin::Support::fromJsonValue>(source["Items"]); m_totalRecordCount = Jellyfin::Support::fromJsonValue(source["TotalRecordCount"]); m_startIndex = Jellyfin::Support::fromJsonValue(source["StartIndex"]); @@ -63,16 +63,16 @@ void TimerInfoDtoQueryResult::setFromJson(QJsonObject source) { QJsonObject TimerInfoDtoQueryResult::toJson() { QJsonObject result; - result["Items"] = Jellyfin::Support::toJsonValue>>(m_items); + result["Items"] = Jellyfin::Support::toJsonValue>(m_items); result["TotalRecordCount"] = Jellyfin::Support::toJsonValue(m_totalRecordCount); result["StartIndex"] = Jellyfin::Support::toJsonValue(m_startIndex); return result; } -QList> TimerInfoDtoQueryResult::items() const { return m_items; } +QList TimerInfoDtoQueryResult::items() const { return m_items; } -void TimerInfoDtoQueryResult::setItems(QList> newItems) { +void TimerInfoDtoQueryResult::setItems(QList newItems) { m_items = newItems; } bool TimerInfoDtoQueryResult::itemsNull() const { diff --git a/core/src/dto/typeoptions.cpp b/core/src/dto/typeoptions.cpp index 01df1e5..c71b93d 100644 --- a/core/src/dto/typeoptions.cpp +++ b/core/src/dto/typeoptions.cpp @@ -66,7 +66,7 @@ void TypeOptions::setFromJson(QJsonObject source) { m_metadataFetcherOrder = Jellyfin::Support::fromJsonValue(source["MetadataFetcherOrder"]); m_imageFetchers = Jellyfin::Support::fromJsonValue(source["ImageFetchers"]); m_imageFetcherOrder = Jellyfin::Support::fromJsonValue(source["ImageFetcherOrder"]); - m_imageOptions = Jellyfin::Support::fromJsonValue>>(source["ImageOptions"]); + m_imageOptions = Jellyfin::Support::fromJsonValue>(source["ImageOptions"]); } @@ -77,7 +77,7 @@ QJsonObject TypeOptions::toJson() { result["MetadataFetcherOrder"] = Jellyfin::Support::toJsonValue(m_metadataFetcherOrder); result["ImageFetchers"] = Jellyfin::Support::toJsonValue(m_imageFetchers); result["ImageFetcherOrder"] = Jellyfin::Support::toJsonValue(m_imageFetcherOrder); - result["ImageOptions"] = Jellyfin::Support::toJsonValue>>(m_imageOptions); + result["ImageOptions"] = Jellyfin::Support::toJsonValue>(m_imageOptions); return result; } @@ -147,9 +147,9 @@ void TypeOptions::setImageFetcherOrderNull() { m_imageFetcherOrder.clear(); } -QList> TypeOptions::imageOptions() const { return m_imageOptions; } +QList TypeOptions::imageOptions() const { return m_imageOptions; } -void TypeOptions::setImageOptions(QList> newImageOptions) { +void TypeOptions::setImageOptions(QList newImageOptions) { m_imageOptions = newImageOptions; } bool TypeOptions::imageOptionsNull() const { diff --git a/core/src/dto/userpolicy.cpp b/core/src/dto/userpolicy.cpp index 2ff38dc..dd48cfd 100644 --- a/core/src/dto/userpolicy.cpp +++ b/core/src/dto/userpolicy.cpp @@ -133,7 +133,7 @@ void UserPolicy::setFromJson(QJsonObject source) { m_maxParentalRating = Jellyfin::Support::fromJsonValue>(source["MaxParentalRating"]); m_blockedTags = Jellyfin::Support::fromJsonValue(source["BlockedTags"]); m_enableUserPreferenceAccess = Jellyfin::Support::fromJsonValue(source["EnableUserPreferenceAccess"]); - m_accessSchedules = Jellyfin::Support::fromJsonValue>>(source["AccessSchedules"]); + m_accessSchedules = Jellyfin::Support::fromJsonValue>(source["AccessSchedules"]); m_blockUnratedItems = Jellyfin::Support::fromJsonValue>(source["BlockUnratedItems"]); m_enableRemoteControlOfOtherUsers = Jellyfin::Support::fromJsonValue(source["EnableRemoteControlOfOtherUsers"]); m_enableSharedDeviceControl = Jellyfin::Support::fromJsonValue(source["EnableSharedDeviceControl"]); @@ -177,7 +177,7 @@ QJsonObject UserPolicy::toJson() { result["MaxParentalRating"] = Jellyfin::Support::toJsonValue>(m_maxParentalRating); result["BlockedTags"] = Jellyfin::Support::toJsonValue(m_blockedTags); result["EnableUserPreferenceAccess"] = Jellyfin::Support::toJsonValue(m_enableUserPreferenceAccess); - result["AccessSchedules"] = Jellyfin::Support::toJsonValue>>(m_accessSchedules); + result["AccessSchedules"] = Jellyfin::Support::toJsonValue>(m_accessSchedules); result["BlockUnratedItems"] = Jellyfin::Support::toJsonValue>(m_blockUnratedItems); result["EnableRemoteControlOfOtherUsers"] = Jellyfin::Support::toJsonValue(m_enableRemoteControlOfOtherUsers); result["EnableSharedDeviceControl"] = Jellyfin::Support::toJsonValue(m_enableSharedDeviceControl); @@ -264,9 +264,9 @@ void UserPolicy::setEnableUserPreferenceAccess(bool newEnableUserPreferenceAcces m_enableUserPreferenceAccess = newEnableUserPreferenceAccess; } -QList> UserPolicy::accessSchedules() const { return m_accessSchedules; } +QList UserPolicy::accessSchedules() const { return m_accessSchedules; } -void UserPolicy::setAccessSchedules(QList> newAccessSchedules) { +void UserPolicy::setAccessSchedules(QList newAccessSchedules) { m_accessSchedules = newAccessSchedules; } bool UserPolicy::accessSchedulesNull() const { diff --git a/core/src/jellyfin.cpp b/core/src/jellyfin.cpp index 94ca9e3..edcf197 100644 --- a/core/src/jellyfin.cpp +++ b/core/src/jellyfin.cpp @@ -24,7 +24,12 @@ void registerTypes(const char *uri) { qmlRegisterType(uri, 1, 0, "ServerDiscoveryModel"); qmlRegisterUncreatableType(uri, 1, 0, "Item", "Acquire one via ItemLoader or exposed properties"); + qmlRegisterUncreatableType(uri, 1, 0, "BaseApiModel", "Please use one of its subclasses"); + qmlRegisterUncreatableType(uri, 1, 0, "BaseModelLoader", "Please use one of its subclasses"); + qmlRegisterUncreatableType(uri, 1, 0, "ModelStatus", "Is an enum"); qmlRegisterType(uri, 1, 0, "ItemLoader"); + qmlRegisterType(uri, 1, 0, "ItemModel"); + qmlRegisterType(uri, 1, 0, "UsersViewLoader"); qmlRegisterType(uri, 1, 0, "PlaybackManager"); qmlRegisterUncreatableType(uri, 1, 0, "GeneralCommandType", "Is an enum"); diff --git a/core/src/loader/http/addlistingprovider.cpp b/core/src/loader/http/addlistingprovider.cpp index 8bde8dd..d627423 100644 --- a/core/src/loader/http/addlistingprovider.cpp +++ b/core/src/loader/http/addlistingprovider.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -AddListingProvider::AddListingProvider(ApiClient *apiClient) +AddListingProviderLoader::AddListingProviderLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString AddListingProvider::path(const AddListingProviderParams ¶ms) const { +QString AddListingProviderLoader::path(const AddListingProviderParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/ListingProviders"); } -QUrlQuery AddListingProvider::query(const AddListingProviderParams ¶ms) const { +QUrlQuery AddListingProviderLoader::query(const AddListingProviderParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/addtunerhost.cpp b/core/src/loader/http/addtunerhost.cpp index 2335904..1c05ddf 100644 --- a/core/src/loader/http/addtunerhost.cpp +++ b/core/src/loader/http/addtunerhost.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -AddTunerHost::AddTunerHost(ApiClient *apiClient) +AddTunerHostLoader::AddTunerHostLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString AddTunerHost::path(const AddTunerHostParams ¶ms) const { +QString AddTunerHostLoader::path(const AddTunerHostParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/TunerHosts"); } -QUrlQuery AddTunerHost::query(const AddTunerHostParams ¶ms) const { +QUrlQuery AddTunerHostLoader::query(const AddTunerHostParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/authenticateuser.cpp b/core/src/loader/http/authenticateuser.cpp index 57045d7..0941e34 100644 --- a/core/src/loader/http/authenticateuser.cpp +++ b/core/src/loader/http/authenticateuser.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -AuthenticateUser::AuthenticateUser(ApiClient *apiClient) +AuthenticateUserLoader::AuthenticateUserLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString AuthenticateUser::path(const AuthenticateUserParams ¶ms) const { +QString AuthenticateUserLoader::path(const AuthenticateUserParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/") + Support::toString(params.userId()) + QStringLiteral("/Authenticate"); } -QUrlQuery AuthenticateUser::query(const AuthenticateUserParams ¶ms) const { +QUrlQuery AuthenticateUserLoader::query(const AuthenticateUserParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/authenticateuserbyname.cpp b/core/src/loader/http/authenticateuserbyname.cpp index 745f2ca..5b8556a 100644 --- a/core/src/loader/http/authenticateuserbyname.cpp +++ b/core/src/loader/http/authenticateuserbyname.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -AuthenticateUserByName::AuthenticateUserByName(ApiClient *apiClient) +AuthenticateUserByNameLoader::AuthenticateUserByNameLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString AuthenticateUserByName::path(const AuthenticateUserByNameParams ¶ms) const { +QString AuthenticateUserByNameLoader::path(const AuthenticateUserByNameParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/AuthenticateByName"); } -QUrlQuery AuthenticateUserByName::query(const AuthenticateUserByNameParams ¶ms) const { +QUrlQuery AuthenticateUserByNameLoader::query(const AuthenticateUserByNameParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/authenticatewithquickconnect.cpp b/core/src/loader/http/authenticatewithquickconnect.cpp index 807d4a3..72f7563 100644 --- a/core/src/loader/http/authenticatewithquickconnect.cpp +++ b/core/src/loader/http/authenticatewithquickconnect.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -AuthenticateWithQuickConnect::AuthenticateWithQuickConnect(ApiClient *apiClient) +AuthenticateWithQuickConnectLoader::AuthenticateWithQuickConnectLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString AuthenticateWithQuickConnect::path(const AuthenticateWithQuickConnectParams ¶ms) const { +QString AuthenticateWithQuickConnectLoader::path(const AuthenticateWithQuickConnectParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/AuthenticateWithQuickConnect"); } -QUrlQuery AuthenticateWithQuickConnect::query(const AuthenticateWithQuickConnectParams ¶ms) const { +QUrlQuery AuthenticateWithQuickConnectLoader::query(const AuthenticateWithQuickConnectParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/connect.cpp b/core/src/loader/http/connect.cpp index f0b595a..1b08ef2 100644 --- a/core/src/loader/http/connect.cpp +++ b/core/src/loader/http/connect.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -Connect::Connect(ApiClient *apiClient) +ConnectLoader::ConnectLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString Connect::path(const ConnectParams ¶ms) const { +QString ConnectLoader::path(const ConnectParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/QuickConnect/Connect"); } -QUrlQuery Connect::query(const ConnectParams ¶ms) const { +QUrlQuery ConnectLoader::query(const ConnectParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/createcollection.cpp b/core/src/loader/http/createcollection.cpp index c23d58e..71ff0e1 100644 --- a/core/src/loader/http/createcollection.cpp +++ b/core/src/loader/http/createcollection.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -CreateCollection::CreateCollection(ApiClient *apiClient) +CreateCollectionLoader::CreateCollectionLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString CreateCollection::path(const CreateCollectionParams ¶ms) const { +QString CreateCollectionLoader::path(const CreateCollectionParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Collections"); } -QUrlQuery CreateCollection::query(const CreateCollectionParams ¶ms) const { +QUrlQuery CreateCollectionLoader::query(const CreateCollectionParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/createplaylist.cpp b/core/src/loader/http/createplaylist.cpp index d19e34c..0e4b8be 100644 --- a/core/src/loader/http/createplaylist.cpp +++ b/core/src/loader/http/createplaylist.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -CreatePlaylist::CreatePlaylist(ApiClient *apiClient) +CreatePlaylistLoader::CreatePlaylistLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString CreatePlaylist::path(const CreatePlaylistParams ¶ms) const { +QString CreatePlaylistLoader::path(const CreatePlaylistParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Playlists"); } -QUrlQuery CreatePlaylist::query(const CreatePlaylistParams ¶ms) const { +QUrlQuery CreatePlaylistLoader::query(const CreatePlaylistParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/createuserbyname.cpp b/core/src/loader/http/createuserbyname.cpp index 2395404..eda86cf 100644 --- a/core/src/loader/http/createuserbyname.cpp +++ b/core/src/loader/http/createuserbyname.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -CreateUserByName::CreateUserByName(ApiClient *apiClient) +CreateUserByNameLoader::CreateUserByNameLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString CreateUserByName::path(const CreateUserByNameParams ¶ms) const { +QString CreateUserByNameLoader::path(const CreateUserByNameParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/New"); } -QUrlQuery CreateUserByName::query(const CreateUserByNameParams ¶ms) const { +QUrlQuery CreateUserByNameLoader::query(const CreateUserByNameParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/deleteuseritemrating.cpp b/core/src/loader/http/deleteuseritemrating.cpp index a12cecf..28314cd 100644 --- a/core/src/loader/http/deleteuseritemrating.cpp +++ b/core/src/loader/http/deleteuseritemrating.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -DeleteUserItemRating::DeleteUserItemRating(ApiClient *apiClient) +DeleteUserItemRatingLoader::DeleteUserItemRatingLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString DeleteUserItemRating::path(const DeleteUserItemRatingParams ¶ms) const { +QString DeleteUserItemRatingLoader::path(const DeleteUserItemRatingParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/") + Support::toString(params.userId()) + QStringLiteral("/Items/") + Support::toString(params.itemId()) + QStringLiteral("/Rating"); } -QUrlQuery DeleteUserItemRating::query(const DeleteUserItemRatingParams ¶ms) const { +QUrlQuery DeleteUserItemRatingLoader::query(const DeleteUserItemRatingParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/forgotpassword.cpp b/core/src/loader/http/forgotpassword.cpp index aba4c05..f3d90bf 100644 --- a/core/src/loader/http/forgotpassword.cpp +++ b/core/src/loader/http/forgotpassword.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -ForgotPassword::ForgotPassword(ApiClient *apiClient) +ForgotPasswordLoader::ForgotPasswordLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString ForgotPassword::path(const ForgotPasswordParams ¶ms) const { +QString ForgotPasswordLoader::path(const ForgotPasswordParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/ForgotPassword"); } -QUrlQuery ForgotPassword::query(const ForgotPasswordParams ¶ms) const { +QUrlQuery ForgotPasswordLoader::query(const ForgotPasswordParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/forgotpasswordpin.cpp b/core/src/loader/http/forgotpasswordpin.cpp index 16dd9e5..275f0b4 100644 --- a/core/src/loader/http/forgotpasswordpin.cpp +++ b/core/src/loader/http/forgotpasswordpin.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -ForgotPasswordPin::ForgotPasswordPin(ApiClient *apiClient) +ForgotPasswordPinLoader::ForgotPasswordPinLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString ForgotPasswordPin::path(const ForgotPasswordPinParams ¶ms) const { +QString ForgotPasswordPinLoader::path(const ForgotPasswordPinParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/ForgotPassword/Pin"); } -QUrlQuery ForgotPasswordPin::query(const ForgotPasswordPinParams ¶ms) const { +QUrlQuery ForgotPasswordPinLoader::query(const ForgotPasswordPinParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/get.cpp b/core/src/loader/http/get.cpp index 272fe2a..9ebaf1a 100644 --- a/core/src/loader/http/get.cpp +++ b/core/src/loader/http/get.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -Get::Get(ApiClient *apiClient) +GetLoader::GetLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString Get::path(const GetParams ¶ms) const { +QString GetLoader::path(const GetParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Search/Hints"); } -QUrlQuery Get::query(const GetParams ¶ms) const { +QUrlQuery GetLoader::query(const GetParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getadditionalpart.cpp b/core/src/loader/http/getadditionalpart.cpp index b887904..03ccd8b 100644 --- a/core/src/loader/http/getadditionalpart.cpp +++ b/core/src/loader/http/getadditionalpart.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetAdditionalPart::GetAdditionalPart(ApiClient *apiClient) +GetAdditionalPartLoader::GetAdditionalPartLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetAdditionalPart::path(const GetAdditionalPartParams ¶ms) const { +QString GetAdditionalPartLoader::path(const GetAdditionalPartParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Videos/") + Support::toString(params.itemId()) + QStringLiteral("/AdditionalParts"); } -QUrlQuery GetAdditionalPart::query(const GetAdditionalPartParams ¶ms) const { +QUrlQuery GetAdditionalPartLoader::query(const GetAdditionalPartParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getalbumartists.cpp b/core/src/loader/http/getalbumartists.cpp index d23ccd5..977d5ad 100644 --- a/core/src/loader/http/getalbumartists.cpp +++ b/core/src/loader/http/getalbumartists.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetAlbumArtists::GetAlbumArtists(ApiClient *apiClient) +GetAlbumArtistsLoader::GetAlbumArtistsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetAlbumArtists::path(const GetAlbumArtistsParams ¶ms) const { +QString GetAlbumArtistsLoader::path(const GetAlbumArtistsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Artists/AlbumArtists"); } -QUrlQuery GetAlbumArtists::query(const GetAlbumArtistsParams ¶ms) const { +QUrlQuery GetAlbumArtistsLoader::query(const GetAlbumArtistsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getartistbyname.cpp b/core/src/loader/http/getartistbyname.cpp index 06c1712..9732ee4 100644 --- a/core/src/loader/http/getartistbyname.cpp +++ b/core/src/loader/http/getartistbyname.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetArtistByName::GetArtistByName(ApiClient *apiClient) +GetArtistByNameLoader::GetArtistByNameLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetArtistByName::path(const GetArtistByNameParams ¶ms) const { +QString GetArtistByNameLoader::path(const GetArtistByNameParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Artists/") + Support::toString(params.name()) ; } -QUrlQuery GetArtistByName::query(const GetArtistByNameParams ¶ms) const { +QUrlQuery GetArtistByNameLoader::query(const GetArtistByNameParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getartists.cpp b/core/src/loader/http/getartists.cpp index 9b43d82..d1297ca 100644 --- a/core/src/loader/http/getartists.cpp +++ b/core/src/loader/http/getartists.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetArtists::GetArtists(ApiClient *apiClient) +GetArtistsLoader::GetArtistsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetArtists::path(const GetArtistsParams ¶ms) const { +QString GetArtistsLoader::path(const GetArtistsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Artists"); } -QUrlQuery GetArtists::query(const GetArtistsParams ¶ms) const { +QUrlQuery GetArtistsLoader::query(const GetArtistsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getbrandingoptions.cpp b/core/src/loader/http/getbrandingoptions.cpp index 97fbc0a..ffb4fbd 100644 --- a/core/src/loader/http/getbrandingoptions.cpp +++ b/core/src/loader/http/getbrandingoptions.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetBrandingOptions::GetBrandingOptions(ApiClient *apiClient) +GetBrandingOptionsLoader::GetBrandingOptionsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetBrandingOptions::path(const GetBrandingOptionsParams ¶ms) const { +QString GetBrandingOptionsLoader::path(const GetBrandingOptionsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Branding/Configuration"); } -QUrlQuery GetBrandingOptions::query(const GetBrandingOptionsParams ¶ms) const { +QUrlQuery GetBrandingOptionsLoader::query(const GetBrandingOptionsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getchannel.cpp b/core/src/loader/http/getchannel.cpp index 8cfb512..57f559d 100644 --- a/core/src/loader/http/getchannel.cpp +++ b/core/src/loader/http/getchannel.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetChannel::GetChannel(ApiClient *apiClient) +GetChannelLoader::GetChannelLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetChannel::path(const GetChannelParams ¶ms) const { +QString GetChannelLoader::path(const GetChannelParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/Channels/") + Support::toString(params.channelId()) ; } -QUrlQuery GetChannel::query(const GetChannelParams ¶ms) const { +QUrlQuery GetChannelLoader::query(const GetChannelParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getchannelfeatures.cpp b/core/src/loader/http/getchannelfeatures.cpp index 3805824..59ba990 100644 --- a/core/src/loader/http/getchannelfeatures.cpp +++ b/core/src/loader/http/getchannelfeatures.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetChannelFeatures::GetChannelFeatures(ApiClient *apiClient) +GetChannelFeaturesLoader::GetChannelFeaturesLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetChannelFeatures::path(const GetChannelFeaturesParams ¶ms) const { +QString GetChannelFeaturesLoader::path(const GetChannelFeaturesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Channels/") + Support::toString(params.channelId()) + QStringLiteral("/Features"); } -QUrlQuery GetChannelFeatures::query(const GetChannelFeaturesParams ¶ms) const { +QUrlQuery GetChannelFeaturesLoader::query(const GetChannelFeaturesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getchannelitems.cpp b/core/src/loader/http/getchannelitems.cpp index 1f298ab..3632a9e 100644 --- a/core/src/loader/http/getchannelitems.cpp +++ b/core/src/loader/http/getchannelitems.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetChannelItems::GetChannelItems(ApiClient *apiClient) +GetChannelItemsLoader::GetChannelItemsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetChannelItems::path(const GetChannelItemsParams ¶ms) const { +QString GetChannelItemsLoader::path(const GetChannelItemsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Channels/") + Support::toString(params.channelId()) + QStringLiteral("/Items"); } -QUrlQuery GetChannelItems::query(const GetChannelItemsParams ¶ms) const { +QUrlQuery GetChannelItemsLoader::query(const GetChannelItemsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getchannelmappingoptions.cpp b/core/src/loader/http/getchannelmappingoptions.cpp index efd2c50..df6e975 100644 --- a/core/src/loader/http/getchannelmappingoptions.cpp +++ b/core/src/loader/http/getchannelmappingoptions.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetChannelMappingOptions::GetChannelMappingOptions(ApiClient *apiClient) +GetChannelMappingOptionsLoader::GetChannelMappingOptionsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetChannelMappingOptions::path(const GetChannelMappingOptionsParams ¶ms) const { +QString GetChannelMappingOptionsLoader::path(const GetChannelMappingOptionsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/ChannelMappingOptions"); } -QUrlQuery GetChannelMappingOptions::query(const GetChannelMappingOptionsParams ¶ms) const { +QUrlQuery GetChannelMappingOptionsLoader::query(const GetChannelMappingOptionsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getchannels.cpp b/core/src/loader/http/getchannels.cpp index edf63d7..7dd2006 100644 --- a/core/src/loader/http/getchannels.cpp +++ b/core/src/loader/http/getchannels.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetChannels::GetChannels(ApiClient *apiClient) +GetChannelsLoader::GetChannelsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetChannels::path(const GetChannelsParams ¶ms) const { +QString GetChannelsLoader::path(const GetChannelsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Channels"); } -QUrlQuery GetChannels::query(const GetChannelsParams ¶ms) const { +QUrlQuery GetChannelsLoader::query(const GetChannelsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getconfiguration.cpp b/core/src/loader/http/getconfiguration.cpp index 38e4fa8..a4afe12 100644 --- a/core/src/loader/http/getconfiguration.cpp +++ b/core/src/loader/http/getconfiguration.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetConfiguration::GetConfiguration(ApiClient *apiClient) +GetConfigurationLoader::GetConfigurationLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetConfiguration::path(const GetConfigurationParams ¶ms) const { +QString GetConfigurationLoader::path(const GetConfigurationParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/System/Configuration"); } -QUrlQuery GetConfiguration::query(const GetConfigurationParams ¶ms) const { +QUrlQuery GetConfigurationLoader::query(const GetConfigurationParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getcriticreviews.cpp b/core/src/loader/http/getcriticreviews.cpp index 591f65b..788ab54 100644 --- a/core/src/loader/http/getcriticreviews.cpp +++ b/core/src/loader/http/getcriticreviews.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetCriticReviews::GetCriticReviews(ApiClient *apiClient) +GetCriticReviewsLoader::GetCriticReviewsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetCriticReviews::path(const GetCriticReviewsParams ¶ms) const { +QString GetCriticReviewsLoader::path(const GetCriticReviewsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Items/") + Support::toString(params.itemId()) + QStringLiteral("/CriticReviews"); } -QUrlQuery GetCriticReviews::query(const GetCriticReviewsParams ¶ms) const { +QUrlQuery GetCriticReviewsLoader::query(const GetCriticReviewsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getcurrentuser.cpp b/core/src/loader/http/getcurrentuser.cpp index f38c938..1830991 100644 --- a/core/src/loader/http/getcurrentuser.cpp +++ b/core/src/loader/http/getcurrentuser.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetCurrentUser::GetCurrentUser(ApiClient *apiClient) +GetCurrentUserLoader::GetCurrentUserLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetCurrentUser::path(const GetCurrentUserParams ¶ms) const { +QString GetCurrentUserLoader::path(const GetCurrentUserParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/Me"); } -QUrlQuery GetCurrentUser::query(const GetCurrentUserParams ¶ms) const { +QUrlQuery GetCurrentUserLoader::query(const GetCurrentUserParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getdefaultdirectorybrowser.cpp b/core/src/loader/http/getdefaultdirectorybrowser.cpp index a8dd713..f14292f 100644 --- a/core/src/loader/http/getdefaultdirectorybrowser.cpp +++ b/core/src/loader/http/getdefaultdirectorybrowser.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetDefaultDirectoryBrowser::GetDefaultDirectoryBrowser(ApiClient *apiClient) +GetDefaultDirectoryBrowserLoader::GetDefaultDirectoryBrowserLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetDefaultDirectoryBrowser::path(const GetDefaultDirectoryBrowserParams ¶ms) const { +QString GetDefaultDirectoryBrowserLoader::path(const GetDefaultDirectoryBrowserParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Environment/DefaultDirectoryBrowser"); } -QUrlQuery GetDefaultDirectoryBrowser::query(const GetDefaultDirectoryBrowserParams ¶ms) const { +QUrlQuery GetDefaultDirectoryBrowserLoader::query(const GetDefaultDirectoryBrowserParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getdefaultlistingprovider.cpp b/core/src/loader/http/getdefaultlistingprovider.cpp index e6692ce..dea29ca 100644 --- a/core/src/loader/http/getdefaultlistingprovider.cpp +++ b/core/src/loader/http/getdefaultlistingprovider.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetDefaultListingProvider::GetDefaultListingProvider(ApiClient *apiClient) +GetDefaultListingProviderLoader::GetDefaultListingProviderLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetDefaultListingProvider::path(const GetDefaultListingProviderParams ¶ms) const { +QString GetDefaultListingProviderLoader::path(const GetDefaultListingProviderParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/ListingProviders/Default"); } -QUrlQuery GetDefaultListingProvider::query(const GetDefaultListingProviderParams ¶ms) const { +QUrlQuery GetDefaultListingProviderLoader::query(const GetDefaultListingProviderParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getdefaultmetadataoptions.cpp b/core/src/loader/http/getdefaultmetadataoptions.cpp index 99ca501..8056dc5 100644 --- a/core/src/loader/http/getdefaultmetadataoptions.cpp +++ b/core/src/loader/http/getdefaultmetadataoptions.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetDefaultMetadataOptions::GetDefaultMetadataOptions(ApiClient *apiClient) +GetDefaultMetadataOptionsLoader::GetDefaultMetadataOptionsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetDefaultMetadataOptions::path(const GetDefaultMetadataOptionsParams ¶ms) const { +QString GetDefaultMetadataOptionsLoader::path(const GetDefaultMetadataOptionsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/System/Configuration/MetadataOptions/Default"); } -QUrlQuery GetDefaultMetadataOptions::query(const GetDefaultMetadataOptionsParams ¶ms) const { +QUrlQuery GetDefaultMetadataOptionsLoader::query(const GetDefaultMetadataOptionsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getdefaultprofile.cpp b/core/src/loader/http/getdefaultprofile.cpp index 23e7897..48a80f9 100644 --- a/core/src/loader/http/getdefaultprofile.cpp +++ b/core/src/loader/http/getdefaultprofile.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetDefaultProfile::GetDefaultProfile(ApiClient *apiClient) +GetDefaultProfileLoader::GetDefaultProfileLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetDefaultProfile::path(const GetDefaultProfileParams ¶ms) const { +QString GetDefaultProfileLoader::path(const GetDefaultProfileParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Dlna/Profiles/Default"); } -QUrlQuery GetDefaultProfile::query(const GetDefaultProfileParams ¶ms) const { +QUrlQuery GetDefaultProfileLoader::query(const GetDefaultProfileParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getdefaulttimer.cpp b/core/src/loader/http/getdefaulttimer.cpp index 55319e9..0509f15 100644 --- a/core/src/loader/http/getdefaulttimer.cpp +++ b/core/src/loader/http/getdefaulttimer.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetDefaultTimer::GetDefaultTimer(ApiClient *apiClient) +GetDefaultTimerLoader::GetDefaultTimerLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetDefaultTimer::path(const GetDefaultTimerParams ¶ms) const { +QString GetDefaultTimerLoader::path(const GetDefaultTimerParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/Timers/Defaults"); } -QUrlQuery GetDefaultTimer::query(const GetDefaultTimerParams ¶ms) const { +QUrlQuery GetDefaultTimerLoader::query(const GetDefaultTimerParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getdeviceinfo.cpp b/core/src/loader/http/getdeviceinfo.cpp index abf034b..fc7bbe5 100644 --- a/core/src/loader/http/getdeviceinfo.cpp +++ b/core/src/loader/http/getdeviceinfo.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetDeviceInfo::GetDeviceInfo(ApiClient *apiClient) +GetDeviceInfoLoader::GetDeviceInfoLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetDeviceInfo::path(const GetDeviceInfoParams ¶ms) const { +QString GetDeviceInfoLoader::path(const GetDeviceInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Devices/Info"); } -QUrlQuery GetDeviceInfo::query(const GetDeviceInfoParams ¶ms) const { +QUrlQuery GetDeviceInfoLoader::query(const GetDeviceInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getdeviceoptions.cpp b/core/src/loader/http/getdeviceoptions.cpp index fa5d636..71b9050 100644 --- a/core/src/loader/http/getdeviceoptions.cpp +++ b/core/src/loader/http/getdeviceoptions.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetDeviceOptions::GetDeviceOptions(ApiClient *apiClient) +GetDeviceOptionsLoader::GetDeviceOptionsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetDeviceOptions::path(const GetDeviceOptionsParams ¶ms) const { +QString GetDeviceOptionsLoader::path(const GetDeviceOptionsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Devices/Options"); } -QUrlQuery GetDeviceOptions::query(const GetDeviceOptionsParams ¶ms) const { +QUrlQuery GetDeviceOptionsLoader::query(const GetDeviceOptionsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getdevices.cpp b/core/src/loader/http/getdevices.cpp index e6c62e5..75bbcef 100644 --- a/core/src/loader/http/getdevices.cpp +++ b/core/src/loader/http/getdevices.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetDevices::GetDevices(ApiClient *apiClient) +GetDevicesLoader::GetDevicesLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetDevices::path(const GetDevicesParams ¶ms) const { +QString GetDevicesLoader::path(const GetDevicesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Devices"); } -QUrlQuery GetDevices::query(const GetDevicesParams ¶ms) const { +QUrlQuery GetDevicesLoader::query(const GetDevicesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getdisplaypreferences.cpp b/core/src/loader/http/getdisplaypreferences.cpp index 34ef237..58b670f 100644 --- a/core/src/loader/http/getdisplaypreferences.cpp +++ b/core/src/loader/http/getdisplaypreferences.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetDisplayPreferences::GetDisplayPreferences(ApiClient *apiClient) +GetDisplayPreferencesLoader::GetDisplayPreferencesLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetDisplayPreferences::path(const GetDisplayPreferencesParams ¶ms) const { +QString GetDisplayPreferencesLoader::path(const GetDisplayPreferencesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/DisplayPreferences/") + Support::toString(params.displayPreferencesId()) ; } -QUrlQuery GetDisplayPreferences::query(const GetDisplayPreferencesParams ¶ms) const { +QUrlQuery GetDisplayPreferencesLoader::query(const GetDisplayPreferencesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getendpointinfo.cpp b/core/src/loader/http/getendpointinfo.cpp index 32cabe9..b9c283a 100644 --- a/core/src/loader/http/getendpointinfo.cpp +++ b/core/src/loader/http/getendpointinfo.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetEndpointInfo::GetEndpointInfo(ApiClient *apiClient) +GetEndpointInfoLoader::GetEndpointInfoLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetEndpointInfo::path(const GetEndpointInfoParams ¶ms) const { +QString GetEndpointInfoLoader::path(const GetEndpointInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/System/Endpoint"); } -QUrlQuery GetEndpointInfo::query(const GetEndpointInfoParams ¶ms) const { +QUrlQuery GetEndpointInfoLoader::query(const GetEndpointInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getepisodes.cpp b/core/src/loader/http/getepisodes.cpp index 584acae..34cf193 100644 --- a/core/src/loader/http/getepisodes.cpp +++ b/core/src/loader/http/getepisodes.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetEpisodes::GetEpisodes(ApiClient *apiClient) +GetEpisodesLoader::GetEpisodesLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetEpisodes::path(const GetEpisodesParams ¶ms) const { +QString GetEpisodesLoader::path(const GetEpisodesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Shows/") + Support::toString(params.seriesId()) + QStringLiteral("/Episodes"); } -QUrlQuery GetEpisodes::query(const GetEpisodesParams ¶ms) const { +QUrlQuery GetEpisodesLoader::query(const GetEpisodesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getfirstuser.cpp b/core/src/loader/http/getfirstuser.cpp index 18e9f3f..9de8113 100644 --- a/core/src/loader/http/getfirstuser.cpp +++ b/core/src/loader/http/getfirstuser.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetFirstUser::GetFirstUser(ApiClient *apiClient) +GetFirstUserLoader::GetFirstUserLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetFirstUser::path(const GetFirstUserParams ¶ms) const { +QString GetFirstUserLoader::path(const GetFirstUserParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Startup/User"); } -QUrlQuery GetFirstUser::query(const GetFirstUserParams ¶ms) const { +QUrlQuery GetFirstUserLoader::query(const GetFirstUserParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getfirstuser_2.cpp b/core/src/loader/http/getfirstuser_2.cpp index 022ea2d..e6b0894 100644 --- a/core/src/loader/http/getfirstuser_2.cpp +++ b/core/src/loader/http/getfirstuser_2.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetFirstUser_2::GetFirstUser_2(ApiClient *apiClient) +GetFirstUser_2Loader::GetFirstUser_2Loader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetFirstUser_2::path(const GetFirstUser_2Params ¶ms) const { +QString GetFirstUser_2Loader::path(const GetFirstUser_2Params ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Startup/FirstUser"); } -QUrlQuery GetFirstUser_2::query(const GetFirstUser_2Params ¶ms) const { +QUrlQuery GetFirstUser_2Loader::query(const GetFirstUser_2Params ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getgenre.cpp b/core/src/loader/http/getgenre.cpp index 4c30e7f..949e158 100644 --- a/core/src/loader/http/getgenre.cpp +++ b/core/src/loader/http/getgenre.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetGenre::GetGenre(ApiClient *apiClient) +GetGenreLoader::GetGenreLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetGenre::path(const GetGenreParams ¶ms) const { +QString GetGenreLoader::path(const GetGenreParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Genres/") + Support::toString(params.genreName()) ; } -QUrlQuery GetGenre::query(const GetGenreParams ¶ms) const { +QUrlQuery GetGenreLoader::query(const GetGenreParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getgenres.cpp b/core/src/loader/http/getgenres.cpp index daedbab..d04c57c 100644 --- a/core/src/loader/http/getgenres.cpp +++ b/core/src/loader/http/getgenres.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetGenres::GetGenres(ApiClient *apiClient) +GetGenresLoader::GetGenresLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetGenres::path(const GetGenresParams ¶ms) const { +QString GetGenresLoader::path(const GetGenresParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Genres"); } -QUrlQuery GetGenres::query(const GetGenresParams ¶ms) const { +QUrlQuery GetGenresLoader::query(const GetGenresParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getguideinfo.cpp b/core/src/loader/http/getguideinfo.cpp index 0bdb9b4..fc9fd59 100644 --- a/core/src/loader/http/getguideinfo.cpp +++ b/core/src/loader/http/getguideinfo.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetGuideInfo::GetGuideInfo(ApiClient *apiClient) +GetGuideInfoLoader::GetGuideInfoLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetGuideInfo::path(const GetGuideInfoParams ¶ms) const { +QString GetGuideInfoLoader::path(const GetGuideInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/GuideInfo"); } -QUrlQuery GetGuideInfo::query(const GetGuideInfoParams ¶ms) const { +QUrlQuery GetGuideInfoLoader::query(const GetGuideInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getinstantmixfromalbum.cpp b/core/src/loader/http/getinstantmixfromalbum.cpp index 7ec8ac9..976de37 100644 --- a/core/src/loader/http/getinstantmixfromalbum.cpp +++ b/core/src/loader/http/getinstantmixfromalbum.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetInstantMixFromAlbum::GetInstantMixFromAlbum(ApiClient *apiClient) +GetInstantMixFromAlbumLoader::GetInstantMixFromAlbumLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetInstantMixFromAlbum::path(const GetInstantMixFromAlbumParams ¶ms) const { +QString GetInstantMixFromAlbumLoader::path(const GetInstantMixFromAlbumParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Albums/") + Support::toString(params.jellyfinId()) + QStringLiteral("/InstantMix"); } -QUrlQuery GetInstantMixFromAlbum::query(const GetInstantMixFromAlbumParams ¶ms) const { +QUrlQuery GetInstantMixFromAlbumLoader::query(const GetInstantMixFromAlbumParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getinstantmixfromartists.cpp b/core/src/loader/http/getinstantmixfromartists.cpp index 32eb3c9..526934c 100644 --- a/core/src/loader/http/getinstantmixfromartists.cpp +++ b/core/src/loader/http/getinstantmixfromartists.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetInstantMixFromArtists::GetInstantMixFromArtists(ApiClient *apiClient) +GetInstantMixFromArtistsLoader::GetInstantMixFromArtistsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetInstantMixFromArtists::path(const GetInstantMixFromArtistsParams ¶ms) const { +QString GetInstantMixFromArtistsLoader::path(const GetInstantMixFromArtistsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Artists/") + Support::toString(params.jellyfinId()) + QStringLiteral("/InstantMix"); } -QUrlQuery GetInstantMixFromArtists::query(const GetInstantMixFromArtistsParams ¶ms) const { +QUrlQuery GetInstantMixFromArtistsLoader::query(const GetInstantMixFromArtistsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getinstantmixfromitem.cpp b/core/src/loader/http/getinstantmixfromitem.cpp index bf762ba..62f36e8 100644 --- a/core/src/loader/http/getinstantmixfromitem.cpp +++ b/core/src/loader/http/getinstantmixfromitem.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetInstantMixFromItem::GetInstantMixFromItem(ApiClient *apiClient) +GetInstantMixFromItemLoader::GetInstantMixFromItemLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetInstantMixFromItem::path(const GetInstantMixFromItemParams ¶ms) const { +QString GetInstantMixFromItemLoader::path(const GetInstantMixFromItemParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Items/") + Support::toString(params.jellyfinId()) + QStringLiteral("/InstantMix"); } -QUrlQuery GetInstantMixFromItem::query(const GetInstantMixFromItemParams ¶ms) const { +QUrlQuery GetInstantMixFromItemLoader::query(const GetInstantMixFromItemParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getinstantmixfrommusicgenre.cpp b/core/src/loader/http/getinstantmixfrommusicgenre.cpp index 8189da9..8aed5db 100644 --- a/core/src/loader/http/getinstantmixfrommusicgenre.cpp +++ b/core/src/loader/http/getinstantmixfrommusicgenre.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetInstantMixFromMusicGenre::GetInstantMixFromMusicGenre(ApiClient *apiClient) +GetInstantMixFromMusicGenreLoader::GetInstantMixFromMusicGenreLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetInstantMixFromMusicGenre::path(const GetInstantMixFromMusicGenreParams ¶ms) const { +QString GetInstantMixFromMusicGenreLoader::path(const GetInstantMixFromMusicGenreParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/MusicGenres/") + Support::toString(params.name()) + QStringLiteral("/InstantMix"); } -QUrlQuery GetInstantMixFromMusicGenre::query(const GetInstantMixFromMusicGenreParams ¶ms) const { +QUrlQuery GetInstantMixFromMusicGenreLoader::query(const GetInstantMixFromMusicGenreParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getinstantmixfrommusicgenres.cpp b/core/src/loader/http/getinstantmixfrommusicgenres.cpp index a3e3836..bdde543 100644 --- a/core/src/loader/http/getinstantmixfrommusicgenres.cpp +++ b/core/src/loader/http/getinstantmixfrommusicgenres.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetInstantMixFromMusicGenres::GetInstantMixFromMusicGenres(ApiClient *apiClient) +GetInstantMixFromMusicGenresLoader::GetInstantMixFromMusicGenresLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetInstantMixFromMusicGenres::path(const GetInstantMixFromMusicGenresParams ¶ms) const { +QString GetInstantMixFromMusicGenresLoader::path(const GetInstantMixFromMusicGenresParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/MusicGenres/") + Support::toString(params.jellyfinId()) + QStringLiteral("/InstantMix"); } -QUrlQuery GetInstantMixFromMusicGenres::query(const GetInstantMixFromMusicGenresParams ¶ms) const { +QUrlQuery GetInstantMixFromMusicGenresLoader::query(const GetInstantMixFromMusicGenresParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getinstantmixfromplaylist.cpp b/core/src/loader/http/getinstantmixfromplaylist.cpp index 0af2c7d..3c506c0 100644 --- a/core/src/loader/http/getinstantmixfromplaylist.cpp +++ b/core/src/loader/http/getinstantmixfromplaylist.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetInstantMixFromPlaylist::GetInstantMixFromPlaylist(ApiClient *apiClient) +GetInstantMixFromPlaylistLoader::GetInstantMixFromPlaylistLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetInstantMixFromPlaylist::path(const GetInstantMixFromPlaylistParams ¶ms) const { +QString GetInstantMixFromPlaylistLoader::path(const GetInstantMixFromPlaylistParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Playlists/") + Support::toString(params.jellyfinId()) + QStringLiteral("/InstantMix"); } -QUrlQuery GetInstantMixFromPlaylist::query(const GetInstantMixFromPlaylistParams ¶ms) const { +QUrlQuery GetInstantMixFromPlaylistLoader::query(const GetInstantMixFromPlaylistParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getinstantmixfromsong.cpp b/core/src/loader/http/getinstantmixfromsong.cpp index 1bc9c4b..0fde839 100644 --- a/core/src/loader/http/getinstantmixfromsong.cpp +++ b/core/src/loader/http/getinstantmixfromsong.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetInstantMixFromSong::GetInstantMixFromSong(ApiClient *apiClient) +GetInstantMixFromSongLoader::GetInstantMixFromSongLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetInstantMixFromSong::path(const GetInstantMixFromSongParams ¶ms) const { +QString GetInstantMixFromSongLoader::path(const GetInstantMixFromSongParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Songs/") + Support::toString(params.jellyfinId()) + QStringLiteral("/InstantMix"); } -QUrlQuery GetInstantMixFromSong::query(const GetInstantMixFromSongParams ¶ms) const { +QUrlQuery GetInstantMixFromSongLoader::query(const GetInstantMixFromSongParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getintros.cpp b/core/src/loader/http/getintros.cpp index ea60d15..d3121a9 100644 --- a/core/src/loader/http/getintros.cpp +++ b/core/src/loader/http/getintros.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetIntros::GetIntros(ApiClient *apiClient) +GetIntrosLoader::GetIntrosLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetIntros::path(const GetIntrosParams ¶ms) const { +QString GetIntrosLoader::path(const GetIntrosParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/") + Support::toString(params.userId()) + QStringLiteral("/Items/") + Support::toString(params.itemId()) + QStringLiteral("/Intros"); } -QUrlQuery GetIntros::query(const GetIntrosParams ¶ms) const { +QUrlQuery GetIntrosLoader::query(const GetIntrosParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getitem.cpp b/core/src/loader/http/getitem.cpp index 56ecc30..06a745a 100644 --- a/core/src/loader/http/getitem.cpp +++ b/core/src/loader/http/getitem.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetItem::GetItem(ApiClient *apiClient) +GetItemLoader::GetItemLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetItem::path(const GetItemParams ¶ms) const { +QString GetItemLoader::path(const GetItemParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/") + Support::toString(params.userId()) + QStringLiteral("/Items/") + Support::toString(params.itemId()) ; } -QUrlQuery GetItem::query(const GetItemParams ¶ms) const { +QUrlQuery GetItemLoader::query(const GetItemParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getitemcounts.cpp b/core/src/loader/http/getitemcounts.cpp index 39b26e7..caf7edb 100644 --- a/core/src/loader/http/getitemcounts.cpp +++ b/core/src/loader/http/getitemcounts.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetItemCounts::GetItemCounts(ApiClient *apiClient) +GetItemCountsLoader::GetItemCountsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetItemCounts::path(const GetItemCountsParams ¶ms) const { +QString GetItemCountsLoader::path(const GetItemCountsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Items/Counts"); } -QUrlQuery GetItemCounts::query(const GetItemCountsParams ¶ms) const { +QUrlQuery GetItemCountsLoader::query(const GetItemCountsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getitems.cpp b/core/src/loader/http/getitems.cpp index bdf0dbb..741fa12 100644 --- a/core/src/loader/http/getitems.cpp +++ b/core/src/loader/http/getitems.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetItems::GetItems(ApiClient *apiClient) +GetItemsLoader::GetItemsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetItems::path(const GetItemsParams ¶ms) const { +QString GetItemsLoader::path(const GetItemsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Items"); } -QUrlQuery GetItems::query(const GetItemsParams ¶ms) const { +QUrlQuery GetItemsLoader::query(const GetItemsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getitemsbyuserid.cpp b/core/src/loader/http/getitemsbyuserid.cpp index f3f9ae6..0947baf 100644 --- a/core/src/loader/http/getitemsbyuserid.cpp +++ b/core/src/loader/http/getitemsbyuserid.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetItemsByUserId::GetItemsByUserId(ApiClient *apiClient) +GetItemsByUserIdLoader::GetItemsByUserIdLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetItemsByUserId::path(const GetItemsByUserIdParams ¶ms) const { +QString GetItemsByUserIdLoader::path(const GetItemsByUserIdParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/") + Support::toString(params.userId()) + QStringLiteral("/Items"); } -QUrlQuery GetItemsByUserId::query(const GetItemsByUserIdParams ¶ms) const { +QUrlQuery GetItemsByUserIdLoader::query(const GetItemsByUserIdParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getkeys.cpp b/core/src/loader/http/getkeys.cpp index 2599d0a..0da37dd 100644 --- a/core/src/loader/http/getkeys.cpp +++ b/core/src/loader/http/getkeys.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetKeys::GetKeys(ApiClient *apiClient) +GetKeysLoader::GetKeysLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetKeys::path(const GetKeysParams ¶ms) const { +QString GetKeysLoader::path(const GetKeysParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Auth/Keys"); } -QUrlQuery GetKeys::query(const GetKeysParams ¶ms) const { +QUrlQuery GetKeysLoader::query(const GetKeysParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getlatestchannelitems.cpp b/core/src/loader/http/getlatestchannelitems.cpp index 44b687b..0657fde 100644 --- a/core/src/loader/http/getlatestchannelitems.cpp +++ b/core/src/loader/http/getlatestchannelitems.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetLatestChannelItems::GetLatestChannelItems(ApiClient *apiClient) +GetLatestChannelItemsLoader::GetLatestChannelItemsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetLatestChannelItems::path(const GetLatestChannelItemsParams ¶ms) const { +QString GetLatestChannelItemsLoader::path(const GetLatestChannelItemsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Channels/Items/Latest"); } -QUrlQuery GetLatestChannelItems::query(const GetLatestChannelItemsParams ¶ms) const { +QUrlQuery GetLatestChannelItemsLoader::query(const GetLatestChannelItemsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getlibraryoptionsinfo.cpp b/core/src/loader/http/getlibraryoptionsinfo.cpp index 64abb3b..8338779 100644 --- a/core/src/loader/http/getlibraryoptionsinfo.cpp +++ b/core/src/loader/http/getlibraryoptionsinfo.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetLibraryOptionsInfo::GetLibraryOptionsInfo(ApiClient *apiClient) +GetLibraryOptionsInfoLoader::GetLibraryOptionsInfoLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetLibraryOptionsInfo::path(const GetLibraryOptionsInfoParams ¶ms) const { +QString GetLibraryOptionsInfoLoader::path(const GetLibraryOptionsInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Libraries/AvailableOptions"); } -QUrlQuery GetLibraryOptionsInfo::query(const GetLibraryOptionsInfoParams ¶ms) const { +QUrlQuery GetLibraryOptionsInfoLoader::query(const GetLibraryOptionsInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getlivetvchannels.cpp b/core/src/loader/http/getlivetvchannels.cpp index 234d4d8..d7e3d7a 100644 --- a/core/src/loader/http/getlivetvchannels.cpp +++ b/core/src/loader/http/getlivetvchannels.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetLiveTvChannels::GetLiveTvChannels(ApiClient *apiClient) +GetLiveTvChannelsLoader::GetLiveTvChannelsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetLiveTvChannels::path(const GetLiveTvChannelsParams ¶ms) const { +QString GetLiveTvChannelsLoader::path(const GetLiveTvChannelsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/Channels"); } -QUrlQuery GetLiveTvChannels::query(const GetLiveTvChannelsParams ¶ms) const { +QUrlQuery GetLiveTvChannelsLoader::query(const GetLiveTvChannelsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getlivetvinfo.cpp b/core/src/loader/http/getlivetvinfo.cpp index c154baf..8dac306 100644 --- a/core/src/loader/http/getlivetvinfo.cpp +++ b/core/src/loader/http/getlivetvinfo.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetLiveTvInfo::GetLiveTvInfo(ApiClient *apiClient) +GetLiveTvInfoLoader::GetLiveTvInfoLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetLiveTvInfo::path(const GetLiveTvInfoParams ¶ms) const { +QString GetLiveTvInfoLoader::path(const GetLiveTvInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/Info"); } -QUrlQuery GetLiveTvInfo::query(const GetLiveTvInfoParams ¶ms) const { +QUrlQuery GetLiveTvInfoLoader::query(const GetLiveTvInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getlivetvprograms.cpp b/core/src/loader/http/getlivetvprograms.cpp index 6c2e9d5..cf78776 100644 --- a/core/src/loader/http/getlivetvprograms.cpp +++ b/core/src/loader/http/getlivetvprograms.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetLiveTvPrograms::GetLiveTvPrograms(ApiClient *apiClient) +GetLiveTvProgramsLoader::GetLiveTvProgramsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetLiveTvPrograms::path(const GetLiveTvProgramsParams ¶ms) const { +QString GetLiveTvProgramsLoader::path(const GetLiveTvProgramsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/Programs"); } -QUrlQuery GetLiveTvPrograms::query(const GetLiveTvProgramsParams ¶ms) const { +QUrlQuery GetLiveTvProgramsLoader::query(const GetLiveTvProgramsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getlogentries.cpp b/core/src/loader/http/getlogentries.cpp index 1e74510..a20d174 100644 --- a/core/src/loader/http/getlogentries.cpp +++ b/core/src/loader/http/getlogentries.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetLogEntries::GetLogEntries(ApiClient *apiClient) +GetLogEntriesLoader::GetLogEntriesLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetLogEntries::path(const GetLogEntriesParams ¶ms) const { +QString GetLogEntriesLoader::path(const GetLogEntriesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/System/ActivityLog/Entries"); } -QUrlQuery GetLogEntries::query(const GetLogEntriesParams ¶ms) const { +QUrlQuery GetLogEntriesLoader::query(const GetLogEntriesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getmediafolders.cpp b/core/src/loader/http/getmediafolders.cpp index d612831..46f31f9 100644 --- a/core/src/loader/http/getmediafolders.cpp +++ b/core/src/loader/http/getmediafolders.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetMediaFolders::GetMediaFolders(ApiClient *apiClient) +GetMediaFoldersLoader::GetMediaFoldersLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetMediaFolders::path(const GetMediaFoldersParams ¶ms) const { +QString GetMediaFoldersLoader::path(const GetMediaFoldersParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Library/MediaFolders"); } -QUrlQuery GetMediaFolders::query(const GetMediaFoldersParams ¶ms) const { +QUrlQuery GetMediaFoldersLoader::query(const GetMediaFoldersParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getmetadataeditorinfo.cpp b/core/src/loader/http/getmetadataeditorinfo.cpp index 3995d59..6b37f7a 100644 --- a/core/src/loader/http/getmetadataeditorinfo.cpp +++ b/core/src/loader/http/getmetadataeditorinfo.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetMetadataEditorInfo::GetMetadataEditorInfo(ApiClient *apiClient) +GetMetadataEditorInfoLoader::GetMetadataEditorInfoLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetMetadataEditorInfo::path(const GetMetadataEditorInfoParams ¶ms) const { +QString GetMetadataEditorInfoLoader::path(const GetMetadataEditorInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Items/") + Support::toString(params.itemId()) + QStringLiteral("/MetadataEditor"); } -QUrlQuery GetMetadataEditorInfo::query(const GetMetadataEditorInfoParams ¶ms) const { +QUrlQuery GetMetadataEditorInfoLoader::query(const GetMetadataEditorInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getmusicgenre.cpp b/core/src/loader/http/getmusicgenre.cpp index 8ef7b1e..c478f7e 100644 --- a/core/src/loader/http/getmusicgenre.cpp +++ b/core/src/loader/http/getmusicgenre.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetMusicGenre::GetMusicGenre(ApiClient *apiClient) +GetMusicGenreLoader::GetMusicGenreLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetMusicGenre::path(const GetMusicGenreParams ¶ms) const { +QString GetMusicGenreLoader::path(const GetMusicGenreParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/MusicGenres/") + Support::toString(params.genreName()) ; } -QUrlQuery GetMusicGenre::query(const GetMusicGenreParams ¶ms) const { +QUrlQuery GetMusicGenreLoader::query(const GetMusicGenreParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getmusicgenres.cpp b/core/src/loader/http/getmusicgenres.cpp index 5416c85..76348a4 100644 --- a/core/src/loader/http/getmusicgenres.cpp +++ b/core/src/loader/http/getmusicgenres.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetMusicGenres::GetMusicGenres(ApiClient *apiClient) +GetMusicGenresLoader::GetMusicGenresLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetMusicGenres::path(const GetMusicGenresParams ¶ms) const { +QString GetMusicGenresLoader::path(const GetMusicGenresParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/MusicGenres"); } -QUrlQuery GetMusicGenres::query(const GetMusicGenresParams ¶ms) const { +QUrlQuery GetMusicGenresLoader::query(const GetMusicGenresParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getnextup.cpp b/core/src/loader/http/getnextup.cpp index fba97db..26f1996 100644 --- a/core/src/loader/http/getnextup.cpp +++ b/core/src/loader/http/getnextup.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetNextUp::GetNextUp(ApiClient *apiClient) +GetNextUpLoader::GetNextUpLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetNextUp::path(const GetNextUpParams ¶ms) const { +QString GetNextUpLoader::path(const GetNextUpParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Shows/NextUp"); } -QUrlQuery GetNextUp::query(const GetNextUpParams ¶ms) const { +QUrlQuery GetNextUpLoader::query(const GetNextUpParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getnotifications.cpp b/core/src/loader/http/getnotifications.cpp index 54b6e56..1d72952 100644 --- a/core/src/loader/http/getnotifications.cpp +++ b/core/src/loader/http/getnotifications.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetNotifications::GetNotifications(ApiClient *apiClient) +GetNotificationsLoader::GetNotificationsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetNotifications::path(const GetNotificationsParams ¶ms) const { +QString GetNotificationsLoader::path(const GetNotificationsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Notifications/") + Support::toString(params.userId()) ; } -QUrlQuery GetNotifications::query(const GetNotificationsParams ¶ms) const { +QUrlQuery GetNotificationsLoader::query(const GetNotificationsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getnotificationssummary.cpp b/core/src/loader/http/getnotificationssummary.cpp index fe9930a..4765847 100644 --- a/core/src/loader/http/getnotificationssummary.cpp +++ b/core/src/loader/http/getnotificationssummary.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetNotificationsSummary::GetNotificationsSummary(ApiClient *apiClient) +GetNotificationsSummaryLoader::GetNotificationsSummaryLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetNotificationsSummary::path(const GetNotificationsSummaryParams ¶ms) const { +QString GetNotificationsSummaryLoader::path(const GetNotificationsSummaryParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Notifications/") + Support::toString(params.userId()) + QStringLiteral("/Summary"); } -QUrlQuery GetNotificationsSummary::query(const GetNotificationsSummaryParams ¶ms) const { +QUrlQuery GetNotificationsSummaryLoader::query(const GetNotificationsSummaryParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getpackageinfo.cpp b/core/src/loader/http/getpackageinfo.cpp index 315e4a7..5baa3ae 100644 --- a/core/src/loader/http/getpackageinfo.cpp +++ b/core/src/loader/http/getpackageinfo.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetPackageInfo::GetPackageInfo(ApiClient *apiClient) +GetPackageInfoLoader::GetPackageInfoLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetPackageInfo::path(const GetPackageInfoParams ¶ms) const { +QString GetPackageInfoLoader::path(const GetPackageInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Packages/") + Support::toString(params.name()) ; } -QUrlQuery GetPackageInfo::query(const GetPackageInfoParams ¶ms) const { +QUrlQuery GetPackageInfoLoader::query(const GetPackageInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getperson.cpp b/core/src/loader/http/getperson.cpp index cbe4270..614a5a5 100644 --- a/core/src/loader/http/getperson.cpp +++ b/core/src/loader/http/getperson.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetPerson::GetPerson(ApiClient *apiClient) +GetPersonLoader::GetPersonLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetPerson::path(const GetPersonParams ¶ms) const { +QString GetPersonLoader::path(const GetPersonParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Persons/") + Support::toString(params.name()) ; } -QUrlQuery GetPerson::query(const GetPersonParams ¶ms) const { +QUrlQuery GetPersonLoader::query(const GetPersonParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getpersons.cpp b/core/src/loader/http/getpersons.cpp index e78df1c..1c86b63 100644 --- a/core/src/loader/http/getpersons.cpp +++ b/core/src/loader/http/getpersons.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetPersons::GetPersons(ApiClient *apiClient) +GetPersonsLoader::GetPersonsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetPersons::path(const GetPersonsParams ¶ms) const { +QString GetPersonsLoader::path(const GetPersonsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Persons"); } -QUrlQuery GetPersons::query(const GetPersonsParams ¶ms) const { +QUrlQuery GetPersonsLoader::query(const GetPersonsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getplaybackinfo.cpp b/core/src/loader/http/getplaybackinfo.cpp index 9ea48cc..337916f 100644 --- a/core/src/loader/http/getplaybackinfo.cpp +++ b/core/src/loader/http/getplaybackinfo.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetPlaybackInfo::GetPlaybackInfo(ApiClient *apiClient) +GetPlaybackInfoLoader::GetPlaybackInfoLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetPlaybackInfo::path(const GetPlaybackInfoParams ¶ms) const { +QString GetPlaybackInfoLoader::path(const GetPlaybackInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Items/") + Support::toString(params.itemId()) + QStringLiteral("/PlaybackInfo"); } -QUrlQuery GetPlaybackInfo::query(const GetPlaybackInfoParams ¶ms) const { +QUrlQuery GetPlaybackInfoLoader::query(const GetPlaybackInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getplaylistitems.cpp b/core/src/loader/http/getplaylistitems.cpp index ce55f3d..0c0618f 100644 --- a/core/src/loader/http/getplaylistitems.cpp +++ b/core/src/loader/http/getplaylistitems.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetPlaylistItems::GetPlaylistItems(ApiClient *apiClient) +GetPlaylistItemsLoader::GetPlaylistItemsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetPlaylistItems::path(const GetPlaylistItemsParams ¶ms) const { +QString GetPlaylistItemsLoader::path(const GetPlaylistItemsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Playlists/") + Support::toString(params.playlistId()) + QStringLiteral("/Items"); } -QUrlQuery GetPlaylistItems::query(const GetPlaylistItemsParams ¶ms) const { +QUrlQuery GetPlaylistItemsLoader::query(const GetPlaylistItemsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getpluginconfiguration.cpp b/core/src/loader/http/getpluginconfiguration.cpp index 2864001..7bc5cfb 100644 --- a/core/src/loader/http/getpluginconfiguration.cpp +++ b/core/src/loader/http/getpluginconfiguration.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetPluginConfiguration::GetPluginConfiguration(ApiClient *apiClient) +GetPluginConfigurationLoader::GetPluginConfigurationLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetPluginConfiguration::path(const GetPluginConfigurationParams ¶ms) const { +QString GetPluginConfigurationLoader::path(const GetPluginConfigurationParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Plugins/") + Support::toString(params.pluginId()) + QStringLiteral("/Configuration"); } -QUrlQuery GetPluginConfiguration::query(const GetPluginConfigurationParams ¶ms) const { +QUrlQuery GetPluginConfigurationLoader::query(const GetPluginConfigurationParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getpostedplaybackinfo.cpp b/core/src/loader/http/getpostedplaybackinfo.cpp index 4be4e24..ac67c17 100644 --- a/core/src/loader/http/getpostedplaybackinfo.cpp +++ b/core/src/loader/http/getpostedplaybackinfo.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetPostedPlaybackInfo::GetPostedPlaybackInfo(ApiClient *apiClient) +GetPostedPlaybackInfoLoader::GetPostedPlaybackInfoLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetPostedPlaybackInfo::path(const GetPostedPlaybackInfoParams ¶ms) const { +QString GetPostedPlaybackInfoLoader::path(const GetPostedPlaybackInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Items/") + Support::toString(params.itemId()) + QStringLiteral("/PlaybackInfo"); } -QUrlQuery GetPostedPlaybackInfo::query(const GetPostedPlaybackInfoParams ¶ms) const { +QUrlQuery GetPostedPlaybackInfoLoader::query(const GetPostedPlaybackInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getprofile.cpp b/core/src/loader/http/getprofile.cpp index 898e1a8..6574452 100644 --- a/core/src/loader/http/getprofile.cpp +++ b/core/src/loader/http/getprofile.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetProfile::GetProfile(ApiClient *apiClient) +GetProfileLoader::GetProfileLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetProfile::path(const GetProfileParams ¶ms) const { +QString GetProfileLoader::path(const GetProfileParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Dlna/Profiles/") + Support::toString(params.profileId()) ; } -QUrlQuery GetProfile::query(const GetProfileParams ¶ms) const { +QUrlQuery GetProfileLoader::query(const GetProfileParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getprogram.cpp b/core/src/loader/http/getprogram.cpp index 82db1e8..e647a2b 100644 --- a/core/src/loader/http/getprogram.cpp +++ b/core/src/loader/http/getprogram.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetProgram::GetProgram(ApiClient *apiClient) +GetProgramLoader::GetProgramLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetProgram::path(const GetProgramParams ¶ms) const { +QString GetProgramLoader::path(const GetProgramParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/Programs/") + Support::toString(params.programId()) ; } -QUrlQuery GetProgram::query(const GetProgramParams ¶ms) const { +QUrlQuery GetProgramLoader::query(const GetProgramParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getprograms.cpp b/core/src/loader/http/getprograms.cpp index 5475ddf..f716ea9 100644 --- a/core/src/loader/http/getprograms.cpp +++ b/core/src/loader/http/getprograms.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetPrograms::GetPrograms(ApiClient *apiClient) +GetProgramsLoader::GetProgramsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetPrograms::path(const GetProgramsParams ¶ms) const { +QString GetProgramsLoader::path(const GetProgramsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/Programs"); } -QUrlQuery GetPrograms::query(const GetProgramsParams ¶ms) const { +QUrlQuery GetProgramsLoader::query(const GetProgramsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getpublicsysteminfo.cpp b/core/src/loader/http/getpublicsysteminfo.cpp index d18603b..d615f11 100644 --- a/core/src/loader/http/getpublicsysteminfo.cpp +++ b/core/src/loader/http/getpublicsysteminfo.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetPublicSystemInfo::GetPublicSystemInfo(ApiClient *apiClient) +GetPublicSystemInfoLoader::GetPublicSystemInfoLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetPublicSystemInfo::path(const GetPublicSystemInfoParams ¶ms) const { +QString GetPublicSystemInfoLoader::path(const GetPublicSystemInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/System/Info/Public"); } -QUrlQuery GetPublicSystemInfo::query(const GetPublicSystemInfoParams ¶ms) const { +QUrlQuery GetPublicSystemInfoLoader::query(const GetPublicSystemInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getqueryfilters.cpp b/core/src/loader/http/getqueryfilters.cpp index 06215c0..3d9a902 100644 --- a/core/src/loader/http/getqueryfilters.cpp +++ b/core/src/loader/http/getqueryfilters.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetQueryFilters::GetQueryFilters(ApiClient *apiClient) +GetQueryFiltersLoader::GetQueryFiltersLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetQueryFilters::path(const GetQueryFiltersParams ¶ms) const { +QString GetQueryFiltersLoader::path(const GetQueryFiltersParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Items/Filters2"); } -QUrlQuery GetQueryFilters::query(const GetQueryFiltersParams ¶ms) const { +QUrlQuery GetQueryFiltersLoader::query(const GetQueryFiltersParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getqueryfilterslegacy.cpp b/core/src/loader/http/getqueryfilterslegacy.cpp index f3e6f2b..08b6aa7 100644 --- a/core/src/loader/http/getqueryfilterslegacy.cpp +++ b/core/src/loader/http/getqueryfilterslegacy.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetQueryFiltersLegacy::GetQueryFiltersLegacy(ApiClient *apiClient) +GetQueryFiltersLegacyLoader::GetQueryFiltersLegacyLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetQueryFiltersLegacy::path(const GetQueryFiltersLegacyParams ¶ms) const { +QString GetQueryFiltersLegacyLoader::path(const GetQueryFiltersLegacyParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Items/Filters"); } -QUrlQuery GetQueryFiltersLegacy::query(const GetQueryFiltersLegacyParams ¶ms) const { +QUrlQuery GetQueryFiltersLegacyLoader::query(const GetQueryFiltersLegacyParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getrecommendedprograms.cpp b/core/src/loader/http/getrecommendedprograms.cpp index 74a312f..4575a55 100644 --- a/core/src/loader/http/getrecommendedprograms.cpp +++ b/core/src/loader/http/getrecommendedprograms.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetRecommendedPrograms::GetRecommendedPrograms(ApiClient *apiClient) +GetRecommendedProgramsLoader::GetRecommendedProgramsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetRecommendedPrograms::path(const GetRecommendedProgramsParams ¶ms) const { +QString GetRecommendedProgramsLoader::path(const GetRecommendedProgramsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/Programs/Recommended"); } -QUrlQuery GetRecommendedPrograms::query(const GetRecommendedProgramsParams ¶ms) const { +QUrlQuery GetRecommendedProgramsLoader::query(const GetRecommendedProgramsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getrecording.cpp b/core/src/loader/http/getrecording.cpp index b0706e3..864fcb0 100644 --- a/core/src/loader/http/getrecording.cpp +++ b/core/src/loader/http/getrecording.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetRecording::GetRecording(ApiClient *apiClient) +GetRecordingLoader::GetRecordingLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetRecording::path(const GetRecordingParams ¶ms) const { +QString GetRecordingLoader::path(const GetRecordingParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/Recordings/") + Support::toString(params.recordingId()) ; } -QUrlQuery GetRecording::query(const GetRecordingParams ¶ms) const { +QUrlQuery GetRecordingLoader::query(const GetRecordingParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getrecordingfolders.cpp b/core/src/loader/http/getrecordingfolders.cpp index 771fe8b..7ec3511 100644 --- a/core/src/loader/http/getrecordingfolders.cpp +++ b/core/src/loader/http/getrecordingfolders.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetRecordingFolders::GetRecordingFolders(ApiClient *apiClient) +GetRecordingFoldersLoader::GetRecordingFoldersLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetRecordingFolders::path(const GetRecordingFoldersParams ¶ms) const { +QString GetRecordingFoldersLoader::path(const GetRecordingFoldersParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/Recordings/Folders"); } -QUrlQuery GetRecordingFolders::query(const GetRecordingFoldersParams ¶ms) const { +QUrlQuery GetRecordingFoldersLoader::query(const GetRecordingFoldersParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getrecordinggroups.cpp b/core/src/loader/http/getrecordinggroups.cpp index d44ffb2..63c3a1c 100644 --- a/core/src/loader/http/getrecordinggroups.cpp +++ b/core/src/loader/http/getrecordinggroups.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetRecordingGroups::GetRecordingGroups(ApiClient *apiClient) +GetRecordingGroupsLoader::GetRecordingGroupsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetRecordingGroups::path(const GetRecordingGroupsParams ¶ms) const { +QString GetRecordingGroupsLoader::path(const GetRecordingGroupsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/Recordings/Groups"); } -QUrlQuery GetRecordingGroups::query(const GetRecordingGroupsParams ¶ms) const { +QUrlQuery GetRecordingGroupsLoader::query(const GetRecordingGroupsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getrecordings.cpp b/core/src/loader/http/getrecordings.cpp index 91378fe..8d94686 100644 --- a/core/src/loader/http/getrecordings.cpp +++ b/core/src/loader/http/getrecordings.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetRecordings::GetRecordings(ApiClient *apiClient) +GetRecordingsLoader::GetRecordingsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetRecordings::path(const GetRecordingsParams ¶ms) const { +QString GetRecordingsLoader::path(const GetRecordingsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/Recordings"); } -QUrlQuery GetRecordings::query(const GetRecordingsParams ¶ms) const { +QUrlQuery GetRecordingsLoader::query(const GetRecordingsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getrecordingsseries.cpp b/core/src/loader/http/getrecordingsseries.cpp index 2418553..90ddda4 100644 --- a/core/src/loader/http/getrecordingsseries.cpp +++ b/core/src/loader/http/getrecordingsseries.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetRecordingsSeries::GetRecordingsSeries(ApiClient *apiClient) +GetRecordingsSeriesLoader::GetRecordingsSeriesLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetRecordingsSeries::path(const GetRecordingsSeriesParams ¶ms) const { +QString GetRecordingsSeriesLoader::path(const GetRecordingsSeriesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/Recordings/Series"); } -QUrlQuery GetRecordingsSeries::query(const GetRecordingsSeriesParams ¶ms) const { +QUrlQuery GetRecordingsSeriesLoader::query(const GetRecordingsSeriesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getremoteimages.cpp b/core/src/loader/http/getremoteimages.cpp index 82d5069..045588d 100644 --- a/core/src/loader/http/getremoteimages.cpp +++ b/core/src/loader/http/getremoteimages.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetRemoteImages::GetRemoteImages(ApiClient *apiClient) +GetRemoteImagesLoader::GetRemoteImagesLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetRemoteImages::path(const GetRemoteImagesParams ¶ms) const { +QString GetRemoteImagesLoader::path(const GetRemoteImagesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Items/") + Support::toString(params.itemId()) + QStringLiteral("/RemoteImages"); } -QUrlQuery GetRemoteImages::query(const GetRemoteImagesParams ¶ms) const { +QUrlQuery GetRemoteImagesLoader::query(const GetRemoteImagesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getresumeitems.cpp b/core/src/loader/http/getresumeitems.cpp index 29c374f..1cd3029 100644 --- a/core/src/loader/http/getresumeitems.cpp +++ b/core/src/loader/http/getresumeitems.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetResumeItems::GetResumeItems(ApiClient *apiClient) +GetResumeItemsLoader::GetResumeItemsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetResumeItems::path(const GetResumeItemsParams ¶ms) const { +QString GetResumeItemsLoader::path(const GetResumeItemsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/") + Support::toString(params.userId()) + QStringLiteral("/Items/Resume"); } -QUrlQuery GetResumeItems::query(const GetResumeItemsParams ¶ms) const { +QUrlQuery GetResumeItemsLoader::query(const GetResumeItemsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getrootfolder.cpp b/core/src/loader/http/getrootfolder.cpp index e519c11..6152311 100644 --- a/core/src/loader/http/getrootfolder.cpp +++ b/core/src/loader/http/getrootfolder.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetRootFolder::GetRootFolder(ApiClient *apiClient) +GetRootFolderLoader::GetRootFolderLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetRootFolder::path(const GetRootFolderParams ¶ms) const { +QString GetRootFolderLoader::path(const GetRootFolderParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/") + Support::toString(params.userId()) + QStringLiteral("/Items/Root"); } -QUrlQuery GetRootFolder::query(const GetRootFolderParams ¶ms) const { +QUrlQuery GetRootFolderLoader::query(const GetRootFolderParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getseasons.cpp b/core/src/loader/http/getseasons.cpp index 7af1476..a67b208 100644 --- a/core/src/loader/http/getseasons.cpp +++ b/core/src/loader/http/getseasons.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetSeasons::GetSeasons(ApiClient *apiClient) +GetSeasonsLoader::GetSeasonsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetSeasons::path(const GetSeasonsParams ¶ms) const { +QString GetSeasonsLoader::path(const GetSeasonsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Shows/") + Support::toString(params.seriesId()) + QStringLiteral("/Seasons"); } -QUrlQuery GetSeasons::query(const GetSeasonsParams ¶ms) const { +QUrlQuery GetSeasonsLoader::query(const GetSeasonsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getseriestimer.cpp b/core/src/loader/http/getseriestimer.cpp index c7ee42a..6567a14 100644 --- a/core/src/loader/http/getseriestimer.cpp +++ b/core/src/loader/http/getseriestimer.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetSeriesTimer::GetSeriesTimer(ApiClient *apiClient) +GetSeriesTimerLoader::GetSeriesTimerLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetSeriesTimer::path(const GetSeriesTimerParams ¶ms) const { +QString GetSeriesTimerLoader::path(const GetSeriesTimerParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/SeriesTimers/") + Support::toString(params.timerId()) ; } -QUrlQuery GetSeriesTimer::query(const GetSeriesTimerParams ¶ms) const { +QUrlQuery GetSeriesTimerLoader::query(const GetSeriesTimerParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getseriestimers.cpp b/core/src/loader/http/getseriestimers.cpp index d60c470..b99d4f1 100644 --- a/core/src/loader/http/getseriestimers.cpp +++ b/core/src/loader/http/getseriestimers.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetSeriesTimers::GetSeriesTimers(ApiClient *apiClient) +GetSeriesTimersLoader::GetSeriesTimersLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetSeriesTimers::path(const GetSeriesTimersParams ¶ms) const { +QString GetSeriesTimersLoader::path(const GetSeriesTimersParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/SeriesTimers"); } -QUrlQuery GetSeriesTimers::query(const GetSeriesTimersParams ¶ms) const { +QUrlQuery GetSeriesTimersLoader::query(const GetSeriesTimersParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getsimilaralbums.cpp b/core/src/loader/http/getsimilaralbums.cpp index a0be85d..60dc5ac 100644 --- a/core/src/loader/http/getsimilaralbums.cpp +++ b/core/src/loader/http/getsimilaralbums.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetSimilarAlbums::GetSimilarAlbums(ApiClient *apiClient) +GetSimilarAlbumsLoader::GetSimilarAlbumsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetSimilarAlbums::path(const GetSimilarAlbumsParams ¶ms) const { +QString GetSimilarAlbumsLoader::path(const GetSimilarAlbumsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Albums/") + Support::toString(params.itemId()) + QStringLiteral("/Similar"); } -QUrlQuery GetSimilarAlbums::query(const GetSimilarAlbumsParams ¶ms) const { +QUrlQuery GetSimilarAlbumsLoader::query(const GetSimilarAlbumsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getsimilarartists.cpp b/core/src/loader/http/getsimilarartists.cpp index 2119ade..d965ea4 100644 --- a/core/src/loader/http/getsimilarartists.cpp +++ b/core/src/loader/http/getsimilarartists.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetSimilarArtists::GetSimilarArtists(ApiClient *apiClient) +GetSimilarArtistsLoader::GetSimilarArtistsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetSimilarArtists::path(const GetSimilarArtistsParams ¶ms) const { +QString GetSimilarArtistsLoader::path(const GetSimilarArtistsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Artists/") + Support::toString(params.itemId()) + QStringLiteral("/Similar"); } -QUrlQuery GetSimilarArtists::query(const GetSimilarArtistsParams ¶ms) const { +QUrlQuery GetSimilarArtistsLoader::query(const GetSimilarArtistsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getsimilaritems.cpp b/core/src/loader/http/getsimilaritems.cpp index d693a0d..a0dbe3a 100644 --- a/core/src/loader/http/getsimilaritems.cpp +++ b/core/src/loader/http/getsimilaritems.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetSimilarItems::GetSimilarItems(ApiClient *apiClient) +GetSimilarItemsLoader::GetSimilarItemsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetSimilarItems::path(const GetSimilarItemsParams ¶ms) const { +QString GetSimilarItemsLoader::path(const GetSimilarItemsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Items/") + Support::toString(params.itemId()) + QStringLiteral("/Similar"); } -QUrlQuery GetSimilarItems::query(const GetSimilarItemsParams ¶ms) const { +QUrlQuery GetSimilarItemsLoader::query(const GetSimilarItemsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getsimilarmovies.cpp b/core/src/loader/http/getsimilarmovies.cpp index 7d4da14..1425abe 100644 --- a/core/src/loader/http/getsimilarmovies.cpp +++ b/core/src/loader/http/getsimilarmovies.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetSimilarMovies::GetSimilarMovies(ApiClient *apiClient) +GetSimilarMoviesLoader::GetSimilarMoviesLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetSimilarMovies::path(const GetSimilarMoviesParams ¶ms) const { +QString GetSimilarMoviesLoader::path(const GetSimilarMoviesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Movies/") + Support::toString(params.itemId()) + QStringLiteral("/Similar"); } -QUrlQuery GetSimilarMovies::query(const GetSimilarMoviesParams ¶ms) const { +QUrlQuery GetSimilarMoviesLoader::query(const GetSimilarMoviesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getsimilarshows.cpp b/core/src/loader/http/getsimilarshows.cpp index bc76e20..be29c16 100644 --- a/core/src/loader/http/getsimilarshows.cpp +++ b/core/src/loader/http/getsimilarshows.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetSimilarShows::GetSimilarShows(ApiClient *apiClient) +GetSimilarShowsLoader::GetSimilarShowsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetSimilarShows::path(const GetSimilarShowsParams ¶ms) const { +QString GetSimilarShowsLoader::path(const GetSimilarShowsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Shows/") + Support::toString(params.itemId()) + QStringLiteral("/Similar"); } -QUrlQuery GetSimilarShows::query(const GetSimilarShowsParams ¶ms) const { +QUrlQuery GetSimilarShowsLoader::query(const GetSimilarShowsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getsimilartrailers.cpp b/core/src/loader/http/getsimilartrailers.cpp index 093985c..bf2ac8a 100644 --- a/core/src/loader/http/getsimilartrailers.cpp +++ b/core/src/loader/http/getsimilartrailers.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetSimilarTrailers::GetSimilarTrailers(ApiClient *apiClient) +GetSimilarTrailersLoader::GetSimilarTrailersLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetSimilarTrailers::path(const GetSimilarTrailersParams ¶ms) const { +QString GetSimilarTrailersLoader::path(const GetSimilarTrailersParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Trailers/") + Support::toString(params.itemId()) + QStringLiteral("/Similar"); } -QUrlQuery GetSimilarTrailers::query(const GetSimilarTrailersParams ¶ms) const { +QUrlQuery GetSimilarTrailersLoader::query(const GetSimilarTrailersParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getstartupconfiguration.cpp b/core/src/loader/http/getstartupconfiguration.cpp index ffc1b9d..3bf4b5b 100644 --- a/core/src/loader/http/getstartupconfiguration.cpp +++ b/core/src/loader/http/getstartupconfiguration.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetStartupConfiguration::GetStartupConfiguration(ApiClient *apiClient) +GetStartupConfigurationLoader::GetStartupConfigurationLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetStartupConfiguration::path(const GetStartupConfigurationParams ¶ms) const { +QString GetStartupConfigurationLoader::path(const GetStartupConfigurationParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Startup/Configuration"); } -QUrlQuery GetStartupConfiguration::query(const GetStartupConfigurationParams ¶ms) const { +QUrlQuery GetStartupConfigurationLoader::query(const GetStartupConfigurationParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getstatus.cpp b/core/src/loader/http/getstatus.cpp index e053234..6c2def7 100644 --- a/core/src/loader/http/getstatus.cpp +++ b/core/src/loader/http/getstatus.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetStatus::GetStatus(ApiClient *apiClient) +GetStatusLoader::GetStatusLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetStatus::path(const GetStatusParams ¶ms) const { +QString GetStatusLoader::path(const GetStatusParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/QuickConnect/Status"); } -QUrlQuery GetStatus::query(const GetStatusParams ¶ms) const { +QUrlQuery GetStatusLoader::query(const GetStatusParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getstudio.cpp b/core/src/loader/http/getstudio.cpp index 05621a1..1b10248 100644 --- a/core/src/loader/http/getstudio.cpp +++ b/core/src/loader/http/getstudio.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetStudio::GetStudio(ApiClient *apiClient) +GetStudioLoader::GetStudioLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetStudio::path(const GetStudioParams ¶ms) const { +QString GetStudioLoader::path(const GetStudioParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Studios/") + Support::toString(params.name()) ; } -QUrlQuery GetStudio::query(const GetStudioParams ¶ms) const { +QUrlQuery GetStudioLoader::query(const GetStudioParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getstudios.cpp b/core/src/loader/http/getstudios.cpp index 284eb67..48a5fe1 100644 --- a/core/src/loader/http/getstudios.cpp +++ b/core/src/loader/http/getstudios.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetStudios::GetStudios(ApiClient *apiClient) +GetStudiosLoader::GetStudiosLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetStudios::path(const GetStudiosParams ¶ms) const { +QString GetStudiosLoader::path(const GetStudiosParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Studios"); } -QUrlQuery GetStudios::query(const GetStudiosParams ¶ms) const { +QUrlQuery GetStudiosLoader::query(const GetStudiosParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getsuggestions.cpp b/core/src/loader/http/getsuggestions.cpp index 5daa941..df30ffb 100644 --- a/core/src/loader/http/getsuggestions.cpp +++ b/core/src/loader/http/getsuggestions.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetSuggestions::GetSuggestions(ApiClient *apiClient) +GetSuggestionsLoader::GetSuggestionsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetSuggestions::path(const GetSuggestionsParams ¶ms) const { +QString GetSuggestionsLoader::path(const GetSuggestionsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/") + Support::toString(params.userId()) + QStringLiteral("/Suggestions"); } -QUrlQuery GetSuggestions::query(const GetSuggestionsParams ¶ms) const { +QUrlQuery GetSuggestionsLoader::query(const GetSuggestionsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getsysteminfo.cpp b/core/src/loader/http/getsysteminfo.cpp index acf4675..4b20d70 100644 --- a/core/src/loader/http/getsysteminfo.cpp +++ b/core/src/loader/http/getsysteminfo.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetSystemInfo::GetSystemInfo(ApiClient *apiClient) +GetSystemInfoLoader::GetSystemInfoLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetSystemInfo::path(const GetSystemInfoParams ¶ms) const { +QString GetSystemInfoLoader::path(const GetSystemInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/System/Info"); } -QUrlQuery GetSystemInfo::query(const GetSystemInfoParams ¶ms) const { +QUrlQuery GetSystemInfoLoader::query(const GetSystemInfoParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/gettask.cpp b/core/src/loader/http/gettask.cpp index f498bb9..b3f4b8a 100644 --- a/core/src/loader/http/gettask.cpp +++ b/core/src/loader/http/gettask.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetTask::GetTask(ApiClient *apiClient) +GetTaskLoader::GetTaskLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetTask::path(const GetTaskParams ¶ms) const { +QString GetTaskLoader::path(const GetTaskParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/ScheduledTasks/") + Support::toString(params.taskId()) ; } -QUrlQuery GetTask::query(const GetTaskParams ¶ms) const { +QUrlQuery GetTaskLoader::query(const GetTaskParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getthememedia.cpp b/core/src/loader/http/getthememedia.cpp index 02428b0..66499b0 100644 --- a/core/src/loader/http/getthememedia.cpp +++ b/core/src/loader/http/getthememedia.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetThemeMedia::GetThemeMedia(ApiClient *apiClient) +GetThemeMediaLoader::GetThemeMediaLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetThemeMedia::path(const GetThemeMediaParams ¶ms) const { +QString GetThemeMediaLoader::path(const GetThemeMediaParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Items/") + Support::toString(params.itemId()) + QStringLiteral("/ThemeMedia"); } -QUrlQuery GetThemeMedia::query(const GetThemeMediaParams ¶ms) const { +QUrlQuery GetThemeMediaLoader::query(const GetThemeMediaParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getthemesongs.cpp b/core/src/loader/http/getthemesongs.cpp index 7095beb..f5472bd 100644 --- a/core/src/loader/http/getthemesongs.cpp +++ b/core/src/loader/http/getthemesongs.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetThemeSongs::GetThemeSongs(ApiClient *apiClient) +GetThemeSongsLoader::GetThemeSongsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetThemeSongs::path(const GetThemeSongsParams ¶ms) const { +QString GetThemeSongsLoader::path(const GetThemeSongsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Items/") + Support::toString(params.itemId()) + QStringLiteral("/ThemeSongs"); } -QUrlQuery GetThemeSongs::query(const GetThemeSongsParams ¶ms) const { +QUrlQuery GetThemeSongsLoader::query(const GetThemeSongsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getthemevideos.cpp b/core/src/loader/http/getthemevideos.cpp index e83d8e2..250aaa0 100644 --- a/core/src/loader/http/getthemevideos.cpp +++ b/core/src/loader/http/getthemevideos.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetThemeVideos::GetThemeVideos(ApiClient *apiClient) +GetThemeVideosLoader::GetThemeVideosLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetThemeVideos::path(const GetThemeVideosParams ¶ms) const { +QString GetThemeVideosLoader::path(const GetThemeVideosParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Items/") + Support::toString(params.itemId()) + QStringLiteral("/ThemeVideos"); } -QUrlQuery GetThemeVideos::query(const GetThemeVideosParams ¶ms) const { +QUrlQuery GetThemeVideosLoader::query(const GetThemeVideosParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/gettimer.cpp b/core/src/loader/http/gettimer.cpp index 9876379..752147d 100644 --- a/core/src/loader/http/gettimer.cpp +++ b/core/src/loader/http/gettimer.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetTimer::GetTimer(ApiClient *apiClient) +GetTimerLoader::GetTimerLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetTimer::path(const GetTimerParams ¶ms) const { +QString GetTimerLoader::path(const GetTimerParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/Timers/") + Support::toString(params.timerId()) ; } -QUrlQuery GetTimer::query(const GetTimerParams ¶ms) const { +QUrlQuery GetTimerLoader::query(const GetTimerParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/gettimers.cpp b/core/src/loader/http/gettimers.cpp index e477ad6..9b331db 100644 --- a/core/src/loader/http/gettimers.cpp +++ b/core/src/loader/http/gettimers.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetTimers::GetTimers(ApiClient *apiClient) +GetTimersLoader::GetTimersLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetTimers::path(const GetTimersParams ¶ms) const { +QString GetTimersLoader::path(const GetTimersParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/Timers"); } -QUrlQuery GetTimers::query(const GetTimersParams ¶ms) const { +QUrlQuery GetTimersLoader::query(const GetTimersParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/gettrailers.cpp b/core/src/loader/http/gettrailers.cpp index 8047574..4ea942a 100644 --- a/core/src/loader/http/gettrailers.cpp +++ b/core/src/loader/http/gettrailers.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetTrailers::GetTrailers(ApiClient *apiClient) +GetTrailersLoader::GetTrailersLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetTrailers::path(const GetTrailersParams ¶ms) const { +QString GetTrailersLoader::path(const GetTrailersParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Trailers"); } -QUrlQuery GetTrailers::query(const GetTrailersParams ¶ms) const { +QUrlQuery GetTrailersLoader::query(const GetTrailersParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getupcomingepisodes.cpp b/core/src/loader/http/getupcomingepisodes.cpp index 8c749f5..a363004 100644 --- a/core/src/loader/http/getupcomingepisodes.cpp +++ b/core/src/loader/http/getupcomingepisodes.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetUpcomingEpisodes::GetUpcomingEpisodes(ApiClient *apiClient) +GetUpcomingEpisodesLoader::GetUpcomingEpisodesLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetUpcomingEpisodes::path(const GetUpcomingEpisodesParams ¶ms) const { +QString GetUpcomingEpisodesLoader::path(const GetUpcomingEpisodesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Shows/Upcoming"); } -QUrlQuery GetUpcomingEpisodes::query(const GetUpcomingEpisodesParams ¶ms) const { +QUrlQuery GetUpcomingEpisodesLoader::query(const GetUpcomingEpisodesParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getuserbyid.cpp b/core/src/loader/http/getuserbyid.cpp index 89bcf85..59b0b79 100644 --- a/core/src/loader/http/getuserbyid.cpp +++ b/core/src/loader/http/getuserbyid.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetUserById::GetUserById(ApiClient *apiClient) +GetUserByIdLoader::GetUserByIdLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetUserById::path(const GetUserByIdParams ¶ms) const { +QString GetUserByIdLoader::path(const GetUserByIdParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/") + Support::toString(params.userId()) ; } -QUrlQuery GetUserById::query(const GetUserByIdParams ¶ms) const { +QUrlQuery GetUserByIdLoader::query(const GetUserByIdParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getuserviews.cpp b/core/src/loader/http/getuserviews.cpp index a842e37..0739174 100644 --- a/core/src/loader/http/getuserviews.cpp +++ b/core/src/loader/http/getuserviews.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetUserViews::GetUserViews(ApiClient *apiClient) +GetUserViewsLoader::GetUserViewsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetUserViews::path(const GetUserViewsParams ¶ms) const { +QString GetUserViewsLoader::path(const GetUserViewsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/") + Support::toString(params.userId()) + QStringLiteral("/Views"); } -QUrlQuery GetUserViews::query(const GetUserViewsParams ¶ms) const { +QUrlQuery GetUserViewsLoader::query(const GetUserViewsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getutctime.cpp b/core/src/loader/http/getutctime.cpp index 2730de0..5b6d485 100644 --- a/core/src/loader/http/getutctime.cpp +++ b/core/src/loader/http/getutctime.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetUtcTime::GetUtcTime(ApiClient *apiClient) +GetUtcTimeLoader::GetUtcTimeLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetUtcTime::path(const GetUtcTimeParams ¶ms) const { +QString GetUtcTimeLoader::path(const GetUtcTimeParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/GetUtcTime"); } -QUrlQuery GetUtcTime::query(const GetUtcTimeParams ¶ms) const { +QUrlQuery GetUtcTimeLoader::query(const GetUtcTimeParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getyear.cpp b/core/src/loader/http/getyear.cpp index 08e3b42..ccd59e9 100644 --- a/core/src/loader/http/getyear.cpp +++ b/core/src/loader/http/getyear.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetYear::GetYear(ApiClient *apiClient) +GetYearLoader::GetYearLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetYear::path(const GetYearParams ¶ms) const { +QString GetYearLoader::path(const GetYearParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Years/") + Support::toString(params.year()) ; } -QUrlQuery GetYear::query(const GetYearParams ¶ms) const { +QUrlQuery GetYearLoader::query(const GetYearParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/getyears.cpp b/core/src/loader/http/getyears.cpp index 254eb1a..c46813f 100644 --- a/core/src/loader/http/getyears.cpp +++ b/core/src/loader/http/getyears.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -GetYears::GetYears(ApiClient *apiClient) +GetYearsLoader::GetYearsLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString GetYears::path(const GetYearsParams ¶ms) const { +QString GetYearsLoader::path(const GetYearsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Years"); } -QUrlQuery GetYears::query(const GetYearsParams ¶ms) const { +QUrlQuery GetYearsLoader::query(const GetYearsParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/initiate.cpp b/core/src/loader/http/initiate.cpp index 92c0cfb..c3c6bb8 100644 --- a/core/src/loader/http/initiate.cpp +++ b/core/src/loader/http/initiate.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -Initiate::Initiate(ApiClient *apiClient) +InitiateLoader::InitiateLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString Initiate::path(const InitiateParams ¶ms) const { +QString InitiateLoader::path(const InitiateParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/QuickConnect/Initiate"); } -QUrlQuery Initiate::query(const InitiateParams ¶ms) const { +QUrlQuery InitiateLoader::query(const InitiateParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/markfavoriteitem.cpp b/core/src/loader/http/markfavoriteitem.cpp index a743787..00d4254 100644 --- a/core/src/loader/http/markfavoriteitem.cpp +++ b/core/src/loader/http/markfavoriteitem.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -MarkFavoriteItem::MarkFavoriteItem(ApiClient *apiClient) +MarkFavoriteItemLoader::MarkFavoriteItemLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString MarkFavoriteItem::path(const MarkFavoriteItemParams ¶ms) const { +QString MarkFavoriteItemLoader::path(const MarkFavoriteItemParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/") + Support::toString(params.userId()) + QStringLiteral("/FavoriteItems/") + Support::toString(params.itemId()) ; } -QUrlQuery MarkFavoriteItem::query(const MarkFavoriteItemParams ¶ms) const { +QUrlQuery MarkFavoriteItemLoader::query(const MarkFavoriteItemParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/markplayeditem.cpp b/core/src/loader/http/markplayeditem.cpp index f0e8a13..db4c961 100644 --- a/core/src/loader/http/markplayeditem.cpp +++ b/core/src/loader/http/markplayeditem.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -MarkPlayedItem::MarkPlayedItem(ApiClient *apiClient) +MarkPlayedItemLoader::MarkPlayedItemLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString MarkPlayedItem::path(const MarkPlayedItemParams ¶ms) const { +QString MarkPlayedItemLoader::path(const MarkPlayedItemParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/") + Support::toString(params.userId()) + QStringLiteral("/PlayedItems/") + Support::toString(params.itemId()) ; } -QUrlQuery MarkPlayedItem::query(const MarkPlayedItemParams ¶ms) const { +QUrlQuery MarkPlayedItemLoader::query(const MarkPlayedItemParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/markunplayeditem.cpp b/core/src/loader/http/markunplayeditem.cpp index ab3e5f2..29a349b 100644 --- a/core/src/loader/http/markunplayeditem.cpp +++ b/core/src/loader/http/markunplayeditem.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -MarkUnplayedItem::MarkUnplayedItem(ApiClient *apiClient) +MarkUnplayedItemLoader::MarkUnplayedItemLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString MarkUnplayedItem::path(const MarkUnplayedItemParams ¶ms) const { +QString MarkUnplayedItemLoader::path(const MarkUnplayedItemParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/") + Support::toString(params.userId()) + QStringLiteral("/PlayedItems/") + Support::toString(params.itemId()) ; } -QUrlQuery MarkUnplayedItem::query(const MarkUnplayedItemParams ¶ms) const { +QUrlQuery MarkUnplayedItemLoader::query(const MarkUnplayedItemParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/openlivestream.cpp b/core/src/loader/http/openlivestream.cpp index 7489cf1..0924b62 100644 --- a/core/src/loader/http/openlivestream.cpp +++ b/core/src/loader/http/openlivestream.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -OpenLiveStream::OpenLiveStream(ApiClient *apiClient) +OpenLiveStreamLoader::OpenLiveStreamLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString OpenLiveStream::path(const OpenLiveStreamParams ¶ms) const { +QString OpenLiveStreamLoader::path(const OpenLiveStreamParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveStreams/Open"); } -QUrlQuery OpenLiveStream::query(const OpenLiveStreamParams ¶ms) const { +QUrlQuery OpenLiveStreamLoader::query(const OpenLiveStreamParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/setchannelmapping.cpp b/core/src/loader/http/setchannelmapping.cpp index ff8e083..f61e8b5 100644 --- a/core/src/loader/http/setchannelmapping.cpp +++ b/core/src/loader/http/setchannelmapping.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -SetChannelMapping::SetChannelMapping(ApiClient *apiClient) +SetChannelMappingLoader::SetChannelMappingLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString SetChannelMapping::path(const SetChannelMappingParams ¶ms) const { +QString SetChannelMappingLoader::path(const SetChannelMappingParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/LiveTv/ChannelMappings"); } -QUrlQuery SetChannelMapping::query(const SetChannelMappingParams ¶ms) const { +QUrlQuery SetChannelMappingLoader::query(const SetChannelMappingParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/unmarkfavoriteitem.cpp b/core/src/loader/http/unmarkfavoriteitem.cpp index 3346053..126e0c8 100644 --- a/core/src/loader/http/unmarkfavoriteitem.cpp +++ b/core/src/loader/http/unmarkfavoriteitem.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -UnmarkFavoriteItem::UnmarkFavoriteItem(ApiClient *apiClient) +UnmarkFavoriteItemLoader::UnmarkFavoriteItemLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString UnmarkFavoriteItem::path(const UnmarkFavoriteItemParams ¶ms) const { +QString UnmarkFavoriteItemLoader::path(const UnmarkFavoriteItemParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/") + Support::toString(params.userId()) + QStringLiteral("/FavoriteItems/") + Support::toString(params.itemId()) ; } -QUrlQuery UnmarkFavoriteItem::query(const UnmarkFavoriteItemParams ¶ms) const { +QUrlQuery UnmarkFavoriteItemLoader::query(const UnmarkFavoriteItemParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/loader/http/updateuseritemrating.cpp b/core/src/loader/http/updateuseritemrating.cpp index f72d757..0bd3d15 100644 --- a/core/src/loader/http/updateuseritemrating.cpp +++ b/core/src/loader/http/updateuseritemrating.cpp @@ -34,16 +34,16 @@ namespace Loader { namespace HTTP { -UpdateUserItemRating::UpdateUserItemRating(ApiClient *apiClient) +UpdateUserItemRatingLoader::UpdateUserItemRatingLoader(ApiClient *apiClient) : Jellyfin::Support::HttpLoader(apiClient) {} -QString UpdateUserItemRating::path(const UpdateUserItemRatingParams ¶ms) const { +QString UpdateUserItemRatingLoader::path(const UpdateUserItemRatingParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings return QStringLiteral("/Users/") + Support::toString(params.userId()) + QStringLiteral("/Items/") + Support::toString(params.itemId()) + QStringLiteral("/Rating"); } -QUrlQuery UpdateUserItemRating::query(const UpdateUserItemRatingParams ¶ms) const { +QUrlQuery UpdateUserItemRatingLoader::query(const UpdateUserItemRatingParams ¶ms) const { Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings QUrlQuery result; diff --git a/core/src/support/loader.cpp b/core/src/support/loader.cpp index dcf6175..142a7be 100644 --- a/core/src/support/loader.cpp +++ b/core/src/support/loader.cpp @@ -25,5 +25,13 @@ const char *LoadException::what() const noexcept { return m_message.c_str(); } +QException *LoadException::clone() const { + return new LoadException(*this); +} + +void LoadException::raise() const { + throw *this; +} + } } diff --git a/core/src/viewmodel/item.cpp b/core/src/viewmodel/item.cpp index 1e9df2b..8da4aa4 100644 --- a/core/src/viewmodel/item.cpp +++ b/core/src/viewmodel/item.cpp @@ -36,7 +36,7 @@ void Item::setData(QSharedPointer newData) { // ItemLoader ItemLoader::ItemLoader(QObject *parent) - : BaseClass(Jellyfin::Loader::HTTP::GetItem(), parent) { + : BaseClass(Jellyfin::Loader::HTTP::GetItemLoader(), parent) { } void ItemLoader::onApiClientChanged(ApiClient *newApiClient) { diff --git a/core/src/viewmodel/itemmodel.cpp b/core/src/viewmodel/itemmodel.cpp new file mode 100644 index 0000000..519267f --- /dev/null +++ b/core/src/viewmodel/itemmodel.cpp @@ -0,0 +1,77 @@ +/* + * Sailfin: a Jellyfin client written using Qt + * Copyright (C) 2021 Chris Josten and the Sailfin Contributors. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include "JellyfinQt/viewmodel/itemmodel.h" + +#define JF_CASE(roleName) case roleName: \ + return QVariant(item.roleName()); + +namespace Jellyfin { + +namespace ViewModel { + +UserViewsLoader::UserViewsLoader(QObject *parent) + : UserViewsLoaderBase(Loader::HTTP::GetUserViewsLoader(), parent) {} + +void UserViewsLoader::apiClientChanged(ApiClient *newApiClient) { + if (m_apiClient != nullptr) disconnect(m_apiClient, &ApiClient::userIdChanged, this, &UserViewsLoader::userIdChanged); + if (newApiClient != nullptr) connect(newApiClient, &ApiClient::userIdChanged, this, &UserViewsLoader::userIdChanged); +} + +void UserViewsLoader::userIdChanged(const QString &newUserId) { + m_parameters.setUserId(newUserId); + autoReloadIfNeeded(); +} +void UserItemsLoader::apiClientChanged(ApiClient *newApiClient) { + if (m_apiClient != nullptr) disconnect(m_apiClient, &ApiClient::userIdChanged, this, &UserItemsLoader::userIdChanged); + if (newApiClient != nullptr) connect(newApiClient, &ApiClient::userIdChanged, this, &UserItemsLoader::userIdChanged); +} + +void UserItemsLoader::userIdChanged(const QString &newUserId) { + m_parameters.setUserId(newUserId); + autoReloadIfNeeded(); +} + +ItemModel::ItemModel(QObject *parent) + : ApiModel(parent) { } + +QVariant ItemModel::data(const QModelIndex &index, int role) const { + if (role <= Qt::UserRole || !index.isValid()) return QVariant(); + int row = index.row(); + if (row < 0 || row >= m_array.size()) return QVariant(); + Model::Item item = m_array[row]; + switch(role) { + JF_CASE(jellyfinId) + JF_CASE(name) + JF_CASE(originalTitle) + JF_CASE(serverId) + JF_CASE(etag) + JF_CASE(sourceType) + JF_CASE(playlistItemId) + JF_CASE(dateCreated) + JF_CASE(dateLastMediaAdded) + JF_CASE(extraType) + default: + return QVariant(); + } + +} + +} // NS ViewModel + +} // NS Jellyfin diff --git a/qtquick/qml/pages/MainPage.qml b/qtquick/qml/pages/MainPage.qml index dda07f8..24c42e1 100644 --- a/qtquick/qml/pages/MainPage.qml +++ b/qtquick/qml/pages/MainPage.qml @@ -6,6 +6,7 @@ import nl.netsoj.chris.Jellyfin 1.0 as J import "../components" import "../.." +import ".." Page { property bool _modelsLoaded: false @@ -18,9 +19,12 @@ Page { } } - J.UserViewModel { + J.ItemModel { id: mediaLibraryModel - apiClient: ApiClient + loader: J.UsersViewLoader { + id: mediaLibraryModelLoader + apiClient: ApiClient + } } ScrollView { @@ -33,12 +37,12 @@ Page { model: mediaLibraryModel Column { width: parent.width - J.UserItemLatestModel { + /*J.UserItemLatestModel { id: userItemModel apiClient: ApiClient parentId: model.id limit: 16 - } + }*/ Label { text: model.name } @@ -47,7 +51,7 @@ Page { width: parent.width height: SailfinStyle.unit * 20 orientation: ListView.Horizontal - model: userItemModel + model: 10 // userItemModel delegate: ItemDelegate { width: 12 * SailfinStyle.unit height: 20 * SailfinStyle.unit @@ -65,10 +69,10 @@ Page { } } Connections { - target: mediaLibraryModel - onStatusChanged: { - if (mediaLibraryModel.status == UserItemModel.Ready) { - userItemModel.reload() + target: mediaLibraryModelLoader + onReady: { + if (mediaLibraryModelLoader.status === ModelStatus.Ready) { + //userItemModel.reload() } } }