Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6495 from jbroadus/update-libmygpo-qt 

Update to libmygpo-qt 1.1.0.
This commit is contained in:
John Maguire 2020-01-04 00:42:57 +00:00 committed by GitHub
parent 2aa81af6ca c246142951
commit 0308a3f9a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 69 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3rdparty/libmygpo-qt5/CMakeLists.txt vendored
View File

@ -19,8 +19,8 @@ set(MYGPO_QT4_QJSON_DEP "")
# set(QT_USE_IMPORTED_TARGETS TRUE)
set( MYGPO_QT_VERSION_MAJOR "1" )
set( MYGPO_QT_VERSION_MINOR "0" )
set( MYGPO_QT_VERSION_PATCH "8" )
set( MYGPO_QT_VERSION_MINOR "1" )
set( MYGPO_QT_VERSION_PATCH "0" )
set( MYGPO_QT_VERSION "${MYGPO_QT_VERSION_MAJOR}.${MYGPO_QT_VERSION_MINOR}.${MYGPO_QT_VERSION_PATCH}" )
#Configure Version.h.in with the actual version number
@ -44,7 +44,6 @@ if (CMAKE_COMPILER_IS_GNUCXX)
endif()
endif(CMAKE_COMPILER_IS_GNUCXX)
set(MYGPO_QT_TARGET_NAME mygpo-qt${MYGPO_QT_VERSION_SUFFIX} CACHE INTERNAL "" FORCE )
add_subdirectory( src )

4
3rdparty/libmygpo-qt5/Mygpo-qtConfig.cmake.in vendored
View File

@ -11,8 +11,8 @@ set(MYGPO_QT_VERSION ${MYGPO_QT_VERSION_MAJOR}.${MYGPO_QT_VERSION_MINOR}.${MYGPO
set(LIBMYGPO_QT_INCLUDE_DIRS "@INCLUDE_INSTALL_DIR@")
# import the exported targets
include(${myDir}/Mygpo-qtTargets.cmake)
include(${myDir}/Mygpo-qt@MYGPO_QT_VERSION_SUFFIX@Targets.cmake)
# set the expected library variable
set(LIBMYGPO_QT_LIBRARIES mygpo-qt )
set(LIBMYGPO_QT_LIBRARIES mygpo-qt@MYGPO_QT_VERSION_SUFFIX@ )
set(LIBMYGPO_QT_FOUND "True")

18
3rdparty/libmygpo-qt5/README vendored
View File

@ -6,7 +6,7 @@ libmygpo-qt is a Qt Library that wraps the gpodder.net Web API (http://wiki.gpod
=== Copyright & License ===
Copyright 2010 - 2014 Stefan Derkits (stefan@derkits.at) , Christian Wagner (christian.wagner86@gmx.at) & Felix Winter (ixos01@gmail.com)
Copyright 2010 - 2018 Stefan Derkits (stefan@derkits.at) , Christian Wagner (christian.wagner86@gmx.at) & Felix Winter (ixos01@gmail.com)
See COPYING File for License
@ -16,25 +16,15 @@ Current Maintainer: Stefan Derkits (HorusHorrendus @ irc.freenode.net)
=== Requirements ===
-) Qt 4.6 or higher
-) Cmake 2.6 or higher
-) QJson
=== Qt5 Support ===
libmygpo-qt version 1.0.8 supports also building the library with Qt5. The API is the same as in the Qt4 library. To build the library with Qt5 add "-DBUILD_WITH_QT4=OFF" to your CMake
command line. Please note that Qt5 support is still experimental. If you find anything to not work with Qt5, please report a bug.
==== Qt5 Requirements ===
-) CMake 2.8.9 or higher
-) Qt 5.2 or higher
-) CMake 2.8.9 or higher
-) QJson
=== Links ===
Homepage: http://wiki.gpodder.org/wiki/Libmygpo-qt
Git Repo: https://github.com/gpodder/libmygpo-qt
Doxygen Documentation: http://stefan.derkits.at/libmygpo-doc/
Doxygen Documentation: http://stefan.derkits.at/libmygpo-doc/
Bugreports: http://bugs.gpodder.org
Contact: gpodder@freelists.org
IRC Channel: #gpodder on FreeNode (irc.freenode.net)

