mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 07:36:48 +02:00
Code Issues Releases Wiki Activity

warnings--

Browse Source
This commit is contained in:
Dominik Schmidt
2013-05-07 09:59:54 +02:00
parent a1a257d352
commit f2d7e27033
9 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/infoplugins/generic/charts/ChartsPlugin.cpp
View File

@@ -238,7 +238,7 @@ ChartsPlugin::fetchChartCapabilitiesFromCache( Tomahawk::InfoSystem::InfoRequest
} }
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Checking cache for " << "InfoChartCapabilities" << m_chartVersion; tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Checking cache for " << "InfoChartCapabilities" << m_chartVersion;
emit getCachedInfo( criteria, 172800000 /* 2 days */, requestData ); emit getCachedInfo( criteria, Q_INT64_C(172800000) /* 2 days */, requestData );
} }
@@ -611,7 +611,7 @@ ChartsPlugin::chartsList()
criteria[ "InfoChartVersion" ] = m_chartVersion; criteria[ "InfoChartVersion" ] = m_chartVersion;
/// We can cache it the lot for 2 days, it will be checked on next request /// We can cache it the lot for 2 days, it will be checked on next request
emit updateCache( criteria, 172800000 /* 2 days */, request.type, m_allChartsMap ); emit updateCache( criteria, Q_INT64_C(172800000) /* 2 days */, request.type, m_allChartsMap );
} }
TomahawkUtils::Cache::instance()->putData( m_cacheIdentifier, 172800000 /* 2 days */, "allCharts", m_allChartsMap ); TomahawkUtils::Cache::instance()->putData( m_cacheIdentifier, 172800000 /* 2 days */, "allCharts", m_allChartsMap );
@@ -747,7 +747,7 @@ ChartsPlugin::chartReturned()
criteria[ "chart_expires" ] = ( ok ? QString::number( expires ) : QString::number( 0 ) ); criteria[ "chart_expires" ] = ( ok ? QString::number( expires ) : QString::number( 0 ) );
/// If the item has expired, cache it for one hour and try and refetch later /// If the item has expired, cache it for one hour and try and refetch later
emit updateCache( criteria, (maxAge == 0 ? 3600000 /* One hour */ : maxAge), requestData.type, returnedData ); emit updateCache( criteria, (maxAge == Q_INT64_C(0) ? Q_INT64_C(3600000) /* One hour */ : maxAge), requestData.type, returnedData );
} }
else else
{ {

4
src/infoplugins/generic/discogs/DiscogsPlugin.cpp
View File

@@ -67,7 +67,7 @@ DiscogsPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
criteria["artist"] = hash["artist"]; criteria["artist"] = hash["artist"];
criteria["album"] = hash["album"]; criteria["album"] = hash["album"];
emit getCachedInfo( criteria, 2419200000, requestData ); emit getCachedInfo( criteria, Q_INT64_C(2419200000), requestData );
break; break;
} }
@@ -184,7 +184,7 @@ DiscogsPlugin::albumInfoSlot( const InfoRequestData& requestData, QNetworkReply*
criteria["artist"] = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>()["artist"]; criteria["artist"] = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>()["artist"];
criteria["album"] = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>()["album"]; criteria["album"] = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>()["album"];
emit updateCache( criteria, 0, requestData.type, returnedData ); emit updateCache( criteria, Q_INT64_C(0), requestData.type, returnedData );
} }

6
src/infoplugins/generic/hypem/HypemPlugin.cpp
View File

@@ -175,7 +175,7 @@ HypemPlugin::fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData )
criteria["chart_source"] = hash["chart_source"]; criteria["chart_source"] = hash["chart_source"];
/// @todo /// @todo
/// set cache time based on wether requested type is 3day, lastweek or recent. /// set cache time based on wether requested type is 3day, lastweek or recent.
emit getCachedInfo( criteria, 86400000, requestData ); emit getCachedInfo( criteria, Q_INT64_C(86400000), requestData );
} }
void void
@@ -188,7 +188,7 @@ HypemPlugin::fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData reque
} }
Tomahawk::InfoSystem::InfoStringHash criteria; Tomahawk::InfoSystem::InfoStringHash criteria;
emit getCachedInfo( criteria, 0, requestData ); emit getCachedInfo( criteria, Q_INT64_C(0), requestData );
} }
void void
@@ -393,7 +393,7 @@ HypemPlugin::chartReturned()
criteria[ "chart_source" ] = origData[ "chart_source" ]; criteria[ "chart_source" ] = origData[ "chart_source" ];
/// @todo /// @todo
/// set cache time based on wether requested type is 3day, lastweek or recent. /// set cache time based on wether requested type is 3day, lastweek or recent.
emit updateCache( criteria, 86400000, requestData.type, returnedData ); emit updateCache( criteria, Q_INT64_C(86400000), requestData.type, returnedData );
} }
else else
qDebug() << "Network error in fetching chart:" << reply->url().toString(); qDebug() << "Network error in fetching chart:" << reply->url().toString();

8
src/infoplugins/generic/musicbrainz/MusicBrainzPlugin.cpp
View File

@@ -64,7 +64,7 @@ MusicBrainzPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
Tomahawk::InfoSystem::InfoStringHash criteria; Tomahawk::InfoSystem::InfoStringHash criteria;
criteria["artist"] = hash["artist"]; criteria["artist"] = hash["artist"];
emit getCachedInfo( criteria, 2419200000, requestData ); emit getCachedInfo( criteria, Q_INT64_C(2419200000), requestData );
break; break;
} }
@@ -74,7 +74,7 @@ MusicBrainzPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
criteria["artist"] = hash["artist"]; criteria["artist"] = hash["artist"];
criteria["album"] = hash["album"]; criteria["album"] = hash["album"];
emit getCachedInfo( criteria, 2419200000, requestData ); emit getCachedInfo( criteria, Q_INT64_C(2419200000), requestData );
break; break;
} }
@@ -193,7 +193,7 @@ MusicBrainzPlugin::gotReleaseGroupsSlot()
Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>(); Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
Tomahawk::InfoSystem::InfoStringHash criteria; Tomahawk::InfoSystem::InfoStringHash criteria;
criteria["artist"] = origData["artist"]; criteria["artist"] = origData["artist"];
emit updateCache( criteria, 0, requestData.type, returnedData ); emit updateCache( criteria, Q_INT64_C(0), requestData.type, returnedData );
break; break;
} }
@@ -292,7 +292,7 @@ MusicBrainzPlugin::gotRecordingsSlot()
Tomahawk::InfoSystem::InfoStringHash criteria; Tomahawk::InfoSystem::InfoStringHash criteria;
criteria["artist"] = origData["artist"]; criteria["artist"] = origData["artist"];
criteria["album"] = origData["album"]; criteria["album"] = origData["album"];
emit updateCache( criteria, 0, requestData.type, returnedData ); emit updateCache( criteria, Q_INT64_C(0), requestData.type, returnedData );
} }
Q_EXPORT_PLUGIN2( Tomahawk::InfoSystem::InfoPlugin, Tomahawk::InfoSystem::MusicBrainzPlugin ) Q_EXPORT_PLUGIN2( Tomahawk::InfoSystem::InfoPlugin, Tomahawk::InfoSystem::MusicBrainzPlugin )

6
src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp
View File

