Change api interface folders to api_* to fix legacy tmdb_api folder cleanup on new installs.

Rename logger use of libtrakt to api_trakt.

CHANGES.md

@@ -90,6 +90,7 @@
 * Change revert all IMDb ids to 7 chars
 * Fix new unique_name in templates 
 * Fix genre field in tvmaze_api
+* Change api interface folders to api_* to fix legacy tmdb_api folder cleanup on new installs
 
 
 ### 0.24.15 (2021-08-05 11:45:00 UTC)

_cleaner.py

@@ -46,6 +46,11 @@ if old_magic != magic_number:
 
 # skip cleaned005 as used during dev by testers
 cleanups = [
+    ['.cleaned007.tmp', ('lib', 'tvmaze_api'), [
+        ('lib', 'imdb_api', '__pycache__'), ('lib', 'imdb_api'),
+        ('lib', 'libtrakt', '__pycache__'), ('lib', 'libtrakt'),
+        ('lib', 'tvdb_api', '__pycache__'), ('lib', 'tvdb_api'),
+        ('lib', 'tvmaze_api', '__pycache__'), ('lib', 'tvmaze_api')]],
     ['.cleaned006.tmp', ('lib', 'boto'), [
         ('lib', 'boto'), ('lib', 'growl'),
         ('lib', 'hachoir', 'core'), ('lib', 'hachoir', 'field'), ('lib', 'hachoir', 'metadata'),

gui/slick/interfaces/default/config_notifications.tmpl

@@ -1,7 +1,7 @@
 #import base64
 #import sickbeard
 #import re
-#from lib.libtrakt import TraktAPI
+#from lib.api_trakt import TraktAPI
 #from sickbeard.helpers import anon_url, starify
 #from sickbeard.notifiers import NotifierFactory
 <% def sg_var(varname, default=False): return getattr(sickbeard, varname, default) %>#slurp#

lib/libtrakt/indexerapiinterface.py → lib/api_trakt/indexerapiinterface.py

@@ -28,7 +28,7 @@ id_map = {
 id_map_reverse = {v: k for k, v in iteritems(id_map)}
 
 tz_p = parser()
-log = logging.getLogger('libtrakt.api')
+log = logging.getLogger('api_trakt.api')
 log.addHandler(logging.NullHandler())
 
 

lib/libtrakt/trakt.py → lib/api_trakt/trakt.py

@@ -14,7 +14,7 @@ from .exceptions import *
 if False:
     from typing import Any, AnyStr, Dict
 
-log = logging.getLogger('libtrakt')
+log = logging.getLogger('api_trakt')
 log.addHandler(logging.NullHandler())
 
 

sickbeard/__init__.py

@@ -57,7 +57,7 @@ from adba.aniDBerrors import AniDBError
 # noinspection PyProtectedMember
 from browser_ua import get_ua
 from configobj import ConfigObj
-from libtrakt import TraktAPI
+from api_trakt import TraktAPI
 
 from _23 import b64encodestring, decode_bytes, filter_iter, list_items, map_list, ordered_dict, scandir
 from six import iteritems, PY2, string_types
@@ -69,7 +69,7 @@ if False:
     from adba import Connection
     from .event_queue import Events
     from .tv import TVShow
-    from lib.libtrakt.trakt import TraktAccount
+    from lib.api_trakt.trakt import TraktAccount
 
 PID = None
 ENV = {}

sickbeard/config.py

@@ -26,7 +26,7 @@ import encodingKludge as ek
 import sickbeard
 import sickbeard.providers
 from . import db, helpers, logger, naming
-from lib.libtrakt import TraktAPI
+from lib.api_trakt import TraktAPI
 
 from _23 import filter_list, urlsplit, urlunsplit
 from six import string_types

sickbeard/indexers/indexer_config.py

@@ -1,8 +1,8 @@
-from lib.tvdb_api.tvdb_api import Tvdb
+from lib.api_tvdb.tvdb_api import Tvdb
-from lib.libtrakt.indexerapiinterface import TraktIndexer
+from lib.api_trakt.indexerapiinterface import TraktIndexer
-from lib.tvmaze_api.tvmaze_api import TvMaze
+from lib.api_tvmaze.tvmaze_api import TvMaze
-from lib.tmdb_api.tmdb_api import TmdbIndexer
+from lib.api_tmdb.tmdb_api import TmdbIndexer
-from lib.imdb_api.imdb_api import IMDbIndexer
+from lib.api_imdb.imdb_api import IMDbIndexer
 # noinspection PyUnresolvedReferences
 from lib.tvinfo_base import (
     TVINFO_FACEBOOK, TVINFO_INSTAGRAM, TVINFO_TWITTER, TVINFO_WIKIPEDIA,

sickbeard/logger.py

@@ -76,7 +76,7 @@ class SBRotatingLogHandler(object):
         self.log_lock = threading.Lock()
         self.log_types = ['sickbeard', 'tornado.application', 'tornado.general', 'subliminal', 'adba', 'encodingKludge',
                           'tvdb.api', 'TVInfo']
-        self.external_loggers = ['sg.helper', 'libtrakt', 'libtrakt.api']
+        self.external_loggers = ['sg.helper', 'api_trakt', 'api_trakt.api']
         self.log_types_null = ['tornado.access']
 
     def __del__(self):

sickbeard/notifiers/__init__.py

@@ -20,7 +20,7 @@ import os
 import re
 
 # import pushalot
-# from lib import libtrakt
+# from lib import api_trakt
 from . import emby, kodi, plex, xbmc, \
     boxcar2, nmj, nmjv2, pushbullet, pushover, pytivo, synoindex, synologynotifier, \
     discord, emailnotify, gitter, libnotify, growl, prowl, slack, telegram, trakt

sickbeard/notifiers/trakt.py

@@ -20,7 +20,7 @@ import os
 
 from .generic import BaseNotifier
 import sickbeard
-from lib.libtrakt import TraktAPI, exceptions
+from lib.api_trakt import TraktAPI, exceptions
 from exceptions_helper import ConnectionSkipException
 
 from _23 import list_keys

sickbeard/webserve.py

@@ -91,8 +91,8 @@ from lib.cfscrape import CloudflareScraper
 from lib.dateutil import tz, zoneinfo
 from lib.dateutil.relativedelta import relativedelta
 from lib.fuzzywuzzy import fuzz
-from lib.libtrakt import TraktAPI
+from lib.api_trakt import TraktAPI
-from lib.libtrakt.exceptions import TraktException, TraktAuthException
+from lib.api_trakt.exceptions import TraktException, TraktAuthException
 
 import lib.rarfile.rarfile as rarfile