Fixes for analytics.

bazarr/analytics.py

@@ -19,7 +19,6 @@ radarr_version = get_radarr_version()
 
 def track_event(category=None, action=None, label=None):
     if not settings.analytics.getboolean('enabled'):
-        print "no analytics"
         return
 
     anonymousConfig = Config()
@@ -41,8 +40,10 @@ def track_event(category=None, action=None, label=None):
 
     tracker.add_custom_variable(CustomVariable(index=1, name='BazarrVersion', value=os.environ["BAZARR_VERSION"], scope=1))
     tracker.add_custom_variable(CustomVariable(index=2, name='PythonVersion', value=platform.python_version(), scope=1))
-    tracker.add_custom_variable(CustomVariable(index=3, name='SonarrVersion', value=sonarr_version, scope=1))
-    tracker.add_custom_variable(CustomVariable(index=4, name='RadarrVersion', value=radarr_version, scope=1))
+    if settings.general.getboolean('use_sonarr'):
+        tracker.add_custom_variable(CustomVariable(index=3, name='SonarrVersion', value=sonarr_version, scope=1))
+    if settings.general.getboolean('use_radarr'):
+        tracker.add_custom_variable(CustomVariable(index=4, name='RadarrVersion', value=radarr_version, scope=1))
     tracker.add_custom_variable(CustomVariable(index=5, name='OSVersion', value=platform.platform(), scope=1))
     tracker.track_event(event, session, visitor)
     tracker.track_pageview(page, session, visitor)

bazarr/get_subtitle.py

@@ -483,7 +483,7 @@ def manual_download_subtitle(path, language, hi, forced, subtitle, provider, pro
                         else:
                             reversed_path = path_replace_reverse_movie(path)
 
-                        track_event(category=downloaded_provider, action="downloaded", label=downloaded_language)
+                        track_event(category=downloaded_provider, action="manually_downloaded", label=downloaded_language)
                         
                         return message, reversed_path, downloaded_language_code2, downloaded_provider, subtitle.score, subtitle.language.forced
                 else: