From 6635b084f7c18526bb3f0bd484c91d7b290762ab Mon Sep 17 00:00:00 2001
From: Stefan Derkits <stefan@derkits.at>
Date: Mon, 14 Jan 2013 22:40:26 +0100
Subject: [PATCH 1/6] Implement genreradio (still buggy & needs
 https://github.com/Horrendus/libechonest atm)

---
 .../dynamic/echonest/EchonestControl.cpp      | 50 ++++++++++-----
 .../dynamic/echonest/EchonestControl.h        |  6 +-
 .../dynamic/echonest/EchonestGenerator.cpp    | 63 ++++++++++++++-----
 .../dynamic/echonest/EchonestGenerator.h      |  9 ++-
 4 files changed, 92 insertions(+), 36 deletions(-)

diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
index 61d25aaa1..a6319cd3c 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
@@ -35,7 +35,7 @@
 
 
 QHash< QString, QStringList > Tomahawk::EchonestControl::s_suggestCache = QHash< QString, QStringList >();
-bool Tomahawk::EchonestControl::s_fetchingMoodsAndStyles = false;
+bool Tomahawk::EchonestControl::s_fetchingMoodsStylesAndGenres = false;
 int Tomahawk::EchonestControl::s_stylePollCount = 0;
 
 
@@ -418,11 +418,13 @@ Tomahawk::EchonestControl::updateWidgets()
         combo->hide();
         m_match = QPointer< QWidget >( match );
         m_input = QPointer< QWidget >( combo );
-    } else if( selectedType() == "Mood" || selectedType() == "Style" ) {
+    } else if( selectedType() == "Mood" || selectedType() == "Style" || selectedType() == "Genre" ) {
         if( selectedType() == "Mood" )
             m_currentType = Echonest::DynamicPlaylist::Mood;
-        else
+        else if ( selectedType() == "Style" )
             m_currentType = Echonest::DynamicPlaylist::Style;
+        else
+            m_currentType = Echonest::DynamicPlaylist::Genre;
 
         QLabel* match = new QLabel( tr( "is" ) );
 
@@ -440,7 +442,7 @@ Tomahawk::EchonestControl::updateWidgets()
         m_match = QPointer< QWidget >( match );
         m_input = QPointer< QWidget >( combo );
 
-        insertMoodsAndStyles();
+        insertMoodsStylesAndGenres();
     } else if( selectedType() == "Song Type" ) {
         m_currentType = Echonest::DynamicPlaylist::SongType;
 
@@ -529,7 +531,7 @@ Tomahawk::EchonestControl::updateData()
         updateFromComboAndSlider();
     } else if( selectedType() == "Danceability" || selectedType() == "Energy" || selectedType() == "Artist Familiarity" || selectedType() == "Artist Hotttnesss" || selectedType() == "Song Hotttnesss" ) {
         updateFromComboAndSlider( true );
-    } else if( selectedType() == "Mode" || selectedType() == "Key" || selectedType() == "Mood" || selectedType() == "Style" || selectedType() == "User Radio" ) {
+    } else if( selectedType() == "Mode" || selectedType() == "Key" || selectedType() == "Mood" || selectedType() == "Style" || selectedType() == "Genre" || selectedType() == "User Radio" ) {
         updateFromLabelAndCombo();
     } else if( selectedType() == "Sorting" ) {
         QComboBox* match = qobject_cast<QComboBox*>( m_match.data() );
@@ -635,7 +637,7 @@ Tomahawk::EchonestControl::updateWidgetsFromData()
         updateToComboAndSlider();
     } else if( selectedType() == "Danceability" || selectedType() == "Energy" || selectedType() == "Artist Familiarity" || selectedType() == "Artist Hotttnesss" || selectedType() == "Song Hotttnesss" ) {
         updateToComboAndSlider( true );
-    } else if( selectedType() == "Mode" || selectedType() == "Key" || selectedType() == "Mood" || selectedType() == "Style") {
+    } else if( selectedType() == "Mode" || selectedType() == "Key" || selectedType() == "Mood" || selectedType() == "Style" || selectedType() == "Genre" ) {
         updateToLabelAndCombo();
     } else if( selectedType() == "Sorting" ) {
         QComboBox* match = qobject_cast<QComboBox*>( m_match.data() );
@@ -896,7 +898,16 @@ Tomahawk::EchonestControl::calculateSummary()
         Q_ASSERT( qobject_cast< QComboBox* >( m_input.data() ) );
         QString text = qobject_cast< QComboBox* >( m_input.data() )->currentText().toLower();
         summary = tr( "in a %1 style" ).arg( text );
-    } else if( selectedType() == "Song Type" ) {
+    }
+    else if ( selectedType() == "Genre" )
+    {
+        Q_ASSERT( !m_input.isNull() );
+        Q_ASSERT( qobject_cast< QComboBox* >( m_input.data() ) );
+        QString text = qobject_cast< QComboBox* >( m_input.data() )->currentText().toLower();
+        summary = tr( "where genre is %1" ).arg( text );
+    }
+    else if ( selectedType() == "Song Type" )
+    {
         Q_ASSERT( !m_input.isNull() );
         Q_ASSERT( qobject_cast< QComboBox* >( m_input.data() ) );
         QString text = qobject_cast< QComboBox* >( m_input.data() )->currentText();
@@ -916,13 +927,13 @@ Tomahawk::EchonestControl::calculateSummary()
 
 
 void
-Tomahawk::EchonestControl::checkForMoodsOrStylesFetched()
+Tomahawk::EchonestControl::checkForMoodsStylesOrGenresFetched()
 {
-    s_fetchingMoodsAndStyles = false;
-    if( selectedType() == "Mood" || selectedType() == "Style" ) {
+    s_fetchingMoodsStylesAndGenres = false;
+    if( selectedType() == "Mood" || selectedType() == "Style" || selectedType() == "Genre" ) {
         QComboBox* cb = qobject_cast< QComboBox* >( m_input.data() );
         if( cb && cb->count() == 0 ) { // got nothing, so lets populate
-            if( insertMoodsAndStyles() )
+            if( insertMoodsStylesAndGenres() )
                 updateWidgetsFromData();
         }
     }
@@ -930,9 +941,16 @@ Tomahawk::EchonestControl::checkForMoodsOrStylesFetched()
 
 
 bool
-Tomahawk::EchonestControl::insertMoodsAndStyles()
+Tomahawk::EchonestControl::insertMoodsStylesAndGenres()
 {
-    QStringList src = selectedType() == "Mood" ? EchonestGenerator::moods() : EchonestGenerator::styles();
+    QStringList src;
+    if ( selectedType() == "Mood" )
+        src = EchonestGenerator::moods();
+    else if ( selectedType() == "Style" )
+        src = EchonestGenerator::styles();
+    else
+        src = EchonestGenerator::genres();
+    
     QComboBox* combo = qobject_cast< QComboBox* >( m_input.data() );
     if( !combo )
         return false;
@@ -942,9 +960,9 @@ Tomahawk::EchonestControl::insertMoodsAndStyles()
     }
 
     if( src.isEmpty() && !combo->count() ) {
-        if( s_stylePollCount <= 20 && !s_fetchingMoodsAndStyles ) { // try for 20s to get the styles...
-            s_fetchingMoodsAndStyles = true;
-            QTimer::singleShot( 1000, this, SLOT( checkForMoodsOrStylesFetched() ) );
+        if( s_stylePollCount <= 20 && !s_fetchingMoodsStylesAndGenres ) { // try for 20s to get the styles...
+            s_fetchingMoodsStylesAndGenres = true;
+            QTimer::singleShot( 1000, this, SLOT( checkForMoodsStylesOrGenresFetched() ) );
         }
         s_stylePollCount++;
         return false;
diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
index d40a87c5e..4b47ca619 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
@@ -61,7 +61,7 @@ private slots:
     void artistTextEdited( const QString& );
     void suggestFinished();
 
-    void checkForMoodsOrStylesFetched();
+    void checkForMoodsStylesOrGenresFetched();
 private:
     void updateWidgets();
     void updateWidgetsFromData();
@@ -70,7 +70,7 @@ private:
     void setupMinMaxWidgets( Echonest::DynamicPlaylist::PlaylistParam min, Echonest::DynamicPlaylist::PlaylistParam max, const QString& leftL, const QString& rightL, int maxRange );
     void updateFromComboAndSlider( bool smooth = false );
     void updateFromLabelAndCombo();
-    bool insertMoodsAndStyles();
+    bool insertMoodsStylesAndGenres();
 
     void updateToComboAndSlider( bool smooth = false );
     void updateToLabelAndCombo();
@@ -93,7 +93,7 @@ private:
 
     Echonest::DynamicPlaylist::PlaylistParamData m_data;
     QVariant m_cacheData;
-    static bool s_fetchingMoodsAndStyles;
+    static bool s_fetchingMoodsStylesAndGenres;
     static int s_stylePollCount;
 
     QSet< QNetworkReply* > m_suggestWorkers;
diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
index 61e648188..e60a7322a 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
@@ -35,8 +35,10 @@ using namespace Tomahawk;
 
 QStringList EchonestGenerator::s_moods = QStringList();
 QStringList EchonestGenerator::s_styles = QStringList();
+QStringList EchonestGenerator::s_genres = QStringList();
 QNetworkReply* EchonestGenerator::s_moodsJob = 0;
 QNetworkReply* EchonestGenerator::s_stylesJob = 0;
+QNetworkReply* EchonestGenerator::s_genresJob = 0;
 
 CatalogManager* EchonestGenerator::s_catalogs = 0;
 
@@ -63,7 +65,7 @@ EchonestFactory::createControl( const QString& controlType )
 QStringList
 EchonestFactory::typeSelectors() const
 {
-    QStringList types =  QStringList() << "Artist" << "Artist Description" << "User Radio" << "Song" << "Mood" << "Style" << "Adventurousness" << "Variety" << "Tempo" << "Duration" << "Loudness"
+    QStringList types =  QStringList() << "Artist" << "Artist Description" << "User Radio" << "Song" << "Genre" << "Mood" << "Style" << "Adventurousness" << "Variety" << "Tempo" << "Duration" << "Loudness"
                           << "Danceability" << "Energy" << "Artist Familiarity" << "Artist Hotttnesss" << "Song Hotttnesss"
                           << "Longitude" << "Latitude" <<  "Mode" << "Key" << "Sorting" << "Song Type";
 
@@ -126,7 +128,7 @@ EchonestGenerator::EchonestGenerator ( QObject* parent )
     m_mode = OnDemand;
     m_logo.load( RESPATH "/images/echonest_logo.png" );
 
-    loadStylesAndMoods();
+    loadStylesMoodsAndGenres();
 
     connect( s_catalogs, SIGNAL( catalogsUpdated() ), this, SLOT( knownCatalogsChanged() ) );
 }
@@ -470,12 +472,17 @@ EchonestGenerator::appendRadioType( Echonest::DynamicPlaylist::PlaylistParams& p
     /// 4. artist-radio: If all the artist entries are Similar To. If some were but not all, error out.
     /// 5. song-radio: If all the artist entries are Similar To. If some were but not all, error out.
     bool someCatalog = false;
+    bool genreType = false;
     foreach( const dyncontrol_ptr& control, m_controls ) {
         if ( control->selectedType() == "User Radio" )
             someCatalog = true;
+        else if (control->selectedType() == "Genre" )
+            genreType = true;
     }
     if( someCatalog )
         params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::CatalogRadioType ) );
+    else if ( genreType )
+        params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::GenreRadioType ) );
     else if( onlyThisArtistType( Echonest::DynamicPlaylist::ArtistType ) )
         params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::ArtistType ) );
     else if( onlyThisArtistType( Echonest::DynamicPlaylist::ArtistDescriptionType ) )
