Commit 01b3ab9f authored by Dan Meltzer's avatar Dan Meltzer
Browse files

Update URL for Jamendo Database.

Jamendo has changed hosts.  This updates the url to the new location.
The api is deprecated, but it works again at least.

BUG: 331934
CCMAIL: yashladia@gmail.com
REVIEW: 116741
parent 01d512aa
......@@ -23,6 +23,8 @@ VERSION 2.9-Beta 1
compilers currently supported by KDE.
BUGFIXES:
* Update Jamendo to use new website. Patch By Yash Ladia
<yashladia1@gmail.com>
* Allows CollectionBrowser filter to have length of almost 24 hours. (BR 291400)
* Prevent creation of video stream when transcoding to Opus. Patch by Martin Brodbeck.
* Fix crash when starting Amarok with an iPod mounted. (BR 329498)
......
......@@ -185,14 +185,14 @@ JamendoService::updateButtonClicked()
if( !tempFile.open() )
return; //error
m_tempFileName = tempFile.fileName();
m_listDownloadJob = KIO::file_copy( KUrl( "http://img.jamendo.com/data/dbdump_artistalbumtrack.xml.gz" ), KUrl( m_tempFileName ), 0700 , KIO::HideProgressInfo | KIO::Overwrite );
m_listDownloadJob = KIO::file_copy(
/* Deprecated */ KUrl( "http://imgjam.com/data/dbdump_artistalbumtrack.xml.gz" ),
KUrl( m_tempFileName ), 0700 , KIO::HideProgressInfo | KIO::Overwrite );
Amarok::Components::logger()->newProgressOperation( m_listDownloadJob, i18n( "Downloading Jamendo.com database..." ), this, SLOT(listDownloadCancelled()) );
connect( m_listDownloadJob, SIGNAL(result(KJob*)),
this, SLOT(listDownloadComplete(KJob*)) );
}
void
......@@ -202,10 +202,12 @@ JamendoService::listDownloadComplete(KJob * downloadJob)
return ; //not the right job, so let's ignore it
debug() << "JamendoService: xml file download complete";
m_listDownloadJob = 0;
//testing
if ( !downloadJob->error() == 0 )
{
//TODO: error handling here
m_updateListButton->setEnabled( true ); // otherwise button will remain inactive in case of error
return;
}
......@@ -218,7 +220,6 @@ JamendoService::listDownloadComplete(KJob * downloadJob)
ThreadWeaver::Weaver::instance()->enqueue( m_xmlParser );
downloadJob->deleteLater();
m_listDownloadJob = 0;
}
void
......
......@@ -28,7 +28,7 @@
#include <QXmlStreamReader>
/**
* Parser for the XML file from http://img.jamendo.com/data/dbdump.en.xml.gz
* Parser for the XML file from http://imgjam.com/data/dbdump_artistalbumtrack.xml.gz
*
* @author Nikolaj Hald Nielsen
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment