diff --git a/resources/lib/action_menu.py b/resources/lib/action_menu.py index df1bb3d..204769c 100644 --- a/resources/lib/action_menu.py +++ b/resources/lib/action_menu.py @@ -1,5 +1,6 @@ -# Gnu General Public License - see LICENSE.TXT -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) import time import threading diff --git a/resources/lib/cache_images.py b/resources/lib/cache_images.py index aff6cf2..53f01a3 100644 --- a/resources/lib/cache_images.py +++ b/resources/lib/cache_images.py @@ -1,9 +1,7 @@ -# coding=utf-8 -# Gnu General Public License - see LICENSE.TXT -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) -from six.moves.urllib.parse import unquote -import requests import base64 import sys import threading @@ -13,6 +11,8 @@ import xbmcgui import xbmcplugin import xbmc import xbmcaddon +import requests +from six.moves.urllib.parse import unquote from .jellyfin import api from .lazylogger import LazyLogger diff --git a/resources/lib/datamanager.py b/resources/lib/datamanager.py index 46ac41b..47b49c5 100644 --- a/resources/lib/datamanager.py +++ b/resources/lib/datamanager.py @@ -1,10 +1,16 @@ -# Gnu General Public License - see LICENSE.TXT -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) import threading import hashlib import os import time + +import xbmc +import xbmcaddon +import xbmcvfs +import xbmcgui from six.moves import cPickle from .jellyfin import api @@ -15,11 +21,6 @@ from .tracking import timer from .filelock import FileLock from .utils import translate_string, load_user_details, translate_path -import xbmc -import xbmcaddon -import xbmcvfs -import xbmcgui - log = LazyLogger(__name__) diff --git a/resources/lib/dialogs.py b/resources/lib/dialogs.py index 5c150dd..292f290 100644 --- a/resources/lib/dialogs.py +++ b/resources/lib/dialogs.py @@ -1,4 +1,6 @@ -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) import xbmcgui diff --git a/resources/lib/dir_functions.py b/resources/lib/dir_functions.py index 113ef8b..140f4b5 100644 --- a/resources/lib/dir_functions.py +++ b/resources/lib/dir_functions.py @@ -1,19 +1,23 @@ -# Gnu General Public License - see LICENSE.TXT -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) + +import sys +import re import xbmcaddon import xbmcplugin import xbmcgui - from six.moves.urllib.parse import quote, unquote -import sys -import re from .datamanager import DataManager from .lazylogger import LazyLogger from .item_functions import add_gui_item, ItemDetails -from .utils import send_event_notification, translate_string, load_user_details, get_default_filters from .tracking import timer +from .utils import ( + send_event_notification, translate_string, + load_user_details, get_default_filters +) log = LazyLogger(__name__) diff --git a/resources/lib/functions.py b/resources/lib/functions.py index 1baef0a..301fe0c 100644 --- a/resources/lib/functions.py +++ b/resources/lib/functions.py @@ -1,30 +1,40 @@ -# Gnu General Public License - see LICENSE.TXT -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) -from six.moves.urllib.parse import quote, unquote, parse_qsl import sys import os import time import cProfile import pstats -from six import StringIO import xbmcplugin import xbmcgui import xbmcaddon import xbmc +from six import StringIO +from six.moves.urllib.parse import quote, unquote, parse_qsl from .jellyfin import api -from .utils import translate_string, get_version, load_user_details, get_art_url, get_default_filters, translate_path, kodi_version +from .utils import ( + translate_string, get_version, load_user_details, get_art_url, + get_default_filters, translate_path, kodi_version +) from .kodi_utils import HomeWindow from .datamanager import clear_cached_server_data from .server_detect import check_server, check_connection_speed from .lazylogger import LazyLogger -from .menu_functions import display_main_menu, display_menu, show_movie_alpha_list, show_tvshow_alpha_list, show_genre_list, show_search, show_movie_pages, show_artist_alpha_list +from .menu_functions import ( + display_main_menu, display_menu, show_movie_alpha_list, + show_tvshow_alpha_list, show_genre_list, show_search, + show_movie_pages, show_artist_alpha_list +) from .server_sessions import show_server_sessions from .action_menu import ActionMenu from .dialogs import BitrateDialog -from .widgets import get_widget_content, get_widget_content_cast, check_for_new_content +from .widgets import ( + get_widget_content, get_widget_content_cast, check_for_new_content +) from .cache_images import CacheArtwork from .dir_functions import get_content, process_directory from .tracking import timer diff --git a/resources/lib/image_server.py b/resources/lib/image_server.py index 4cb7a52..2cf9357 100644 --- a/resources/lib/image_server.py +++ b/resources/lib/image_server.py @@ -1,19 +1,21 @@ -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) + +import threading +import io +import base64 +import re +from random import shuffle import xbmcvfs import xbmc import xbmcaddon -import base64 -import re -from random import shuffle +import requests from six.moves.BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer from six.moves.urllib.parse import urlparse from six import ensure_text -import threading -import requests -import io - from .jellyfin import api from .lazylogger import LazyLogger from .item_functions import get_art diff --git a/resources/lib/item_functions.py b/resources/lib/item_functions.py index 4588e5f..0521cf4 100644 --- a/resources/lib/item_functions.py +++ b/resources/lib/item_functions.py @@ -1,15 +1,18 @@ -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) import sys -from six.moves.urllib.parse import quote from dateutil import tz - +from six import ensure_text +from six.moves.urllib.parse import quote import xbmcgui -from .utils import datetime_from_string, get_art_url, image_url, get_current_datetime +from .utils import ( + datetime_from_string, get_art_url, image_url, get_current_datetime +) from .lazylogger import LazyLogger -from six import ensure_text log = LazyLogger(__name__) diff --git a/resources/lib/jellyfin.py b/resources/lib/jellyfin.py index fbc5a35..e455787 100644 --- a/resources/lib/jellyfin.py +++ b/resources/lib/jellyfin.py @@ -1,10 +1,12 @@ -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) -import xbmcaddon -from kodi_six.utils import py2_decode +import json import requests -import json +import xbmcaddon +from kodi_six.utils import py2_decode from .utils import get_device_id, get_version, load_user_details from .lazylogger import LazyLogger diff --git a/resources/lib/jsonrpc.py b/resources/lib/jsonrpc.py index 7953eb9..9fc5f52 100644 --- a/resources/lib/jsonrpc.py +++ b/resources/lib/jsonrpc.py @@ -1,6 +1,9 @@ -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) import json + import xbmc diff --git a/resources/lib/kodi_utils.py b/resources/lib/kodi_utils.py index 5c6c99d..d95bf9d 100644 --- a/resources/lib/kodi_utils.py +++ b/resources/lib/kodi_utils.py @@ -1,11 +1,13 @@ -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) + +import sys import xbmcgui import xbmcplugin import xbmcaddon -import sys - from .lazylogger import LazyLogger log = LazyLogger(__name__) diff --git a/resources/lib/lazylogger.py b/resources/lib/lazylogger.py index c53ddef..e2077d4 100644 --- a/resources/lib/lazylogger.py +++ b/resources/lib/lazylogger.py @@ -1,5 +1,6 @@ -# -*- coding: utf-8 -*- -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) class LazyLogger(object): diff --git a/resources/lib/loghandler.py b/resources/lib/loghandler.py index 558ce9f..c734472 100644 --- a/resources/lib/loghandler.py +++ b/resources/lib/loghandler.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- -from __future__ import division, absolute_import, print_function, unicode_literals - -################################################################################################## +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) import os import logging @@ -13,13 +12,9 @@ from kodi_six import xbmc, xbmcaddon from .utils import translate_path -################################################################################################## - __addon__ = xbmcaddon.Addon(id='plugin.video.jellycon') __pluginpath__ = translate_path(__addon__.getAddonInfo('path')) -################################################################################################## - def getLogger(name=None): if name is None: diff --git a/resources/lib/menu_functions.py b/resources/lib/menu_functions.py index 8c8c180..878afb6 100644 --- a/resources/lib/menu_functions.py +++ b/resources/lib/menu_functions.py @@ -1,20 +1,23 @@ -# coding=utf-8 -# Gnu General Public License - see LICENSE.TXT -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) import sys -from six import ensure_binary, ensure_text -from six.moves.urllib.parse import quote import base64 import string import xbmcplugin import xbmcaddon +from six import ensure_binary, ensure_text +from six.moves.urllib.parse import quote from .jellyfin import api from .kodi_utils import add_menu_directory_item, HomeWindow from .lazylogger import LazyLogger -from .utils import get_jellyfin_url, translate_string, get_art_url, get_default_filters, get_current_user_id +from .utils import ( + get_jellyfin_url, translate_string, get_art_url, + get_default_filters, get_current_user_id +) from .item_functions import get_art log = LazyLogger(__name__) diff --git a/resources/lib/monitors.py b/resources/lib/monitors.py index 61a1a5e..7c6b85d 100644 --- a/resources/lib/monitors.py +++ b/resources/lib/monitors.py @@ -1,9 +1,12 @@ -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) import threading import time import xbmc + from .functions import show_menu from .lazylogger import LazyLogger from .widgets import check_for_new_content diff --git a/resources/lib/picture_viewer.py b/resources/lib/picture_viewer.py index e62f15b..d016403 100644 --- a/resources/lib/picture_viewer.py +++ b/resources/lib/picture_viewer.py @@ -1,4 +1,6 @@ -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) import xbmcgui diff --git a/resources/lib/play_utils.py b/resources/lib/play_utils.py index 32eb81f..f7ef16b 100644 --- a/resources/lib/play_utils.py +++ b/resources/lib/play_utils.py @@ -1,18 +1,19 @@ -# Gnu General Public License - see LICENSE.TXT -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) + +import json +import os +import re +import sys +from datetime import timedelta import xbmc import xbmcgui import xbmcaddon import xbmcvfs import xbmcplugin - -from datetime import timedelta -import json -import os -import re from six.moves.urllib.parse import urlencode -import sys from .jellyfin import api from .lazylogger import LazyLogger diff --git a/resources/lib/playnext.py b/resources/lib/playnext.py index 2edaa95..221def2 100644 --- a/resources/lib/playnext.py +++ b/resources/lib/playnext.py @@ -1,4 +1,6 @@ -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) import os import threading diff --git a/resources/lib/server_detect.py b/resources/lib/server_detect.py index 35bc08e..efa73c4 100644 --- a/resources/lib/server_detect.py +++ b/resources/lib/server_detect.py @@ -1,5 +1,6 @@ -# Gnu General Public License - see LICENSE.TXT -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) import socket import json @@ -12,7 +13,10 @@ import xbmc from .kodi_utils import HomeWindow from .jellyfin import API from .lazylogger import LazyLogger -from .utils import datetime_from_string, translate_string, save_user_details, load_user_details, get_current_datetime, get_saved_users +from .utils import ( + datetime_from_string, translate_string, save_user_details, + load_user_details, get_current_datetime, get_saved_users +) log = LazyLogger(__name__) diff --git a/resources/lib/server_sessions.py b/resources/lib/server_sessions.py index 8c76545..ef0fb5f 100644 --- a/resources/lib/server_sessions.py +++ b/resources/lib/server_sessions.py @@ -1,6 +1,9 @@ -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) import sys + import xbmcgui import xbmcplugin import xbmcaddon diff --git a/resources/lib/skin_cloner.py b/resources/lib/skin_cloner.py index 6bdb96a..b6be4aa 100644 --- a/resources/lib/skin_cloner.py +++ b/resources/lib/skin_cloner.py @@ -1,5 +1,6 @@ -# Gnu General Public License - see LICENSE.TXT -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) import os import xml.etree.ElementTree as ET diff --git a/resources/lib/tracking.py b/resources/lib/tracking.py index a7d33ad..cb1e08a 100644 --- a/resources/lib/tracking.py +++ b/resources/lib/tracking.py @@ -1,9 +1,11 @@ -# Gnu General Public License - see LICENSE.TXT -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) import sys import functools import time + from .lazylogger import LazyLogger log = LazyLogger(__name__) diff --git a/resources/lib/utils.py b/resources/lib/utils.py index c1c01cf..d4d5537 100644 --- a/resources/lib/utils.py +++ b/resources/lib/utils.py @@ -1,12 +1,8 @@ -# Gnu General Public License - see LICENSE.TXT -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) -import xbmcaddon -import xbmc -import xbmcvfs -from kodi_six.utils import py2_encode, py2_decode import sys - import binascii import string import random @@ -15,11 +11,16 @@ import time import math import os import hashlib -import requests -from datetime import datetime -from dateutil import tz import re +from datetime import datetime from uuid import uuid4 + +import requests +from dateutil import tz +import xbmcaddon +import xbmc +import xbmcvfs +from kodi_six.utils import py2_encode, py2_decode from six import ensure_text, ensure_binary, text_type from six.moves.urllib.parse import urlencode diff --git a/resources/lib/websocket_client.py b/resources/lib/websocket_client.py index 5a936d9..06654cc 100644 --- a/resources/lib/websocket_client.py +++ b/resources/lib/websocket_client.py @@ -1,16 +1,15 @@ -# -*- coding: utf-8 -*- +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) -################################################################################################# - -from __future__ import division, absolute_import, print_function, unicode_literals import json import threading -import websocket import time import xbmc import xbmcaddon import xbmcgui +import websocket from .jellyfin import API from .functions import play_action diff --git a/resources/lib/widgets.py b/resources/lib/widgets.py index 8ce82f1..8e39742 100644 --- a/resources/lib/widgets.py +++ b/resources/lib/widgets.py @@ -1,14 +1,20 @@ -from __future__ import division, absolute_import, print_function, unicode_literals +from __future__ import ( + division, absolute_import, print_function, unicode_literals +) -import xbmcaddon -import xbmcplugin -import xbmcgui import hashlib import random import time +import xbmcaddon +import xbmcplugin +import xbmcgui + from .jellyfin import api -from .utils import get_jellyfin_url, image_url, get_current_user_id, get_art_url, get_default_filters +from .utils import ( + get_jellyfin_url, image_url, get_current_user_id, + get_art_url, get_default_filters +) from .lazylogger import LazyLogger from .kodi_utils import HomeWindow from .dir_functions import process_directory