Ticket #341: dbupdate-short.2.patch

mythplugins/mythmusic/mythmusic/main.cpp

@@ -6 +6 @@
 #include <qapplication.h>
 #include <qsqldatabase.h>
 #include <qregexp.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include <cdaudio.h>
@@ -93 +95 @@
     query.exec();
 }
 
+void UpdateFileInDB(const QString &directory, const QString &filename)
+{
+    Decoder *decoder = getDecoder(filename);
+    
+    if (decoder)
+    {
+        Metadata *db_meta = decoder->getMetadata();
+        Metadata *disk_meta = decoder->readMetadata();
+        
+        if (db_meta && disk_meta)
+        {
+            disk_meta->setID(db_meta->ID());
+            disk_meta->updateDatabase(directory);
+        }
+        
+        if (disk_meta)
+            delete disk_meta;
+        
+        if (db_meta)
+            delete db_meta;
+        
+        delete decoder;
+    }
+}
+
 enum MusicFileLocation
 {
     kFileSystem,
     kDatabase,
+    kNeedUpdate,
     kBoth
 };
 
@@ -142 +170 @@
     }
 }
 
+bool HasFileChanged(const QString &filename, const QString &date_modified)
+{
+    struct stat sbuf;
+    if (stat(filename.ascii(), &sbuf) == 0) 
+    {
+        if (date_modified.isEmpty() ||
+            sbuf.st_mtime > 
+            (time_t)QDateTime::fromString(date_modified, 
+                                          Qt::ISODate).toTime_t()) 
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
 void SavePending(int pending)
 {
     //  Temporary Hack until mythmusic
@@ -213 +257 @@
     delete busy;
 
     MSqlQuery query(MSqlQuery::InitCon());
-    query.exec("SELECT filename "
+    query.exec("SELECT filename, date_modified "
                "FROM musicmetadata "
                "WHERE filename NOT LIKE ('%://%')");
 
@@ -232 +276 @@
 
             if (name != QString::null)
             {
-                if ((iter = music_files.find(name)) != music_files.end())
+                if ((iter = music_files.find(name)) != music_files.end()) {
+                    if (HasFileChanged(name, query.value(1).toString())) {
+                        music_files[name] = kNeedUpdate;
+                    } else {
                     music_files.remove(iter);
-                else
+                    }
+                } else {
                     music_files[name] = kDatabase;
             }
+            }
             file_checking->setProgress(++counter);
         }
     }
@@ -247 +296 @@
     file_checking = new MythProgressDialog(
         QObject::tr("Updating music database"), music_files.size());
 
+     /*
+       This can be optimised quite a bit by consolidating all commands
+       via a lot of refactoring.
+       
+       1) group all files of the same decoder type, and don't
+       create/delete a Decoder pr. AddFileToDB. Or make Decoders be
+       singletons, it should be a fairly simple change.
+       
+       2) RemoveFileFromDB should group the remove into one big SQL.
+       
+       3) UpdateFileInDB, same as 1.
+     */
+
     counter = 0;
     for (iter = music_files.begin(); iter != music_files.end(); iter++)
     {
@@ -254 +316 @@
             AddFileToDB(directory, iter.key());
         else if (*iter == kDatabase)
             RemoveFileFromDB(directory, iter.key ());
+         else if (*iter == kNeedUpdate) 
+             UpdateFileInDB(directory, iter.key());
 
         file_checking->setProgress(++counter);
     }
@@ -309 +373 @@
     AllMusic *all_music;
 };
 
+void RebuildMusicTree(MusicData *mdata) 
+{
+    MythBusyDialog busy(QObject::tr("Rebuilding music tree"));
+    busy.start();
+    mdata->all_music->startLoading();
+    while (!mdata->all_music->doneLoading()) {
+        qApp->processEvents();
+        usleep(50000);
+    }
+    mdata->all_playlists->postLoad();
+    busy.Close();
+}
+
 void MusicCallback(void *data, QString &selection)
 {
     MusicData *mdata = (MusicData *)data;
@@ -328 +405 @@
             //  Reconcile with the database
             SearchDir(mdata->startdir);
             //  Tell the metadata to reset itself
-            mdata->all_music->resync();
-            mdata->all_playlists->postLoad();
+            RebuildMusicTree(mdata);
         }
     }
     else if (sel == "settings_scan")
@@ -337 +413 @@
         if ("" != mdata->startdir)
         {
             SearchDir(mdata->startdir);
-            mdata->all_music->resync();
-            mdata->all_playlists->postLoad();
+            RebuildMusicTree(mdata);
         }
     }
     else if (sel == "music_set_general")