@@ -235,7 +235,7 @@ NewReleasesPlugin::fetchNRCapabilitiesFromCache( InfoRequestData requestData )
} }
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Fetching fetchNRCapabilitiesFromCache"; tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Fetching fetchNRCapabilitiesFromCache";
emit getCachedInfo ( criteria, 172800000 /* 2 days */, requestData ); emit getCachedInfo ( criteria, Q_INT64_C(172800000) /* 2 days */, requestData );
} }
@@ -620,7 +620,7 @@ NewReleasesPlugin::nrList()
/** /**
* We can cache it the lot for 2 days, it will be checked on next request * We can cache it the lot for 2 days, it will be checked on next request
*/ */
emit updateCache( criteria, 172800000 /* 2 days */, request.type, m_allNRsMap ); emit updateCache( criteria, Q_INT64_C(172800000) /* 2 days */, request.type, m_allNRsMap );
} }
m_cachedRequests.clear(); m_cachedRequests.clear();
} }
@@ -712,7 +712,7 @@ NewReleasesPlugin::nrReturned()
/** /**
* If the item has expired, cache it for one hour and try and refetch later * If the item has expired, cache it for one hour and try and refetch later
*/ */
emit updateCache( criteria, (maxAge == 0 ? 3600000 /* One hour */ : maxAge), requestData.type, returnedData ); emit updateCache( criteria, (maxAge == Q_INT64_C(0) ? (3600000) /* One hour */ : maxAge), requestData.type, returnedData );
} }
else else
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Network error in fetching newrelease:" << reply->url().toString(); tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Network error in fetching newrelease:" << reply->url().toString();

4
src/infoplugins/generic/rovi/RoviPlugin.cpp
View File

@@ -67,7 +67,7 @@ RoviPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
criteria["artist"] = hash["artist"]; criteria["artist"] = hash["artist"];
criteria["album"] = hash["album"]; criteria["album"] = hash["album"];
emit getCachedInfo( criteria, 0, requestData ); emit getCachedInfo( criteria, Q_INT64_C(0), requestData );
} }
@@ -172,7 +172,7 @@ RoviPlugin::albumLookupFinished()
criteria["artist"] = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>()["artist"]; criteria["artist"] = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>()["artist"];
criteria["album"] = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>()["album"]; criteria["album"] = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>()["album"];
emit updateCache( criteria, 0, requestData.type, returnedData ); emit updateCache( criteria, Q_INT64_C(0), requestData.type, returnedData );
} }

8
src/infoplugins/generic/spotify/SpotifyPlugin.cpp
View File

@@ -116,7 +116,7 @@ SpotifyPlugin::fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData )
criteria["chart_id"] = hash["chart_id"]; criteria["chart_id"] = hash["chart_id"];
criteria["chart_source"] = hash["chart_source"]; criteria["chart_source"] = hash["chart_source"];
emit getCachedInfo( criteria, 86400000 /* Expire chart cache in 1 day */, requestData ); emit getCachedInfo( criteria, Q_INT64_C(86400000) /* Expire chart cache in 1 day */, requestData );
} }
@@ -131,7 +131,7 @@ SpotifyPlugin::fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData req
Tomahawk::InfoSystem::InfoStringHash criteria; Tomahawk::InfoSystem::InfoStringHash criteria;
criteria[ "InfoChartCapabilities" ] = "spotifyplugin"; criteria[ "InfoChartCapabilities" ] = "spotifyplugin";
emit getCachedInfo( criteria, 604800000, requestData ); emit getCachedInfo( criteria, Q_INT64_C(604800000), requestData );
} }
@@ -272,7 +272,7 @@ SpotifyPlugin::chartTypes()
emit info( request, m_allChartsMap ); emit info( request, m_allChartsMap );
Tomahawk::InfoSystem::InfoStringHash criteria; Tomahawk::InfoSystem::InfoStringHash criteria;
criteria[ "InfoChartCapabilities" ] = "spotifyplugin"; criteria[ "InfoChartCapabilities" ] = "spotifyplugin";
emit updateCache( criteria,604800000, request.type, m_allChartsMap ); emit updateCache( criteria, Q_INT64_C(604800000), request.type, m_allChartsMap );
} }
m_cachedRequests.clear(); m_cachedRequests.clear();
} }
@@ -379,7 +379,7 @@ SpotifyPlugin::chartReturned()
Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >(); Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
criteria[ "chart_id" ] = origData[ "chart_id" ]; criteria[ "chart_id" ] = origData[ "chart_id" ];
criteria[ "chart_source" ] = origData[ "chart_source" ]; criteria[ "chart_source" ] = origData[ "chart_source" ];
emit updateCache( criteria, 86400000, requestData.type, returnedData ); emit updateCache( criteria, Q_INT64_C(86400000), requestData.type, returnedData );
} }
else else
qDebug() << "Network error in fetching chart:" << reply->url().toString(); qDebug() << "Network error in fetching chart:" << reply->url().toString();

