diff --git a/resources/lib/action_menu.py b/resources/lib/action_menu.py index 79cad7c..0698d62 100644 --- a/resources/lib/action_menu.py +++ b/resources/lib/action_menu.py @@ -1,4 +1,5 @@ # Gnu General Public License - see LICENSE.TXT +from __future__ import division, absolute_import, print_function, unicode_literals import time import threading diff --git a/resources/lib/bitrate_dialog.py b/resources/lib/bitrate_dialog.py index a617b23..1b4fcb6 100644 --- a/resources/lib/bitrate_dialog.py +++ b/resources/lib/bitrate_dialog.py @@ -1,3 +1,5 @@ +from __future__ import division, absolute_import, print_function, unicode_literals + import xbmc import xbmcgui diff --git a/resources/lib/cache_images.py b/resources/lib/cache_images.py index 24d2c71..bf81011 100644 --- a/resources/lib/cache_images.py +++ b/resources/lib/cache_images.py @@ -1,5 +1,6 @@ # coding=utf-8 # Gnu General Public License - see LICENSE.TXT +from __future__ import division, absolute_import, print_function, unicode_literals import urllib import requests diff --git a/resources/lib/clientinfo.py b/resources/lib/clientinfo.py index f82e28b..1187fd5 100644 --- a/resources/lib/clientinfo.py +++ b/resources/lib/clientinfo.py @@ -1,4 +1,5 @@ # Gnu General Public License - see LICENSE.TXT +from __future__ import division, absolute_import, print_function, unicode_literals from uuid import uuid4 as uuid4 import xbmcaddon diff --git a/resources/lib/datamanager.py b/resources/lib/datamanager.py index 8d37130..7c4e55a 100644 --- a/resources/lib/datamanager.py +++ b/resources/lib/datamanager.py @@ -1,4 +1,5 @@ # Gnu General Public License - see LICENSE.TXT +from __future__ import division, absolute_import, print_function, unicode_literals import json from collections import defaultdict diff --git a/resources/lib/dir_functions.py b/resources/lib/dir_functions.py index e8159ba..634b32d 100644 --- a/resources/lib/dir_functions.py +++ b/resources/lib/dir_functions.py @@ -1,4 +1,5 @@ # Gnu General Public License - see LICENSE.TXT +from __future__ import division, absolute_import, print_function, unicode_literals import xbmcaddon import xbmcplugin diff --git a/resources/lib/downloadutils.py b/resources/lib/downloadutils.py index 87fb2c1..5a00788 100644 --- a/resources/lib/downloadutils.py +++ b/resources/lib/downloadutils.py @@ -1,5 +1,5 @@ # Gnu General Public License - see LICENSE.TXT -from __future__ import unicode_literals +from __future__ import division, absolute_import, print_function, unicode_literals import xbmcgui import xbmcaddon diff --git a/resources/lib/functions.py b/resources/lib/functions.py index 4ec7ef3..f8cb4fc 100644 --- a/resources/lib/functions.py +++ b/resources/lib/functions.py @@ -1,4 +1,5 @@ # Gnu General Public License - see LICENSE.TXT +from __future__ import division, absolute_import, print_function, unicode_literals import urllib import sys diff --git a/resources/lib/image_server.py b/resources/lib/image_server.py index 8783696..7bd4fef 100644 --- a/resources/lib/image_server.py +++ b/resources/lib/image_server.py @@ -1,3 +1,5 @@ +from __future__ import division, absolute_import, print_function, unicode_literals + import xbmcvfs import xbmc import base64 diff --git a/resources/lib/item_functions.py b/resources/lib/item_functions.py index 04d34f6..491d46d 100644 --- a/resources/lib/item_functions.py +++ b/resources/lib/item_functions.py @@ -1,3 +1,4 @@ +from __future__ import division, absolute_import, print_function, unicode_literals import sys import os diff --git a/resources/lib/jsonrpc.py b/resources/lib/jsonrpc.py index e5bf56d..7953eb9 100644 --- a/resources/lib/jsonrpc.py +++ b/resources/lib/jsonrpc.py @@ -1,3 +1,5 @@ +from __future__ import division, absolute_import, print_function, unicode_literals + import json import xbmc @@ -9,7 +11,7 @@ class JsonRpc(object): params = None def __init__(self, method, **kwargs): - + self.method = method for arg in kwargs: # id_(int), jsonrpc(str) @@ -18,7 +20,7 @@ class JsonRpc(object): def _query(self): query = { - + 'jsonrpc': self.jsonrpc, 'id': self.id_, 'method': self.method, diff --git a/resources/lib/kodi_utils.py b/resources/lib/kodi_utils.py index 78e466e..d1b4849 100644 --- a/resources/lib/kodi_utils.py +++ b/resources/lib/kodi_utils.py @@ -1,3 +1,5 @@ +from __future__ import division, absolute_import, print_function, unicode_literals + import xbmc import xbmcgui import xbmcplugin diff --git a/resources/lib/library_change_monitor.py b/resources/lib/library_change_monitor.py index 75b0f62..62dc91d 100644 --- a/resources/lib/library_change_monitor.py +++ b/resources/lib/library_change_monitor.py @@ -1,3 +1,5 @@ +from __future__ import division, absolute_import, print_function, unicode_literals + import threading import time diff --git a/resources/lib/menu_functions.py b/resources/lib/menu_functions.py index 894a186..dc672ef 100644 --- a/resources/lib/menu_functions.py +++ b/resources/lib/menu_functions.py @@ -1,5 +1,6 @@ # coding=utf-8 # Gnu General Public License - see LICENSE.TXT +from __future__ import division, absolute_import, print_function, unicode_literals import sys import json diff --git a/resources/lib/picture_viewer.py b/resources/lib/picture_viewer.py index 58fdc6f..60f1b4b 100644 --- a/resources/lib/picture_viewer.py +++ b/resources/lib/picture_viewer.py @@ -1,3 +1,5 @@ +from __future__ import division, absolute_import, print_function, unicode_literals + import xbmc import xbmcaddon import xbmcgui diff --git a/resources/lib/play_utils.py b/resources/lib/play_utils.py index e34a3ca..132e413 100644 --- a/resources/lib/play_utils.py +++ b/resources/lib/play_utils.py @@ -1202,8 +1202,6 @@ class PlaybackService(xbmc.Monitor): self.monitor = monitor def onNotification(self, sender, method, data): - log.debug("PlaybackService:onNotification:{0}:{1}:{2}".format(sender, method, data)) - if method == 'GUI.OnScreensaverActivated': self.screensaver_activated() return diff --git a/resources/lib/playnext.py b/resources/lib/playnext.py index f858e0f..d1e8d0d 100644 --- a/resources/lib/playnext.py +++ b/resources/lib/playnext.py @@ -1,3 +1,5 @@ +from __future__ import division, absolute_import, print_function, unicode_literals + import os import threading diff --git a/resources/lib/resume_dialog.py b/resources/lib/resume_dialog.py index 2bb31e6..0232049 100644 --- a/resources/lib/resume_dialog.py +++ b/resources/lib/resume_dialog.py @@ -1,4 +1,5 @@ # Gnu General Public License - see LICENSE.TXT +from __future__ import division, absolute_import, print_function, unicode_literals import xbmcgui diff --git a/resources/lib/safe_delete_dialog.py b/resources/lib/safe_delete_dialog.py index 046df1f..f8ec874 100644 --- a/resources/lib/safe_delete_dialog.py +++ b/resources/lib/safe_delete_dialog.py @@ -1,4 +1,5 @@ # Gnu General Public License - see LICENSE.TXT +from __future__ import division, absolute_import, print_function, unicode_literals import xbmc import xbmcgui diff --git a/resources/lib/server_detect.py b/resources/lib/server_detect.py index 0e2b8bd..54afd9c 100644 --- a/resources/lib/server_detect.py +++ b/resources/lib/server_detect.py @@ -1,4 +1,5 @@ # Gnu General Public License - see LICENSE.TXT +from __future__ import division, absolute_import, print_function, unicode_literals import socket import json diff --git a/resources/lib/server_sessions.py b/resources/lib/server_sessions.py index 9d8d81f..253136e 100644 --- a/resources/lib/server_sessions.py +++ b/resources/lib/server_sessions.py @@ -1,3 +1,4 @@ +from __future__ import division, absolute_import, print_function, unicode_literals import json import sys diff --git a/resources/lib/skin_cloner.py b/resources/lib/skin_cloner.py index fb103fb..bbd4483 100644 --- a/resources/lib/skin_cloner.py +++ b/resources/lib/skin_cloner.py @@ -1,4 +1,5 @@ # Gnu General Public License - see LICENSE.TXT +from __future__ import division, absolute_import, print_function, unicode_literals import os diff --git a/resources/lib/tracking.py b/resources/lib/tracking.py index 285b547..ea0750c 100644 --- a/resources/lib/tracking.py +++ b/resources/lib/tracking.py @@ -1,4 +1,5 @@ # Gnu General Public License - see LICENSE.TXT +from __future__ import division, absolute_import, print_function, unicode_literals import sys import functools diff --git a/resources/lib/trakttokodi.py b/resources/lib/trakttokodi.py index c90e448..0c8a1ab 100644 --- a/resources/lib/trakttokodi.py +++ b/resources/lib/trakttokodi.py @@ -1,4 +1,5 @@ # Gnu General Public License - see LICENSE.TXT +from __future__ import division, absolute_import, print_function, unicode_literals import urllib import encodings diff --git a/resources/lib/translation.py b/resources/lib/translation.py index 319485e..27f029e 100644 --- a/resources/lib/translation.py +++ b/resources/lib/translation.py @@ -1,3 +1,5 @@ +from __future__ import division, absolute_import, print_function, unicode_literals + import xbmcaddon from .loghandler import LazyLogger diff --git a/resources/lib/utils.py b/resources/lib/utils.py index c567e69..8161972 100644 --- a/resources/lib/utils.py +++ b/resources/lib/utils.py @@ -1,4 +1,6 @@ # Gnu General Public License - see LICENSE.TXT +from __future__ import division, absolute_import, print_function, unicode_literals + import xbmcaddon import xbmc import xbmcvfs diff --git a/resources/lib/websocket.py b/resources/lib/websocket.py index 18caab3..880c32f 100644 --- a/resources/lib/websocket.py +++ b/resources/lib/websocket.py @@ -73,7 +73,7 @@ STATUS_INVALID_EXTENSION = 1010 STATUS_UNEXPECTED_CONDITION = 1011 STATUS_TLS_HANDSHAKE_ERROR = 1015 -logger = logging.getLogger() +#logger = logging.getLogger() class WebSocketException(Exception): @@ -108,10 +108,10 @@ def enableTrace(tracable): """ global traceEnabled traceEnabled = tracable - if tracable: - if not logger.handlers: - logger.addHandler(logging.StreamHandler()) - logger.setLevel(logging.DEBUG) + #if tracable: + # if not logger.handlers: + # logger.addHandler(logging.StreamHandler()) + # logger.setLevel(logging.DEBUG) def setdefaulttimeout(timeout): @@ -512,10 +512,10 @@ class WebSocket(object): header_str = "\r\n".join(headers) self._send(header_str) - if traceEnabled: - logger.debug("--- request header ---") - logger.debug(header_str) - logger.debug("-----------------------") + #if traceEnabled: + # logger.debug("--- request header ---") + # logger.debug(header_str) + # logger.debug("-----------------------") status, resp_headers = self._read_headers() if status != 101: @@ -550,16 +550,16 @@ class WebSocket(object): def _read_headers(self): status = None headers = {} - if traceEnabled: - logger.debug("--- response header ---") + #if traceEnabled: + # logger.debug("--- response header ---") while True: line = self._recv_line() if line == "\r\n": break line = line.strip() - if traceEnabled: - logger.debug(line) + #if traceEnabled: + # logger.debug(line) if not status: status_info = line.split(" ", 2) status = int(status_info[1]) @@ -571,8 +571,8 @@ class WebSocket(object): else: raise WebSocketException("Invalid header") - if traceEnabled: - logger.debug("-----------------------") + #if traceEnabled: + # logger.debug("-----------------------") return status, headers @@ -591,8 +591,8 @@ class WebSocket(object): frame.get_mask_key = self.get_mask_key data = frame.format() length = len(data) - if traceEnabled: - logger.debug("send: " + repr(data)) + #if traceEnabled: + # logger.debug("send: " + repr(data)) while data: l = self._send(data) data = data[l:] @@ -645,7 +645,7 @@ class WebSocket(object): self._cont_data[1] += frame.data else: self._cont_data = [frame.opcode, frame.data] - + if frame.fin: data = self._cont_data self._cont_data = None @@ -718,12 +718,12 @@ class WebSocket(object): reason: the reason to close. This must be string. """ - + try: self.sock.shutdown(socket.SHUT_RDWR) except: pass - + ''' if self.connected: if status < 0 or status >= ABNF.LENGTH_16: @@ -735,10 +735,10 @@ class WebSocket(object): self.sock.settimeout(3) try: frame = self.recv_frame() - if logger.isEnabledFor(logging.ERROR): + if #logger.isEnabledFor(logging.ERROR): recv_status = struct.unpack("!H", frame.data)[0] if recv_status != STATUS_NORMAL: - logger.error("close status: " + repr(recv_status)) + #logger.error("close status: " + repr(recv_status)) except: pass self.sock.settimeout(timeout) @@ -856,7 +856,7 @@ class WebSocketApp(object): """ self.keep_running = False if(self.sock != None): - self.sock.close() + self.sock.close() def _send_ping(self, interval): while True: @@ -897,14 +897,14 @@ class WebSocketApp(object): thread.start() while self.keep_running: - + try: data = self.sock.recv() - + if data is None or self.keep_running == False: break - self._callback(self.on_message, data) - + self._callback(self.on_message, data) + except Exception as e: found_timeout = False for arg in e.args: @@ -928,7 +928,7 @@ class WebSocketApp(object): try: callback(self, *args) except Exception as e: - logger.error(e) + #logger.error(e) if True:#logger.isEnabledFor(logging.DEBUG): _, _, tb = sys.exc_info() traceback.print_tb(tb) diff --git a/resources/lib/widgets.py b/resources/lib/widgets.py index c008a03..43c7710 100644 --- a/resources/lib/widgets.py +++ b/resources/lib/widgets.py @@ -1,3 +1,5 @@ +from __future__ import division, absolute_import, print_function, unicode_literals + import xbmcaddon import xbmcplugin import xbmcgui @@ -81,7 +83,7 @@ def set_background_image(force=False): url_params = {} url_params["Recursive"] = True - # url_params["limit"] = 60 + url_params["limit"] = 100 url_params["SortBy"] = "Random" url_params["IncludeItemTypes"] = "Movie,Series" url_params["ImageTypeLimit"] = 1