7
3rdparty/libmygpo-qt5/src/Podcast.cpp vendored
View File

@ -145,9 +145,12 @@ bool PodcastPrivate::parse( const QVariant& data )
return false;
QVariantMap podcastMap = data.toMap();
QVariant v = podcastMap.value( QLatin1String( "url" ) );
if ( !v.canConvert( QVariant::Url ) )
if ( !v.canConvert( QVariant::ByteArray ) )
return false;
m_url = v.toUrl();
m_url = QUrl::fromEncoded(v.toByteArray(), QUrl::StrictMode);
if (!m_url.isValid()) {
return false;
}
v = podcastMap.value( QLatin1String( "title" ) );
if ( !v.canConvert( QVariant::String ) )
return false;

76
3rdparty/libmygpo-qt5/src/UrlBuilder.cpp vendored
View File

@ -30,7 +30,6 @@
using namespace mygpo;
const QString UrlBuilder::s_server = Config::instance()->mygpoBaseUrl().toString();
const QString UrlBuilder::s_api2 = QLatin1String( "/api/2" );
const QString UrlBuilder::s_api1 = QLatin1String( "/api/1" );
@ -58,93 +57,110 @@ static QString getFormatExtension( UrlBuilder::Format f )
QString UrlBuilder::getToplistUrl( uint i, Format f )
{
QString numString = QString::number(( i == 0 ) ? 1 : i );
return s_server % QLatin1String( "/toplist/" ) % numString % getFormatExtension( f );
return Config::instance()->mygpoBaseUrl().toString() %
QLatin1String( "/toplist/" ) % numString % getFormatExtension( f );
}
QString UrlBuilder::getSuggestionsUrl( uint i, Format f )
{
QString numString = QString::number(( i == 0 ) ? 1 : i );
return s_server % QLatin1String( "/suggestions/" ) % numString % getFormatExtension( f );
return Config::instance()->mygpoBaseUrl().toString() %
QLatin1String( "/suggestions/" ) % numString % getFormatExtension( f );
}
QString UrlBuilder::getPodcastSearchUrl( const QString& query, Format f )
{
return s_server % QLatin1String( "/search" ) % getFormatExtension( f ) % QLatin1String( "?q=" ) % query;
return Config::instance()->mygpoBaseUrl().toString() %
QLatin1String( "/search" ) % getFormatExtension( f ) % QLatin1String( "?q=" ) % query;
}
QString UrlBuilder::getSubscriptionsUrl( const QString& username, const QString& device, UrlBuilder::Format f)
{
QString deviceString = device.isNull() ? QString(QLatin1String("")) : (QLatin1String( "/" ) % device);
return s_server % QLatin1String( "/subscriptions/" ) % username % deviceString % getFormatExtension( f );
return Config::instance()->mygpoBaseUrl().toString() %
QLatin1String( "/subscriptions/" ) % username % deviceString % getFormatExtension( f );
}
QString UrlBuilder::getTopTagsUrl( uint i )
{
QString numString = QString::number(( i == 0 ) ? 1 : i );
return s_server % s_api2 % QLatin1String( "/tags/" ) % numString % QLatin1String( ".json" );
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/tags/" ) % numString % QLatin1String( ".json" );
}
QString UrlBuilder::getPodcastsOfTagUrl( const QString& tag, uint i )
{
QString numString = QString::number(( i == 0 ) ? 1 : i );
return s_server % s_api2 % QLatin1String( "/tag/" ) % tag % QLatin1String( "/" ) % numString % QLatin1String( ".json" );
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/tag/" ) % tag % QLatin1String( "/" ) % numString % QLatin1String( ".json" );
}
QString UrlBuilder::getPodcastDataUrl( const QString& url )
{
return s_server % s_api2 % QLatin1String( "/data/podcast" ) % QLatin1String( ".json" ) % QLatin1String( "?url=" ) % url;
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/data/podcast" ) % QLatin1String( ".json" ) % QLatin1String( "?url=" ) % url;
}
QString UrlBuilder::getEpisodeDataUrl( const QString& podcastUrl, const QString& episodeUrl )
{
return s_server % s_api2 % QLatin1String( "/data/episode" ) % QLatin1String( ".json" ) % QLatin1String( "?podcast=" ) % podcastUrl % QLatin1String( "&url=" ) % episodeUrl;
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/data/episode" ) % QLatin1String( ".json" ) % QLatin1String( "?podcast=" ) % podcastUrl % QLatin1String( "&url=" ) % episodeUrl;
}
QString UrlBuilder::getFavEpisodesUrl( const QString& username )
{
return s_server % s_api2 % QLatin1String( "/favorites/" ) % username % QLatin1String( ".json" );
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/favorites/" ) % username % QLatin1String( ".json" );
}
QString UrlBuilder::getAddRemoveSubUrl( const QString& username, const QString& deviceId )
{
return s_server % s_api2 % QLatin1String( "/subscriptions/" ) % username % QLatin1String( "/" ) % deviceId % QLatin1String( ".json" );
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/subscriptions/" ) % username % QLatin1String( "/" ) % deviceId % QLatin1String( ".json" );
}
QString UrlBuilder::getAccountSettingsUrl( const QString& username )
{
return s_server % s_api2 % QLatin1String( "/settings/" ) % username % QLatin1String( "/account" ) % QLatin1String( ".json" );
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/settings/" ) % username % QLatin1String( "/account" ) % QLatin1String( ".json" );
}
QString UrlBuilder::getDeviceSettingsUrl( const QString& username, const QString& deviceId )
{
return s_server % s_api2 % QLatin1String( "/settings/" ) % username % QLatin1String( "/device" ) % QLatin1String( ".json" ) % QLatin1String( "?device=" ) % deviceId;
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/settings/" ) % username % QLatin1String( "/device" ) % QLatin1String( ".json" ) % QLatin1String( "?device=" ) % deviceId;
}
QString UrlBuilder::getPodcastSettingsUrl( const QString& username, const QString& podcastUrl )
{
return s_server % s_api2 % QLatin1String( "/settings/" ) % username % QLatin1String( "/podcast" ) % QLatin1String( ".json" ) % QLatin1String( "?podcast=" ) % podcastUrl;
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/settings/" ) % username % QLatin1String( "/podcast" ) % QLatin1String( ".json" ) % QLatin1String( "?podcast=" ) % podcastUrl;
}
QString UrlBuilder::getEpisodeSettingsUrl( const QString& username, const QString& podcastUrl, const QString& episodeUrl )
{
return s_server % s_api2 % QLatin1String( "/settings/" ) % username % QLatin1String( "/episode" ) % QLatin1String( ".json" ) % QLatin1String( "?podcast=" ) % podcastUrl % QLatin1String( "&episode=" ) % episodeUrl;
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/settings/" ) % username % QLatin1String( "/episode" ) % QLatin1String( ".json" ) % QLatin1String( "?podcast=" ) % podcastUrl % QLatin1String( "&episode=" ) % episodeUrl;
}
QString UrlBuilder::getDeviceListUrl( const QString& username )
{
return s_server % s_api2 % QLatin1String( "/devices/" ) % username % QLatin1String( ".json" ) ;
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/devices/" ) % username % QLatin1String( ".json" ) ;
}
QString UrlBuilder::getDeviceUpdatesUrl( const QString& username, const QString& deviceId, qulonglong timestamp )
{
QString numString = QString::number( timestamp );
return s_server % s_api2 % QLatin1String( "/updates/" ) % username % QLatin1String( "/" ) % deviceId % QLatin1String( ".json?since=" ) % numString;
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/updates/" ) % username % QLatin1String( "/" ) % deviceId % QLatin1String( ".json?since=" ) % numString;
}
QString UrlBuilder::getRenameDeviceUrl( const QString& username, const QString& deviceId )
{
return s_server % s_api2 % QLatin1String( "/devices/" ) % username % QLatin1String( "/" ) % deviceId % QLatin1String( ".json" );
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/devices/" ) % username % QLatin1String( "/" ) % deviceId % QLatin1String( ".json" );
}
QString UrlBuilder::getEpisodeActionsUrl( const QString& username, const bool aggregated )
@ -155,7 +171,8 @@ QString UrlBuilder::getEpisodeActionsUrl( const QString& username, const bool ag
else
agg = QLatin1String( "" );
return s_server % s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json" ) % agg;
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json" ) % agg;
}
QString UrlBuilder::getEpisodeActionsUrlByPodcast( const QString& username, const QString& podcastUrl, const bool aggregated )
@ -166,7 +183,8 @@ QString UrlBuilder::getEpisodeActionsUrlByPodcast( const QString& username, cons
else
agg = QLatin1String( "" );
return s_server % s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?podcast=" ) % podcastUrl % agg;
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?podcast=" ) % podcastUrl % agg;
}
QString UrlBuilder::getEpisodeActionsUrlByDevice( const QString& username, const QString& deviceId, bool aggregated )
@ -177,33 +195,39 @@ QString UrlBuilder::getEpisodeActionsUrlByDevice( const QString& username, const
else
agg = QLatin1String( "" );
return s_server % s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?device=" ) % deviceId % agg;
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?device=" ) % deviceId % agg;
}
QString UrlBuilder::getEpisodeActionsUrlByTimestamp( const QString& username, qulonglong since )
{
QString numString = QString::number( since );
return s_server % s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?since=" ) % numString;
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?since=" ) % numString;
}
QString UrlBuilder::getEpisodeActionsUrlByPodcastAndTimestamp( const QString& username, const QString& podcastUrl, qulonglong since )
{
QString numString = QString::number( since );
return s_server % s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?podcast=" ) % podcastUrl % QLatin1String( "&since=" ) % numString;
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?podcast=" ) % podcastUrl % QLatin1String( "&since=" ) % numString;
}
QString UrlBuilder::getEpisodeActionsUrlByDeviceAndTimestamp( const QString& username, const QString& deviceId, qulonglong since )
{
QString numString = QString::number( since );
return s_server % s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?device=" ) % deviceId % QLatin1String( "&since=" ) % numString;
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?device=" ) % deviceId % QLatin1String( "&since=" ) % numString;
}
QString UrlBuilder::getUploadEpisodeActionsUrl( const QString& username )
{
return s_server % s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json" );
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json" );
}
QString UrlBuilder::getDeviceSynchronizationStatusUrl ( const QString& username )
{
return s_server % s_api2 % QLatin1String( "/sync-devices/" ) % username % QLatin1String( ".json" );
return Config::instance()->mygpoBaseUrl().toString() %
s_api2 % QLatin1String( "/sync-devices/" ) % username % QLatin1String( ".json" );
}

1
3rdparty/libmygpo-qt5/src/UrlBuilder.h vendored
View File

@ -137,7 +137,6 @@ public:
private:
UrlBuilder() {};
UrlBuilder( const UrlBuilder& ) {};
static const QString s_server;
static const QString s_api2;
static const QString s_api1;
};

7
3rdparty/libmygpo-qt5/src/qjsonwrapper/Json.cpp vendored
View File

@ -116,7 +116,12 @@ toJson( const QVariant &variant, bool* ok )
return doc.toJson( QJsonDocument::Compact );
#else
QJson::Serializer serializer;
return serializer.serialize( variant, ok );
QByteArray ret = serializer.serialize( variant );
if ( ok != NULL )
{
*ok = !ret.isNull();
}
return ret;
#endif
}