Replace tmdb.py with tmdb3.py

This replaces tmdb.py with tmdb3.py as the default grabber for Movie metadata. It also updates the database schema to force the change for existing users. The web API tmdb.py uses will be shut down after 2013-09-15, so this is a necessary change for 0.27, and will likely need to be done for 0.26 once tmdb3.py gets a bit wider testing.
MythTV · Jul 6, 2013 · 9be80b7 · 9be80b7
1 parent f47beff
commit 9be80b7
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 6 deletions.
diff --git a/mythtv/bindings/perl/MythTV.pm b/mythtv/bindings/perl/MythTV.pm
@@ -115,7 +115,7 @@ package MythTV;
 # schema version supported in the main code.  We need to check that the schema
 # version in the database is as expected by the bindings, which are expected
 # to be kept in sync with the main code.
-    our $SCHEMA_VERSION = "1314";
+    our $SCHEMA_VERSION = "1315";
 
 # NUMPROGRAMLINES is defined in mythtv/libs/libmythtv/programinfo.h and is
 # the number of items in a ProgramInfo QStringList group used by

diff --git a/mythtv/bindings/python/MythTV/dataheap.py b/mythtv/bindings/python/MythTV/dataheap.py
@@ -1170,7 +1170,7 @@ class VideoGrabber( Grabber ):
     def __init__(self, mode, lang='en', db=None):
         dbvalue = {'tv':'TelevisionGrabber', 'movie':'MovieGrabber'}
         path = {'tv':'metadata/Television/ttvdb.py',
-                'movie':'metadata/Movie/tmdb.py'}
+                'movie':'metadata/Movie/tmdb3.py'}
         self.mode = mode.lower()
         try:
             Grabber.__init__(self, setting=dbvalue[self.mode], db=db,

diff --git a/mythtv/bindings/python/MythTV/static.py b/mythtv/bindings/python/MythTV/static.py
@@ -5,7 +5,7 @@
 """
 
 OWN_VERSION = (0,27,-1,0)
-SCHEMA_VERSION = 1314
+SCHEMA_VERSION = 1315
 NVSCHEMA_VERSION = 1007
 MUSICSCHEMA_VERSION = 1018
 PROTO_VERSION = '77'

diff --git a/mythtv/libs/libmythbase/mythversion.h b/mythtv/libs/libmythbase/mythversion.h
@@ -61,7 +61,7 @@
  *      mythtv/bindings/php/MythBackend.php
 #endif
 
-#define MYTH_DATABASE_VERSION "1314"
+#define MYTH_DATABASE_VERSION "1315"
 
 
  MBASE_PUBLIC  const char *GetMythSourceVersion();

diff --git a/mythtv/libs/libmythmetadata/metadatadownload.cpp b/mythtv/libs/libmythmetadata/metadatadownload.cpp
@@ -278,7 +278,7 @@ MetadataLookupList MetadataDownload::runGrabber(QString cmd, QStringList args,
 
 QString MetadataDownload::GetMovieGrabber()
 {
-    QString def_cmd = "metadata/Movie/tmdb.py";
+    QString def_cmd = "metadata/Movie/tmdb3.py";
     QString db_cmd = gCoreContext->GetSetting("MovieGrabber", def_cmd);
 
     return QDir::cleanPath(QString("%1/%2")

diff --git a/mythtv/libs/libmythtv/dbcheck.cpp b/mythtv/libs/libmythtv/dbcheck.cpp
@@ -2437,6 +2437,19 @@ NULL
             return false;
     }
 
+    if (dbver == "1314")
+    {
+        // Migrate users from tmdb.py to tmdb3.py
+        // The web interface tmdb.py uses will be shut down 2013-09-15
+        const char *updates[] = {
+            "UPDATE settings SET data=REPLACE(data, 'tmdb.py', 'tmdb3.py') "
+             "WHERE value='MovieGrabber'",
+            NULL
+        };
+        if (!performActualUpdate(&updates[0], "1315", dbver))
+            return false;
+    }
+
     return true;
 }
 

diff --git a/mythtv/programs/mythfrontend/grabbersettings.cpp b/mythtv/programs/mythfrontend/grabbersettings.cpp
@@ -227,7 +227,7 @@ void GrabberSettings::Init(void)
     QString currentTVGrabber = gCoreContext->GetSetting("TelevisionGrabber",
                                          "metadata/Television/ttvdb.py");
     QString currentMovieGrabber = gCoreContext->GetSetting("MovieGrabber",
-                                         "metadata/Movie/tmdb.py");
+                                         "metadata/Movie/tmdb3.py");
     QString currentGameGrabber = gCoreContext->GetSetting("mythgame.MetadataGrabber",
                                          "metadata/Game/giantbomb.py");