@@ -610 +685 @@
         // if startRipper returns true, then new files should be present
         // so we should look for them.
         SearchDir(mdata.startdir);
-        mdata.all_music->resync();
-        mdata.all_playlists->postLoad();
+        RebuildMusicTree(&mdata);
     }
     postMusic(&mdata);
 }

mythplugins/mythmusic/mythmusic/metadata.cpp

@@ -1 +1 @@
 #include <iostream> 
+#include <qapplication.h>
 #include <qregexp.h> 
 #include <qdatetime.h>
 #include <qdir.h>
@@ -194 +195 @@
         return;
 
     query.prepare("INSERT INTO musicmetadata (artist,compilation_artist,album,title,"
-                  "genre,year,tracknum,length,filename,compilation,date_added) VALUES "
+                  "genre,year,tracknum,length,filename,compilation,date_added,"
+                  "date_modified) VALUES "
                   "(:ARTIST, :COMPILATION_ARTIST, :ALBUM, :TITLE, :GENRE, :YEAR, :TRACKNUM, "
-                  ":LENGTH, :FILENAME, :COMPILATION, :DATE_ADDED );");
+                  ":LENGTH, :FILENAME, :COMPILATION, :DATE_ADDED, :DATE_MODIFIED );");
     query.bindValue(":ARTIST", artist.utf8());
     query.bindValue(":COMPILATION_ARTIST", compilation_artist.utf8());
     query.bindValue(":ALBUM", album.utf8());
@@ -207 +209 @@
     query.bindValue(":LENGTH", length);
     query.bindValue(":FILENAME", sqlfilename.utf8());
     query.bindValue(":COMPILATION", compilation);
-    query.bindValue(":DATE_ADDED", QDate::currentDate());
+    query.bindValue(":DATE_ADDED", QDateTime::currentDateTime());
+    query.bindValue(":DATE_MODIFIED", QDateTime::currentDateTime());
     
     query.exec();
 
@@ -364 +367 @@
                   "compilation_artist = :COMPILATION_ARTIST, "
                   "title = :TITLE, genre = :GENRE, year = :YEAR, "
                   "tracknum = :TRACKNUM, rating = :RATING, " 
-                  "compilation = :COMPILATION "
+                  "compilation = :COMPILATION, "
+                  "date_modified= :DATE_MODIFIED "
                   "WHERE intid = :ID;");
     query.bindValue(":ARTIST", artist.utf8());
     query.bindValue(":COMPILATION_ARTIST", compilation_artist.utf8());
@@ -375 +379 @@
     query.bindValue(":TRACKNUM", tracknum);
     query.bindValue(":RATING", rating);
     query.bindValue(":COMPILATION", compilation);
+    query.bindValue(":DATE_MODIFIED", QDateTime::currentDateTime());
     query.bindValue(":ID", id);
 
     if (!query.exec())
@@ -683 +688 @@
     //  loading and sorting
     //
     
-    metadata_loader = new MetadataLoadingThread(this);
-    metadata_loader->start();
+    metadata_loader = NULL;
+    startLoading();
 
     all_music.setAutoDelete(true);
     top_nodes.setAutoDelete(true);
@@ -718 +723 @@
     return false;
 }
 
+bool AllMusic::startLoading(void) 
+{
+    // Set this to false early rather than letting it be delayed till
+    // the thread calls resync.
+    done_loading = false;
+
+    if (metadata_loader) {
+        cleanOutThreads();
+        delete metadata_loader;
+    }
+
+    metadata_loader = new MetadataLoadingThread(this);
+    metadata_loader->start();
+    
+    return true;
+}
+
 void AllMusic::resync()
 {
     done_loading = false;
@@ -1161 +1183 @@
         if( *it != "genre"  &&
             *it != "artist" &&
             *it != "splitartist" && 
+            *it != "splitartist1" && 
             *it != "album"  &&
             *it != "title")
         {

mythplugins/mythmusic/mythmusic/metadata.h

@@ -274 +274 @@
     Metadata*   getMetadata(int an_id);
     bool        updateMetadata(int an_id, Metadata *the_track);
     void        save();
+        /** \brief Start loading metadata.
+                Makes the AllMusic object run it's resync in a thread. Once done, it's
+                doneLoading method will return true.
+
+                \note Alternatively, it could be made to emit a signal so the
+                caller won't have to poll for completion.
+
+                \returns true if the loader thread was started
+        */
+        bool        startLoading (void);
     void        resync();   //  After a CD rip, for example
     void        clearCDData();
     void        addCDTrack(Metadata *the_track);