@@ -603,49 +610,52 @@ EchonestGenerator::sentenceSummary()
 }
 
 void
-EchonestGenerator::loadStylesAndMoods()
+EchonestGenerator::loadStylesMoodsAndGenres()
 {
     if( !s_styles.isEmpty() || !s_moods.isEmpty() )
         return;
 
-    QFile dataFile( TomahawkUtils::appDataDir().absoluteFilePath( "echonest_stylesandmoods.dat" ) );
-    if( !dataFile.exists() ) // load
+    QFile dataFile( TomahawkUtils::appDataDir().absoluteFilePath( "echonest_stylesmoodsandgenres.dat" ) ); //TODO: delete old file in migrate function
+    if( !dataFile.exists() ) // load TODO: re-fetch styles, moods & genres if file is older than X days?
     {
         s_stylesJob = Echonest::Artist::listTerms( "style" );
         connect( s_stylesJob, SIGNAL( finished() ), this, SLOT( stylesReceived() ) );
         s_moodsJob = Echonest::Artist::listTerms( "mood" );
         connect( s_moodsJob, SIGNAL( finished() ), this, SLOT( moodsReceived() ) );
+        s_genresJob = Echonest::Artist::fetchGenres();
+        connect( s_genresJob, SIGNAL( finished() ), this, SLOT( genresReceived() ) );
     } else
     {
         if( !dataFile.open( QIODevice::ReadOnly ) )
         {
-            tLog() << "Failed to open for reading styles/moods db file:" << dataFile.fileName();
+            tLog() << "Failed to open for reading styles/moods/genres db file:" << dataFile.fileName();
             return;
         }
 
         QString allData = QString::fromUtf8( dataFile.readAll() );
         QStringList parts = allData.split( "\n" );
-        if( parts.size() != 2 )
+        if( parts.size() != 3 )
         {
-            tLog() << "Didn't get both moods and styles in file...:" << allData;
+            tLog() << "Didn't get moods, styles and genres in file...:" << allData;
             return;
         }
         s_moods = parts[ 0 ].split( "|" );
         s_styles = parts[ 1 ].split( "|" );
+        s_genres = parts[ 2 ].split( " | ");
     }
 }
 
 void