26
src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp
View File

@@ -277,7 +277,7 @@ LastFmInfoPlugin::fetchSimilarArtists( Tomahawk::InfoSystem::InfoRequestData req
Tomahawk::InfoSystem::InfoStringHash criteria; Tomahawk::InfoSystem::InfoStringHash criteria;
criteria["artist"] = hash["artist"]; criteria["artist"] = hash["artist"];
emit getCachedInfo( criteria, 2419200000, requestData ); emit getCachedInfo( criteria, Q_INT64_C(2419200000), requestData );
} }
@@ -300,7 +300,7 @@ LastFmInfoPlugin::fetchSimilarTracks( Tomahawk::InfoSystem::InfoRequestData requ
criteria["artist"] = hash["artist"]; criteria["artist"] = hash["artist"];
criteria["track"] = hash["track"]; criteria["track"] = hash["track"];
emit getCachedInfo( criteria, 2419200000, requestData ); emit getCachedInfo( criteria, Q_INT64_C(2419200000), requestData );
} }
@@ -322,7 +322,7 @@ LastFmInfoPlugin::fetchTopTracks( Tomahawk::InfoSystem::InfoRequestData requestD
Tomahawk::InfoSystem::InfoStringHash criteria; Tomahawk::InfoSystem::InfoStringHash criteria;
criteria["artist"] = hash["artist"]; criteria["artist"] = hash["artist"];
emit getCachedInfo( criteria, 2419200000, requestData ); emit getCachedInfo( criteria, Q_INT64_C(2419200000), requestData );
} }
@@ -344,7 +344,7 @@ LastFmInfoPlugin::fetchArtistInfo( Tomahawk::InfoSystem::InfoRequestData request
Tomahawk::InfoSystem::InfoStringHash criteria; Tomahawk::InfoSystem::InfoStringHash criteria;
criteria["artist"] = hash["artist"]; criteria["artist"] = hash["artist"];
emit getCachedInfo( criteria, 2419200000, requestData ); emit getCachedInfo( criteria, Q_INT64_C(2419200000), requestData );
} }
@@ -366,7 +366,7 @@ LastFmInfoPlugin::fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData
criteria["chart_id"] = hash["chart_id"]; criteria["chart_id"] = hash["chart_id"];
} }
emit getCachedInfo( criteria, 0, requestData ); emit getCachedInfo( criteria, Q_INT64_C(0), requestData );
} }
@@ -381,7 +381,7 @@ LastFmInfoPlugin::fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData
InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >(); InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
Tomahawk::InfoSystem::InfoStringHash criteria; Tomahawk::InfoSystem::InfoStringHash criteria;
emit getCachedInfo( criteria, 0, requestData ); emit getCachedInfo( criteria, Q_INT64_C(0), requestData );
} }
@@ -404,7 +404,7 @@ LastFmInfoPlugin::fetchAlbumInfo( Tomahawk::InfoSystem::InfoRequestData requestD
criteria["artist"] = hash["artist"]; criteria["artist"] = hash["artist"];
criteria["album"] = hash["album"]; criteria["album"] = hash["album"];
emit getCachedInfo( criteria, 2419200000, requestData ); emit getCachedInfo( criteria, Q_INT64_C(2419200000), requestData );
} }
@@ -583,7 +583,7 @@ LastFmInfoPlugin::similarArtistsReturned()
Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>(); Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
Tomahawk::InfoSystem::InfoStringHash criteria; Tomahawk::InfoSystem::InfoStringHash criteria;
criteria["artist"] = origData["artist"]; criteria["artist"] = origData["artist"];
emit updateCache( criteria, 2419200000, requestData.type, returnedData ); emit updateCache( criteria, Q_INT64_C(2419200000), requestData.type, returnedData );
} }
} }
@@ -635,7 +635,7 @@ LastFmInfoPlugin::similarTracksReturned()
Tomahawk::InfoSystem::InfoStringHash criteria; Tomahawk::InfoSystem::InfoStringHash criteria;
criteria["artist"] = origData["artist"]; criteria["artist"] = origData["artist"];
criteria["track"] = origData["track"]; criteria["track"] = origData["track"];
emit updateCache( criteria, 2419200000, requestData.type, returnedData ); emit updateCache( criteria, Q_INT64_C(2419200000), requestData.type, returnedData );
} }
} }
@@ -704,7 +704,7 @@ LastFmInfoPlugin::topTracksReturned()
Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>(); Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
Tomahawk::InfoSystem::InfoStringHash criteria; Tomahawk::InfoSystem::InfoStringHash criteria;
criteria["artist"] = origData["artist"]; criteria["artist"] = origData["artist"];
emit updateCache( criteria, 0, requestData.type, returnedData ); emit updateCache( criteria, Q_INT64_C(0), requestData.type, returnedData );
} }
@@ -746,7 +746,7 @@ LastFmInfoPlugin::artistInfoReturned()
Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>(); Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
Tomahawk::InfoSystem::InfoStringHash criteria; Tomahawk::InfoSystem::InfoStringHash criteria;
criteria["artist"] = origData["artist"]; criteria["artist"] = origData["artist"];
emit updateCache( criteria, 0, requestData.type, returnedData ); emit updateCache( criteria, Q_INT64_C(0), requestData.type, returnedData );
} }
emit info( requestData, returnedData ); emit info( requestData, returnedData );
} }
@@ -827,7 +827,7 @@ LastFmInfoPlugin::coverArtReturned()
Tomahawk::InfoSystem::InfoStringHash criteria; Tomahawk::InfoSystem::InfoStringHash criteria;
criteria["artist"] = origData["artist"]; criteria["artist"] = origData["artist"];
criteria["album"] = origData["album"]; criteria["album"] = origData["album"];
emit updateCache( criteria, 2419200000, requestData.type, returnedData ); emit updateCache( criteria, Q_INT64_C(2419200000), requestData.type, returnedData );
} }
else else
{ {
@@ -873,7 +873,7 @@ LastFmInfoPlugin::artistImagesReturned()
Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>(); Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
Tomahawk::InfoSystem::InfoStringHash criteria; Tomahawk::InfoSystem::InfoStringHash criteria;
criteria["artist"] = origData["artist"]; criteria["artist"] = origData["artist"];
emit updateCache( criteria, 2419200000, requestData.type, returnedData ); emit updateCache( criteria, Q_INT64_C(2419200000), requestData.type, returnedData );
} }
else else
{ {

4
src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.cpp
View File

@@ -117,7 +117,7 @@ SpotifyInfoPlugin::getInfo( InfoRequestData requestData )
if ( hash.contains( "artist" ) ) if ( hash.contains( "artist" ) )
criteria["artist"] = hash["artist"]; criteria["artist"] = hash["artist"];
emit getCachedInfo( criteria, 2419200000, requestData ); emit getCachedInfo( criteria, Q_INT64_C(2419200000), requestData );
return; return;
} }
@@ -310,5 +310,5 @@ SpotifyInfoPlugin::trackListResult( const QStringList& trackNameList, const Info
criteria["artist"] = requestData.input.value< InfoStringHash>()["artist"]; criteria["artist"] = requestData.input.value< InfoStringHash>()["artist"];
criteria["album"] = requestData.input.value< InfoStringHash>()["album"]; criteria["album"] = requestData.input.value< InfoStringHash>()["album"];
emit updateCache( criteria, 0, requestData.type, returnedData ); emit updateCache( criteria, Q_INT64_C(0), requestData.type, returnedData );
} }