Merge lp:~jamesh/mediascanner/disable-tmdb into lp:mediascanner

[James Henstridge]

Don't error out if no TheMovieDB API key is provided. Instead disable the grl-tmdb metadata resolver.

Don't error out if no TheMovieDB API key is provided. Instead disable the grl-tmdb metadata resolver.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:395
http://jenkins.qa.ubuntu.com/job/mediascanner-ci/78/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-amd64-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-armhf-ci/78
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-armhf-ci/78/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-i386-ci/78

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mediascanner-ci/78/rebuild

review: Approve (continuous-integration)

[Jussi Pakkanen (jpakkane)]

Seems sensible.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-07 06:59:09 +0000
+++ CMakeLists.txt	2013-10-14 09:48:35 +0000
@@ -153,6 +153,18 @@
                 OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 # =============================================================================
+# Configure API key for "The Movie Database" API Key
+# =============================================================================
+
+set(TMDB_APIKEY "" CACHE STRING "API key for \"The Movie Database\"")
+
+if(TMDB_APIKEY)
+  set(TMDB_PLUGIN_CONFIG "(\"grl-tmdb\", \"grl-tmdb\", {\"api-key\": \"${TMDB_APIKEY}\"})")
+else(TMDB_APIKEY)
+  set(TMDB_PLUGIN_CONFIG "")
+endif(TMDB_APIKEY)
+
+# =============================================================================
 # Validate and install gsettings schema
 # =============================================================================
 
@@ -216,18 +228,6 @@
 find_google_tests()
 
 # =============================================================================
-# Configure API key for "The Movie Database" API Key
-# =============================================================================
-
-set(TMDB_APIKEY "" CACHE STRING "API key for \"The Movie Database\"")
-
-if (NOT TMDB_APIKEY)
-  message(FATAL_ERROR "No API key for \"The Movie Database\" configured")
-endif (NOT TMDB_APIKEY)
-
-add_definitions(-DTMDB_APIKEY="${TMDB_APIKEY}")
-
-# =============================================================================
 
 install(FILES README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
 

=== modified file 'debian/rules'
--- debian/rules	2013-08-20 08:13:11 +0000
+++ debian/rules	2013-10-14 09:48:35 +0000
@@ -12,7 +12,6 @@
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DCMAKE_INSTALL_LIBDIR="/usr/lib/${DEB_HOST_MULTIARCH}" \
-		-DTMDB_APIKEY="TDB:REPLACE-DUMMY-KEY" \
 		-DGLIB_SCHEMAS_COMPILE=OFF
 
 # TODO(jamesh): A number of the test fixtures create and delete files

=== modified file 'mediascanner.gschema.xml.in'
--- mediascanner.gschema.xml.in	2013-10-07 04:38:32 +0000
+++ mediascanner.gschema.xml.in	2013-10-14 09:48:35 +0000
@@ -76,7 +76,7 @@
        dictionary of strings describing configuration parameters like API keys.
       </description>
 
-      <default>[("grl-tmdb", "grl-tmdb", {"api-key": "@TMDB_APIKEY@"})]</default>
+      <default>[@TMDB_PLUGIN_CONFIG@]</default>
     </key>
   </schema>
 </schemalist>