-EchonestGenerator::saveStylesAndMoods()
+EchonestGenerator::saveStylesMoodsAndGenres()
 {
-    QFile dataFile( TomahawkUtils::appDataDir().absoluteFilePath( "echonest_stylesandmoods.dat" ) );
+    QFile dataFile( TomahawkUtils::appDataDir().absoluteFilePath( "echonest_stylesmoodsandgenres.dat" ) );
     if( !dataFile.open( QIODevice::WriteOnly ) )
     {
         tLog() << "Failed to open styles and moods data file for saving:" << dataFile.errorString() << dataFile.fileName();
         return;
     }
 
-    QByteArray data = QString( "%1\n%2" ).arg( s_moods.join( "|" ) ).arg( s_styles.join( "|" ) ).toUtf8();
+    QByteArray data = QString( "%1\n%2\n%3" ).arg( s_moods.join( "|" ) ).arg( s_styles.join( "|" ) ).arg( s_genres.join( "|" ) ).toUtf8();
     dataFile.write( data );
 }
 
@@ -671,8 +681,8 @@ EchonestGenerator::moodsReceived()
     }
     s_moodsJob = 0;
 
-    if( !s_styles.isEmpty() )
-        saveStylesAndMoods();
+    if( !s_styles.isEmpty() && !s_genres.isEmpty() )
+        saveStylesMoodsAndGenres();
 }
 
 
@@ -696,6 +706,29 @@ EchonestGenerator::stylesReceived()
     }
     s_stylesJob = 0;
 
-    if( !s_moods.isEmpty() )
-        saveStylesAndMoods();
+    if( !s_moods.isEmpty() && !s_styles.isEmpty() )
+        saveStylesMoodsAndGenres();
+}
+
+QStringList
+EchonestGenerator::genres()
+{
+    return s_genres;
+}
+
+void
+EchonestGenerator::genresReceived()
+{
+    QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
+    Q_ASSERT( r );
+
+    try {
+        s_genres = Echonest::Artist::parseGenreList( r ).toList();
+    } catch( Echonest::ParseError& e ) {
+        qWarning() << "Echonest failed to parse genres list";
+    }
+    s_genresJob = 0;
+
+    if( !s_moods.isEmpty() && !s_styles.isEmpty() )
+        saveStylesMoodsAndGenres();
 }
diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
index 993ea1766..7e0822add 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
@@ -82,6 +82,7 @@ public:
 
     static QStringList styles();
     static QStringList moods();
+    static QStringList genres();
     static QStringList userCatalogs();
     static QByteArray catalogId( const QString& collectionId );
 
@@ -99,6 +100,7 @@ private slots:
 
     void stylesReceived();
     void moodsReceived();
+    void genresReceived();
     void knownCatalogsChanged();
 
     void songLookupFinished();
@@ -110,16 +112,18 @@ private:
     Echonest::DynamicPlaylist::ArtistTypeEnum appendRadioType( Echonest::DynamicPlaylist::PlaylistParams& params ) const throw( std::runtime_error );
     bool onlyThisArtistType( Echonest::DynamicPlaylist::ArtistTypeEnum type ) const throw( std::runtime_error );
 
-    void loadStylesAndMoods();
-    void saveStylesAndMoods();
+    void loadStylesMoodsAndGenres();
+    void saveStylesMoodsAndGenres();
 
     Echonest::DynamicPlaylist* m_dynPlaylist;
     QPixmap m_logo;
 
     static QStringList s_styles;
     static QStringList s_moods;
+    static QStringList s_genres;
     static QNetworkReply* s_stylesJob;
     static QNetworkReply* s_moodsJob;
+    static QNetworkReply* s_genresJob;
 
     static CatalogManager* s_catalogs;
 
@@ -131,3 +135,4 @@ private:
 };
 
 #endif
+

From d4c7e8cc1bc7bedba9528a5f9bc54fb4dafa656e Mon Sep 17 00:00:00 2001
From: Stefan Derkits <stefan@derkits.at>
Date: Wed, 16 Jan 2013 15:32:40 +0100
Subject: [PATCH 2/6] fix strange Bug with QComboBox

---
 src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
index e60a7322a..5d84d6b0f 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
@@ -641,7 +641,7 @@ EchonestGenerator::loadStylesMoodsAndGenres()
         }
         s_moods = parts[ 0 ].split( "|" );
         s_styles = parts[ 1 ].split( "|" );
-        s_genres = parts[ 2 ].split( " | ");
+        s_genres = parts[ 2 ].split( "|");
     }
 }
 

From 5389a4c0a062357f8757a36a2a9ce2143c400505 Mon Sep 17 00:00:00 2001
From: Stefan Derkits <stefan@derkits.at>
Date: Thu, 17 Jan 2013 16:21:16 +0100
Subject: [PATCH 3/6] stylefix

---
 src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
index 5d84d6b0f..9149a8e22 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
@@ -476,7 +476,7 @@ EchonestGenerator::appendRadioType( Echonest::DynamicPlaylist::PlaylistParams& p
     foreach( const dyncontrol_ptr& control, m_controls ) {
         if ( control->selectedType() == "User Radio" )
             someCatalog = true;
-        else if (control->selectedType() == "Genre" )
+        else if ( control->selectedType() == "Genre" )
             genreType = true;
     }
     if( someCatalog )

From f3df5013fa3b95b4d995ff7363c2ab4bbc67cf99 Mon Sep 17 00:00:00 2001
From: Stefan Derkits <stefan@derkits.at>
Date: Thu, 17 Jan 2013 16:48:07 +0100
Subject: [PATCH 4/6] port Genre, Styles & Moods data in EchonestGenerator from
 data file to TomahawkCache

---
 .../dynamic/echonest/EchonestGenerator.cpp    | 63 ++++++++++---------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
index 9149a8e22..a8e1564a9 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
@@ -21,6 +21,7 @@
 #include "playlist/dynamic/echonest/EchonestSteerer.h"
 #include "Query.h"
 #include "utils/TomahawkUtils.h"
+#include "utils/TomahawkCache.h"
 #include "TomahawkSettings.h"
 #include "database/DatabaseCommand_CollectionAttributes.h"
 #include "database/Database.h"
@@ -612,51 +613,53 @@ EchonestGenerator::sentenceSummary()
 void
 EchonestGenerator::loadStylesMoodsAndGenres()
 {
-    if( !s_styles.isEmpty() || !s_moods.isEmpty() )
+    if( !s_styles.isEmpty() || !s_moods.isEmpty() || !s_genres.isEmpty() ) //TODO: rly? if one of those is not empty we don't try to load the others?
         return;
 
-    QFile dataFile( TomahawkUtils::appDataDir().absoluteFilePath( "echonest_stylesmoodsandgenres.dat" ) ); //TODO: delete old file in migrate function
-    if( !dataFile.exists() ) // load TODO: re-fetch styles, moods & genres if file is older than X days?
+    QVariant styles = TomahawkUtils::Cache::instance()->getData( "EchonesGenerator", "styles" );
+    if ( styles.isValid() && styles.canConvert< QStringList >() )
     {
+        s_styles = styles.toStringList();
+    }
+    else
+    {
+        tLog() << "Styles not in cache or too old, refetching styles ...";
         s_stylesJob = Echonest::Artist::listTerms( "style" );
         connect( s_stylesJob, SIGNAL( finished() ), this, SLOT( stylesReceived() ) );
+    }
+
+    QVariant moods = TomahawkUtils::Cache::instance()->getData( "EchonesGenerator", "moods" );
+    if ( moods.isValid() && moods.canConvert< QStringList >() )
+    {
+        s_moods = moods.toStringList();
+    }
+    else
+    {
+        tLog() << "Moods not in cache or too old, refetching moods ...";
         s_moodsJob = Echonest::Artist::listTerms( "mood" );
         connect( s_moodsJob, SIGNAL( finished() ), this, SLOT( moodsReceived() ) );
+    }
+
+    QVariant genres = TomahawkUtils::Cache::instance()->getData( "EchonesGenerator", "genres" );
+    if ( genres.isValid() && genres.canConvert< QStringList >() )
+    {
+        s_genres = genres.toStringList();
+    }
+    else
+    {
+        tLog() << "Genres not in cache or too old, refetching genres ...";
         s_genresJob = Echonest::Artist::fetchGenres();
         connect( s_genresJob, SIGNAL( finished() ), this, SLOT( genresReceived() ) );
-    } else
-    {
-        if( !dataFile.open( QIODevice::ReadOnly ) )
-        {
-            tLog() << "Failed to open for reading styles/moods/genres db file:" << dataFile.fileName();
-            return;
-        }
-
-        QString allData = QString::fromUtf8( dataFile.readAll() );
-        QStringList parts = allData.split( "\n" );
-        if( parts.size() != 3 )
-        {
-            tLog() << "Didn't get moods, styles and genres in file...:" << allData;
-            return;
-        }
-        s_moods = parts[ 0 ].split( "|" );
-        s_styles = parts[ 1 ].split( "|" );
-        s_genres = parts[ 2 ].split( "|");
     }
+
 }
 
 void
 EchonestGenerator::saveStylesMoodsAndGenres()
 {
-    QFile dataFile( TomahawkUtils::appDataDir().absoluteFilePath( "echonest_stylesmoodsandgenres.dat" ) );
-    if( !dataFile.open( QIODevice::WriteOnly ) )
-    {
-        tLog() << "Failed to open styles and moods data file for saving:" << dataFile.errorString() << dataFile.fileName();
-        return;
-    }
-
-    QByteArray data = QString( "%1\n%2\n%3" ).arg( s_moods.join( "|" ) ).arg( s_styles.join( "|" ) ).arg( s_genres.join( "|" ) ).toUtf8();
-    dataFile.write( data );
+    TomahawkUtils::Cache::instance()->putData( "EchonesGenerator", 1209600000 /* 2 weeks */, "moods", QVariant::fromValue< QStringList >( s_moods ) );
+    TomahawkUtils::Cache::instance()->putData( "EchonesGenerator", 1209600000 /* 2 weeks */, "styles", QVariant::fromValue< QStringList >( s_styles ) );
+    TomahawkUtils::Cache::instance()->putData( "EchonesGenerator", 1209600000 /* 2 weeks */, "genres", QVariant::fromValue< QStringList >( s_genres ) );
 }
 
 

From 3c8f3b102ddd7340e61aaad03977bb3958e3458d Mon Sep 17 00:00:00 2001
From: Stefan Derkits <stefan@derkits.at>
Date: Sun, 27 Jan 2013 17:03:27 +0100
Subject: [PATCH 5/6] style fixes in EchonestControl & EchonestGenerator

---
 .../dynamic/echonest/EchonestControl.cpp      | 203 +++++++++++++-----
 .../dynamic/echonest/EchonestGenerator.cpp    |  27 ++-
 2 files changed, 164 insertions(+), 66 deletions(-)

diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
index a6319cd3c..70abbaf83 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
@@ -72,7 +72,8 @@ Tomahawk::EchonestControl::matchSelector()
 void
 Tomahawk::EchonestControl::setSelectedType ( const QString& type )
 {
-    if( type != selectedType() ) {
+    if( type != selectedType() )
+    {
         if( !m_input.isNull() )
             delete m_input.data();
         if( !m_match.isNull() )
@@ -81,7 +82,7 @@ Tomahawk::EchonestControl::setSelectedType ( const QString& type )
         Tomahawk::DynamicControl::setSelectedType ( type );
         updateWidgets();
         updateData();
-//        qDebug() << "Setting new type, set data to:" << m_data.first << m_data.second;
+        //qDebug() << "Setting new type, set data to:" << m_data.first << m_data.second;
     }
 }
 
@@ -89,7 +90,8 @@ Tomahawk::EchonestControl::setSelectedType ( const QString& type )
 Echonest::DynamicPlaylist::PlaylistParamData
 Tomahawk::EchonestControl::toENParam() const
 {
-    if( m_overrideType != -1 ) {
+    if( m_overrideType != -1 )
+    {
         Echonest::DynamicPlaylist::PlaylistParamData newData = m_data;
         newData.first = static_cast<Echonest::DynamicPlaylist::PlaylistParam>( m_overrideType );
         return newData;
@@ -155,7 +157,8 @@ Tomahawk::EchonestControl::updateWidgets()
     m_overrideType = -1;
 
     // make sure the widgets are the proper kind for the selected type, and hook up to their slots
-    if( selectedType() == "Artist" ) {
+    if( selectedType() == "Artist" )
+    {
         m_currentType = Echonest::DynamicPlaylist::Artist;
 
         QComboBox* match = new QComboBox();
@@ -184,7 +187,9 @@ Tomahawk::EchonestControl::updateWidgets()
         m_match = QPointer< QWidget >( match );
         m_input = QPointer< QWidget >( input );
         m_data.first = m_currentType;
-    } else if( selectedType() == "Artist Description" ) {
+    }
+    else if( selectedType() == "Artist Description" )
+    {
         m_currentType = Echonest::DynamicPlaylist::Description;
 
         QLabel* match = new QLabel( tr( "is" ) );
@@ -203,7 +208,9 @@ Tomahawk::EchonestControl::updateWidgets()
         m_match = QPointer< QWidget >( match );
         m_input = QPointer< QWidget >( input );
         m_data.first = m_currentType;
-    } else if( selectedType() == "User Radio" ) {
+    }
+    else if( selectedType() == "User Radio" )
+    {
         m_currentType = Echonest::DynamicPlaylist::SourceCatalog;
 
         QLabel* match = new QLabel( tr( "from user" ) );
@@ -231,7 +238,9 @@ Tomahawk::EchonestControl::updateWidgets()
         combo->hide();
         m_match = QPointer< QWidget >( match );
         m_input = QPointer< QWidget >( combo );
-    } else if( selectedType() == "Song" ) {
+    }
+    else if( selectedType() == "Song" )
+    {
         m_currentType = Echonest::DynamicPlaylist::SongId;
 
         QLabel* match = new QLabel( tr( "similar to" ) );
@@ -251,7 +260,9 @@ Tomahawk::EchonestControl::updateWidgets()
         m_match = QPointer< QWidget >( match );
         m_input = QPointer< QWidget >( input );
         m_data.first = m_currentType;
-    } else if( selectedType() == "Variety" ) {
+    }
+    else if( selectedType() == "Variety" )
+    {
         m_currentType = Echonest::DynamicPlaylist::Variety;
 
         QLabel* match = new QLabel( tr( "is" ) );
@@ -272,7 +283,9 @@ Tomahawk::EchonestControl::updateWidgets()
         m_match = QPointer< QWidget >( match );
         m_input = QPointer< QWidget >( input );
         m_data.first = m_currentType;
-    } else if( selectedType() == "Adventurousness" ) {
+    }
+    else if( selectedType() == "Adventurousness" )
+    {
         m_currentType = Echonest::DynamicPlaylist::Adventurousness;
 
         QLabel* match = new QLabel( tr( "is" ) );
@@ -294,50 +307,72 @@ Tomahawk::EchonestControl::updateWidgets()
         m_match = QPointer< QWidget >( match );
         m_input = QPointer< QWidget >( input );
         m_data.first = m_currentType;
-    } else if( selectedType() == "Tempo" ) {
+    }
+    else if( selectedType() == "Tempo" )
+    {
         m_currentType = Echonest::DynamicPlaylist::MinTempo;
 
         setupMinMaxWidgets( Echonest::DynamicPlaylist::MinTempo, Echonest::DynamicPlaylist::MaxTempo, tr( "0 BPM" ), tr( "500 BPM" ), 500 );
-    } else if( selectedType() == "Duration" ) {
+    }
+    else if( selectedType() == "Duration" )
+    {
         m_currentType = Echonest::DynamicPlaylist::MinDuration;
 
         setupMinMaxWidgets( Echonest::DynamicPlaylist::MinDuration, Echonest::DynamicPlaylist::MaxDuration, tr( "0 secs" ), tr( "3600 secs" ), 3600 );
-    } else if( selectedType() == "Loudness" ) {
+    }
+    else if( selectedType() == "Loudness" )
+    {
         m_currentType = Echonest::DynamicPlaylist::MinLoudness;
 
         setupMinMaxWidgets( Echonest::DynamicPlaylist::MinLoudness, Echonest::DynamicPlaylist::MaxLoudness, tr( "-100 dB" ), tr( "100 dB" ), 100 );
         qobject_cast< LabeledSlider* >( m_input.data() )->slider()->setMinimum( -100 );
-    } else if( selectedType() == "Danceability" ) {
+    }
+    else if( selectedType() == "Danceability" )
+    {
         m_currentType = Echonest::DynamicPlaylist::MinDanceability;
 
         setupMinMaxWidgets( Echonest::DynamicPlaylist::MinDanceability, Echonest::DynamicPlaylist::MaxDanceability, tr( "Less" ), tr( "More" ), 10000 );
-    } else if( selectedType() == "Energy" ) {
+    }
+    else if( selectedType() == "Energy" )
+    {
         m_currentType = Echonest::DynamicPlaylist::MinEnergy;
 
         setupMinMaxWidgets( Echonest::DynamicPlaylist::MinEnergy, Echonest::DynamicPlaylist::MaxEnergy, tr( "Less" ), tr( "More" ), 10000 );
-    } else if( selectedType() == "Artist Familiarity" ) {
+    }
+    else if( selectedType() == "Artist Familiarity" )
+    {
         m_currentType = Echonest::DynamicPlaylist::ArtistMinFamiliarity;
 
         setupMinMaxWidgets( Echonest::DynamicPlaylist::ArtistMinFamiliarity, Echonest::DynamicPlaylist::ArtistMaxFamiliarity, tr( "Less" ), tr( "More" ), 10000 );
-    } else if( selectedType() == "Artist Hotttnesss" ) {
+    }
+    else if( selectedType() == "Artist Hotttnesss" )
+    {
         m_currentType = Echonest::DynamicPlaylist::ArtistMinHotttnesss;
 
         setupMinMaxWidgets( Echonest::DynamicPlaylist::ArtistMinHotttnesss, Echonest::DynamicPlaylist::ArtistMaxHotttnesss, tr( "Less" ), tr( "More" ), 10000 );
-    } else if( selectedType() == "Song Hotttnesss" ) {
+    }
+    else if( selectedType() == "Song Hotttnesss" )
+    {
         m_currentType = Echonest::DynamicPlaylist::SongMinHotttnesss;
 
         setupMinMaxWidgets( Echonest::DynamicPlaylist::SongMinHotttnesss, Echonest::DynamicPlaylist::SongMaxHotttnesss, tr( "Less" ), tr( "More" ), 10000 );
-    } else if( selectedType() == "Latitude" ) {
+    }
+    else if( selectedType() == "Latitude" )
+    {
         m_currentType = Echonest::DynamicPlaylist::ArtistMinLatitude;
         QString deg = QString( QChar( 0x00B0 ) );
         setupMinMaxWidgets( Echonest::DynamicPlaylist::ArtistMinLatitude, Echonest::DynamicPlaylist::ArtistMaxLatitude, QString( "-180%1" ).arg( deg ), QString( "180%1" ).arg( deg ), 180 );
         qobject_cast< LabeledSlider* >( m_input.data() )->slider()->setMinimum( -180 );
-    } else if( selectedType() == "Longitude" ) {
+    }
+    else if( selectedType() == "Longitude" )
+    {
         m_currentType = Echonest::DynamicPlaylist::ArtistMinLongitude;
         QString deg = QString( QChar( 0x00B0 ) );
         setupMinMaxWidgets( Echonest::DynamicPlaylist::ArtistMinLongitude, Echonest::DynamicPlaylist::ArtistMaxLongitude, QString( "-180%1" ).arg( deg ), QString( "180%1" ).arg( deg ), 180 );
         qobject_cast< LabeledSlider* >( m_input.data() )->slider()->setMinimum( -180 );
-    } else if( selectedType() == "Mode" ) {
+    }
+    else if( selectedType() == "Mode" )
+    {
         m_currentType = Echonest::DynamicPlaylist::Mode;
 
         QLabel* match = new QLabel( tr( "is" ) );
@@ -356,7 +391,9 @@ Tomahawk::EchonestControl::updateWidgets()
         combo->hide();
         m_match = QPointer< QWidget >( match );
         m_input = QPointer< QWidget >( combo );
-    } else if( selectedType() == "Key" ) {
+    }
+    else if( selectedType() == "Key" )
+    {
         m_currentType = Echonest::DynamicPlaylist::Key;
 
         QLabel* match = new QLabel( tr( "is" ) );
@@ -385,7 +422,9 @@ Tomahawk::EchonestControl::updateWidgets()
         combo->hide();
         m_match = QPointer< QWidget >( match );
         m_input = QPointer< QWidget >( combo );
-    } else if( selectedType() == "Sorting" ) {
+    }
+    else if( selectedType() == "Sorting" )
+    {
         m_currentType = Echonest::DynamicPlaylist::Sort;
 
         QComboBox* match = new QComboBox();
@@ -418,7 +457,9 @@ Tomahawk::EchonestControl::updateWidgets()
         combo->hide();
         m_match = QPointer< QWidget >( match );
         m_input = QPointer< QWidget >( combo );
-    } else if( selectedType() == "Mood" || selectedType() == "Style" || selectedType() == "Genre" ) {
+    }
+    else if( selectedType() == "Mood" || selectedType() == "Style" || selectedType() == "Genre" )
+    {
         if( selectedType() == "Mood" )
             m_currentType = Echonest::DynamicPlaylist::Mood;
         else if ( selectedType() == "Style" )
@@ -443,7 +484,9 @@ Tomahawk::EchonestControl::updateWidgets()
         m_input = QPointer< QWidget >( combo );
 
         insertMoodsStylesAndGenres();
-    } else if( selectedType() == "Song Type" ) {
+    }
+    else if( selectedType() == "Song Type" )
+    {
         m_currentType = Echonest::DynamicPlaylist::SongType;
 
         QComboBox* match = new QComboBox();
@@ -465,7 +508,9 @@ Tomahawk::EchonestControl::updateWidgets()
 
         m_match = QPointer< QWidget >( match );
         m_input = QPointer< QWidget >( combo );
-    } else {
+    }
+    else
+    {
         m_match = QPointer<QWidget>( new QWidget );
         m_input = QPointer<QWidget>( new QWidget );
     }
@@ -504,36 +549,53 @@ Tomahawk::EchonestControl::setupMinMaxWidgets( Echonest::DynamicPlaylist::Playli
 void
 Tomahawk::EchonestControl::updateData()
 {
-    if( selectedType() == "Artist" ) {
+    if( selectedType() == "Artist" )
+    {
         QComboBox* combo = qobject_cast<QComboBox*>( m_match.data() );
-        if( combo ) {
+        if( combo )
+        {
             m_matchString = combo->currentText();
             m_matchData = combo->itemData( combo->currentIndex() ).toString();
         }
         QLineEdit* edit = qobject_cast<QLineEdit*>( m_input.data() );
-        if( edit && !edit->text().isEmpty() ) {
+        if( edit && !edit->text().isEmpty() )
+        {
             m_data.first = m_currentType;
             m_data.second = edit->text();
         }
-    } else if( selectedType() == "Artist Description" || selectedType() == "Song" ) {
+    }
+    else if( selectedType() == "Artist Description" || selectedType() == "Song" )
+    {
         QLineEdit* edit = qobject_cast<QLineEdit*>( m_input.data() );
-        if( edit && !edit->text().isEmpty() ) {
+        if( edit && !edit->text().isEmpty() )
+        {
             m_data.first = m_currentType;
             m_data.second = edit->text();
         }
-    } else if( selectedType() == "Variety" || selectedType() == "Adventurousness" ) {
+    }
+    else if( selectedType() == "Variety" || selectedType() == "Adventurousness" )
+    {
         LabeledSlider* s = qobject_cast<LabeledSlider*>( m_input.data() );
-        if( s ) {
+        if( s )
+        {
             m_data.first = m_currentType;
             m_data.second = (qreal)s->slider()->value() / 10000.0;
         }
-    } else if( selectedType() == "Tempo" || selectedType() == "Duration" || selectedType() == "Loudness" || selectedType() == "Latitude" || selectedType() == "Longitude" ) {
+    }
+    else if( selectedType() == "Tempo" || selectedType() == "Duration" || selectedType() == "Loudness" || selectedType() == "Latitude" || selectedType() == "Longitude" )
+    {
         updateFromComboAndSlider();
-    } else if( selectedType() == "Danceability" || selectedType() == "Energy" || selectedType() == "Artist Familiarity" || selectedType() == "Artist Hotttnesss" || selectedType() == "Song Hotttnesss" ) {
+    }
+    else if( selectedType() == "Danceability" || selectedType() == "Energy" || selectedType() == "Artist Familiarity" || selectedType() == "Artist Hotttnesss" || selectedType() == "Song Hotttnesss" )
+    {
         updateFromComboAndSlider( true );
-    } else if( selectedType() == "Mode" || selectedType() == "Key" || selectedType() == "Mood" || selectedType() == "Style" || selectedType() == "Genre" || selectedType() == "User Radio" ) {
+    }
+    else if( selectedType() == "Mode" || selectedType() == "Key" || selectedType() == "Mood" || selectedType() == "Style" || selectedType() == "Genre" || selectedType() == "User Radio" )
+    {
         updateFromLabelAndCombo();
-    } else if( selectedType() == "Sorting" ) {
+    }
+    else if( selectedType() == "Sorting" )
+    {
         QComboBox* match = qobject_cast<QComboBox*>( m_match.data() );
         QComboBox* input = qobject_cast< QComboBox* >( m_input.data() );
         if( match && input ) {
@@ -546,10 +608,13 @@ Tomahawk::EchonestControl::updateData()
             m_data.second = enumVal;
 //             qDebug() << "SAVING" << input->currentIndex() << "AS" << enumVal << "(" << input->itemData( input->currentIndex() ).toInt() << "+" << m_matchData.toInt() << ")";
         }
-    } else if( selectedType() == "Song Type" ) {
+    }
+    else if( selectedType() == "Song Type" )
+    {
         QComboBox* match = qobject_cast<QComboBox*>( m_match.data() );
         QComboBox* combo = qobject_cast< QComboBox* >( m_input.data() );
-        if ( match && combo ) {
+        if ( match && combo )
+        {
             m_matchString = match->currentText();
             m_matchData = match->itemData( match->currentIndex() ).toString();
 
@@ -571,12 +636,14 @@ void
 Tomahawk::EchonestControl::updateFromComboAndSlider( bool smooth )
 {
     QComboBox* combo = qobject_cast<QComboBox*>( m_match.data() );
-    if( combo ) {
+    if( combo )
+    {
         m_matchString = combo->currentText();
         m_matchData = combo->itemData( combo->currentIndex() ).toString();
     }
     LabeledSlider* ls = qobject_cast<LabeledSlider*>( m_input.data() );
-    if( ls && ls->slider() ) {
+    if( ls && ls->slider() )
+    {
         m_data.first = static_cast< Echonest::DynamicPlaylist::PlaylistParam >( combo->itemData( combo->currentIndex() ).toInt() );
         m_data.second = ls->slider()->value() / ( smooth ? 10000. : 1.0 );
     }
@@ -587,7 +654,8 @@ void
 Tomahawk::EchonestControl::updateFromLabelAndCombo()
 {
     QComboBox* s = qobject_cast<QComboBox*>( m_input.data() );
-    if( s ) {
+    if( s )
+    {
         m_data.first = m_currentType;
         m_data.second = s->itemData( s->currentIndex() );
     }
@@ -598,18 +666,22 @@ Tomahawk::EchonestControl::updateFromLabelAndCombo()
 void
 Tomahawk::EchonestControl::updateWidgetsFromData()
 {
-    if( selectedType() == "Artist" ) {
+    if( selectedType() == "Artist" )
+    {
         QComboBox* combo = qobject_cast<QComboBox*>( m_match.data() );
         if( combo )
             combo->setCurrentIndex( combo->findData( m_matchData ) );
         QLineEdit* edit = qobject_cast<QLineEdit*>( m_input.data() );
         if( edit )
             edit->setText( m_data.second.toString() );
-    } else if( selectedType() == "Artist Description" || selectedType() == "Song" ) {
+    }
+    else if( selectedType() == "Artist Description" || selectedType() == "Song" )
+    {
         QLineEdit* edit = qobject_cast<QLineEdit*>( m_input.data() );
         if( edit )
             edit->setText( m_data.second.toString() );
-    } else if ( selectedType() == "User Radio"  )
+    }
+    else if ( selectedType() == "User Radio"  )
     {
         QComboBox* combo = qobject_cast< QComboBox* >( m_input.data() );
         if ( combo )
@@ -629,17 +701,27 @@ Tomahawk::EchonestControl::updateWidgetsFromData()
 
             combo->setCurrentIndex( combo->findData( m_data.second ) );
         }
-    } else if( selectedType() == "Variety" || selectedType() == "Adventurousness" ) {
+    }
+    else if( selectedType() == "Variety" || selectedType() == "Adventurousness" )
+    {
         LabeledSlider* s = qobject_cast<LabeledSlider*>( m_input.data() );
         if( s )
             s->slider()->setValue( m_data.second.toDouble() * 10000 );
-    } else if( selectedType() == "Tempo" || selectedType() == "Duration" || selectedType() == "Loudness"  || selectedType() == "Latitude" || selectedType() == "Longitude" ) {
+    }
+    else if( selectedType() == "Tempo" || selectedType() == "Duration" || selectedType() == "Loudness"  || selectedType() == "Latitude" || selectedType() == "Longitude" )
+    {
         updateToComboAndSlider();
-    } else if( selectedType() == "Danceability" || selectedType() == "Energy" || selectedType() == "Artist Familiarity" || selectedType() == "Artist Hotttnesss" || selectedType() == "Song Hotttnesss" ) {
+    }
+    else if( selectedType() == "Danceability" || selectedType() == "Energy" || selectedType() == "Artist Familiarity" || selectedType() == "Artist Hotttnesss" || selectedType() == "Song Hotttnesss" )
+    {
         updateToComboAndSlider( true );
-    } else if( selectedType() == "Mode" || selectedType() == "Key" || selectedType() == "Mood" || selectedType() == "Style" || selectedType() == "Genre" ) {
+    }
+    else if( selectedType() == "Mode" || selectedType() == "Key" || selectedType() == "Mood" || selectedType() == "Style" || selectedType() == "Genre" )
+    {
         updateToLabelAndCombo();
-    } else if( selectedType() == "Sorting" ) {
+    }
+    else if( selectedType() == "Sorting" )
+    {
         QComboBox* match = qobject_cast<QComboBox*>( m_match.data() );
         QComboBox* input = qobject_cast< QComboBox* >( m_input.data() );
         if( match && input ) {
@@ -648,9 +730,11 @@ Tomahawk::EchonestControl::updateWidgetsFromData()
             // HACK alert. if it's odd, subtract 1
             int val = ( m_data.second.toInt() - ( m_data.second.toInt() % 2 ) ) / 2;
             input->setCurrentIndex( val );
-//             qDebug() << "LOADING" << m_data.second.toInt() << "AS" << val;
+            //qDebug() << "LOADING" << m_data.second.toInt() << "AS" << val;
         }
-    } else if( selectedType() == "Song Type" ) {
+    }
+    else if( selectedType() == "Song Type" )
+    {
         QComboBox* match = qobject_cast<QComboBox*>( m_match.data() );
         QComboBox* combo = qobject_cast< QComboBox* >( m_input.data() );
         if ( match && combo ) {
@@ -680,9 +764,8 @@ void
 Tomahawk::EchonestControl::updateToLabelAndCombo()
 {
     QComboBox* s = qobject_cast< QComboBox* >( m_input.data() );
-    if( s ) {
+    if( s )
         s->setCurrentIndex( s->findData( m_data.second ) );
-    }
 }
 
 
@@ -945,12 +1028,18 @@ Tomahawk::EchonestControl::insertMoodsStylesAndGenres()
 {
     QStringList src;
     if ( selectedType() == "Mood" )
+    {
         src = EchonestGenerator::moods();
+    }
     else if ( selectedType() == "Style" )
+    {
         src = EchonestGenerator::styles();
+    }
     else
+    {
         src = EchonestGenerator::genres();
-    
+    }
+
     QComboBox* combo = qobject_cast< QComboBox* >( m_input.data() );
     if( !combo )
         return false;
@@ -959,8 +1048,10 @@ Tomahawk::EchonestControl::insertMoodsStylesAndGenres()
         combo->addItem( item, item );
     }
 
-    if( src.isEmpty() && !combo->count() ) {
-        if( s_stylePollCount <= 20 && !s_fetchingMoodsStylesAndGenres ) { // try for 20s to get the styles...
+    if( src.isEmpty() && !combo->count() )
+    {
+        if( s_stylePollCount <= 20 && !s_fetchingMoodsStylesAndGenres )
+        { // try for 20s to get the styles...
             s_fetchingMoodsStylesAndGenres = true;
             QTimer::singleShot( 1000, this, SLOT( checkForMoodsStylesOrGenresFetched() ) );
         }
diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
index a8e1564a9..d6aea73b2 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
@@ -613,7 +613,7 @@ EchonestGenerator::sentenceSummary()
 void
 EchonestGenerator::loadStylesMoodsAndGenres()
 {
-    if( !s_styles.isEmpty() || !s_moods.isEmpty() || !s_genres.isEmpty() ) //TODO: rly? if one of those is not empty we don't try to load the others?
+    if( !s_styles.isEmpty() && !s_moods.isEmpty() && !s_genres.isEmpty() )
         return;
 
     QVariant styles = TomahawkUtils::Cache::instance()->getData( "EchonesGenerator", "styles" );
@@ -629,8 +629,7 @@ EchonestGenerator::loadStylesMoodsAndGenres()
     }
 
     QVariant moods = TomahawkUtils::Cache::instance()->getData( "EchonesGenerator", "moods" );
-    if ( moods.isValid() && moods.canConvert< QStringList >() )
-    {
+    if ( moods.isValid() && moods.canConvert< QStringList >() ) {
         s_moods = moods.toStringList();
     }
     else
@@ -651,7 +650,6 @@ EchonestGenerator::loadStylesMoodsAndGenres()
         s_genresJob = Echonest::Artist::fetchGenres();
         connect( s_genresJob, SIGNAL( finished() ), this, SLOT( genresReceived() ) );
     }
-
 }
 
 void
@@ -677,9 +675,12 @@ EchonestGenerator::moodsReceived()
     QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
     Q_ASSERT( r );
 
-    try {
+    try
+    {
         s_moods = Echonest::Artist::parseTermList( r ).toList();
-    } catch( Echonest::ParseError& e ) {
+    }
+    catch( Echonest::ParseError& e )
+    {
         qWarning() << "Echonest failed to parse moods list";
     }
     s_moodsJob = 0;
@@ -702,9 +703,12 @@ EchonestGenerator::stylesReceived()
     QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
     Q_ASSERT( r );
 
-    try {
+    try
+    {
         s_styles = Echonest::Artist::parseTermList( r ).toList();
-    } catch( Echonest::ParseError& e ) {
+    }
+    catch( Echonest::ParseError& e )
+    {
         qWarning() << "Echonest failed to parse styles list";
     }
     s_stylesJob = 0;
@@ -725,9 +729,12 @@ EchonestGenerator::genresReceived()
     QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
     Q_ASSERT( r );
 
-    try {
+    try
+    {
         s_genres = Echonest::Artist::parseGenreList( r ).toList();
-    } catch( Echonest::ParseError& e ) {
+    }
+    catch( Echonest::ParseError& e )
+    {
         qWarning() << "Echonest failed to parse genres list";
     }
     s_genresJob = 0;

From 643d71fd582da349eefacc19616138f3400dd98c Mon Sep 17 00:00:00 2001
From: Stefan Derkits <stefan@derkits.at>
Date: Sun, 27 Jan 2013 17:04:16 +0100
Subject: [PATCH 6/6] bump TOMAHAWK_SETTINGS_VERSION & write upgrade code (to
 remove file echonest_stylesandmoods.dat)

---
 src/libtomahawk/TomahawkSettings.cpp | 7 +++++++
 src/libtomahawk/TomahawkSettings.h   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/libtomahawk/TomahawkSettings.cpp b/src/libtomahawk/TomahawkSettings.cpp
index 81a0232a0..4c2a73287 100644
--- a/src/libtomahawk/TomahawkSettings.cpp
+++ b/src/libtomahawk/TomahawkSettings.cpp
@@ -605,6 +605,13 @@ TomahawkSettings::doUpgrade( int oldVersion, int newVersion )
             }
         }
     }
+    else if ( oldVersion == 13 )
+    {
+        //Delete old echonest_stylesandmoods.dat file
+        QFile dataFile( TomahawkUtils::appDataDir().absoluteFilePath( "echonest_stylesandmoods.dat" ) );
+        const bool removed = dataFile.remove();
+        tDebug() << "Tried to remove echonest_stylesandmoods.dat, succeeded?" << removed;
+    }
 }
 
 
diff --git a/src/libtomahawk/TomahawkSettings.h b/src/libtomahawk/TomahawkSettings.h
index 7373452f8..8a8048c38 100644
--- a/src/libtomahawk/TomahawkSettings.h
+++ b/src/libtomahawk/TomahawkSettings.h
@@ -28,7 +28,7 @@
 #include <QtNetwork/QNetworkProxy>
 #include <QStringList>
 
-#define TOMAHAWK_SETTINGS_VERSION 13
+#define TOMAHAWK_SETTINGS_VERSION 14
 
 /**
  * Convenience wrapper around QSettings for tomahawk-specific config