admin/jellycon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copy log handler from JF for Kodi, modify for strings

Browse Source
This commit is contained in:
Matt
2020-07-25 01:01:30 -04:00
parent 9813295fd3
commit a0efd1087f
34 changed files with 535 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
resources/lib/server_detect.py
View File

@@ -15,12 +15,12 @@ import xbmc
from .kodi_utils import HomeWindow
from .downloadutils import DownloadUtils, save_user_details, load_user_details
from .simple_logging import SimpleLogging
from .loghandler import LazyLogger
from .translation import string_load
from .utils import datetime_from_string
from .clientinfo import ClientInformation
log = SimpleLogging(__name__)
log = LazyLogger(__name__)
__addon__ = xbmcaddon.Addon()
__addon_name__ = __addon__.getAddonInfo('name')
@@ -39,7 +39,7 @@ def check_connection_speed():
server = du.get_server()
url = server + "/playback/bitratetest?size=%s" % test_data_size
head = du.get_auth_header(True)
head["User-Agent"] = "JellyCon-" + ClientInformation().get_version()
@@ -57,7 +57,7 @@ def check_connection_speed():
start_time = time.time()
log.debug("Starting Connection Speed Test")
response = requests.get(url, **request_details)
last_percentage_done = 0
@@ -70,7 +70,7 @@ def check_connection_speed():
progress_dialog.update(percentage_done)
last_percentage_done = percentage_done
else:
log.error("HTTP response error: {0} {1}", response.status_code, response.content)
log.error("HTTP response error: {0} {1}".format(response.status_code, response.content))
error_message = "HTTP response error: %s\n%s" % (response.status_code, response.content)
xbmcgui.Dialog().ok("Speed Test Error", error_message)
return -1
@@ -78,7 +78,7 @@ def check_connection_speed():
total_data_read_kbits = (total_data_read * 8) / 1000
total_time = time.time() - start_time
speed = int(total_data_read_kbits / total_time)
log.debug("Finished Connection Speed Test, speed: {0} total_data: {1}, total_time: {2}", speed, total_data_read, total_time)
log.debug("Finished Connection Speed Test, speed: {0} total_data: {1}, total_time: {2}".format(speed, total_data_read, total_time))
progress_dialog.close()
del progress_dialog
@@ -101,7 +101,7 @@ def check_safe_delete_available():
json_data = du.download_url("{server}/Plugins")
result = json.loads(json_data)
if result is not None:
log.debug("Server Plugin List: {0}", result)
log.debug("Server Plugin List: {0}".format(result))
safe_delete_found = False
for plugin in result:
@@ -109,7 +109,7 @@ def check_safe_delete_available():
safe_delete_found = True
break
log.debug("Safe Delete Plugin Available: {0}", safe_delete_found)
log.debug("Safe Delete Plugin Available: {0}".format(safe_delete_found))
home_window = HomeWindow()
if safe_delete_found:
home_window.set_property("safe_delete_plugin_available", "true")
@@ -136,8 +136,8 @@ def get_server_details():
sock.setsockopt(socket.SOL_IP, socket.IP_MULTICAST_LOOP, 1)
sock.setsockopt(socket.IPPROTO_IP, socket.SO_REUSEADDR, 1)
log.debug("MutliGroup: {0}", multi_group)
log.debug("Sending UDP Data: {0}", message)
log.debug("MutliGroup: {0}".format(multi_group))
log.debug("Sending UDP Data: {0}".format(message))
progress = xbmcgui.DialogProgress()
progress.create(__addon_name__ + " : " + string_load(30373))
@@ -158,11 +158,11 @@ def get_server_details():
except:
break
except Exception as e:
log.error("UPD Discovery Error: {0}", e)
log.error("UPD Discovery Error: {0}".format(e))
progress.close()
log.debug("Found Servers: {0}", servers)
log.debug("Found Servers: {0}".format(servers))
return servers
@@ -225,10 +225,10 @@ def check_server(force=False, change_user=False, notify=False):
else:
xbmc.executebuiltin("ActivateWindow(Home)")
return
public_lookup_url = "%s/Users/Public?format=json" % (server_url)
log.debug("Testing_Url: {0}", public_lookup_url)
log.debug("Testing_Url: {0}".format(public_lookup_url))
progress = xbmcgui.DialogProgress()
progress.create(__addon_name__ + " : " + string_load(30376))
progress.update(0, string_load(30377))
@@ -248,7 +248,7 @@ def check_server(force=False, change_user=False, notify=False):
xbmc.executebuiltin("ActivateWindow(Home)")
return
log.debug("Selected server: {0}", server_url)
log.debug("Selected server: {0}".format(server_url))
settings.setSetting("server_address", server_url)
something_changed = True
@@ -268,7 +268,7 @@ def check_server(force=False, change_user=False, notify=False):
log.debug("Getting user list")
json_data = du.download_url(server_url + "/Users/Public?format=json", authenticate=False)
log.debug("jsonData: {0}", json_data)
log.debug("jsonData: {0}".format(json_data))
try:
result = json.loads(json_data)
except:
@@ -293,13 +293,13 @@ def check_server(force=False, change_user=False, notify=False):
last_active = user.get("LastActivityDate")
if last_active:
last_active_date = datetime_from_string(last_active)
log.debug("LastActivityDate: {0}", last_active_date)
log.debug("LastActivityDate: {0}".format(last_active_date))
ago = datetime.now() - last_active_date
log.debug("LastActivityDate: {0}", ago)
log.debug("LastActivityDate: {0}".format(ago))
days = divmod(ago.seconds, 86400)
hours = divmod(days[1], 3600)
minutes = divmod(hours[1], 60)
log.debug("LastActivityDate: {0} {1} {2}", days[0], hours[0], minutes[0])
log.debug("LastActivityDate: {0} {1} {2}".format(days[0], hours[0], minutes[0]))
if days[0]:
time_ago += " %sd" % days[0]
if hours[0]:
@@ -311,7 +311,7 @@ def check_server(force=False, change_user=False, notify=False):
time_ago = "Active: now"
else:
time_ago = "Active: %s ago" % time_ago
log.debug("LastActivityDate: {0}", time_ago)
log.debug("LastActivityDate: {0}".format(time_ago))
user_item = xbmcgui.ListItem(name)
user_image = du.get_user_artwork(user, 'Primary')
@@ -377,7 +377,7 @@ def check_server(force=False, change_user=False, notify=False):
manual = selected_user.getProperty("manual") == "true"
selected_user_name = selected_user.getLabel()
log.debug("Selected User Name: {0} : {1}", return_value, selected_user_name)
log.debug("Selected User Name: {0} : {1}".format(return_value, selected_user_name))
if manual:
kb = xbmc.Keyboard()
@@ -387,7 +387,7 @@ def check_server(force=False, change_user=False, notify=False):
kb.doModal()
if kb.isConfirmed():
selected_user_name = kb.getText()
log.debug("Manual entered username: {0}", selected_user_name)
log.debug("Manual entered username: {0}".format(selected_user_name))
else:
return
@@ -406,8 +406,8 @@ def check_server(force=False, change_user=False, notify=False):
settings.setSetting("saved_user_password_" + hashed_username, "")
if saved_password:
log.debug("Saving username and password: {0}", selected_user_name)
log.debug("Using stored password for user: {0}", hashed_username)
log.debug("Saving username and password: {0}".format(selected_user_name))
log.debug("Using stored password for user: {0}".format(hashed_username))
save_user_details(settings, selected_user_name, saved_password)
else:
@@ -416,17 +416,17 @@ def check_server(force=False, change_user=False, notify=False):
kb.setHiddenInput(True)
kb.doModal()
if kb.isConfirmed():
log.debug("Saving username and password: {0}", selected_user_name)
log.debug("Saving username and password: {0}".format(selected_user_name))
save_user_details(settings, selected_user_name, kb.getText())
# should we save the password
if allow_password_saving:
save_password = xbmcgui.Dialog().yesno(string_load(30363), string_load(30364))
if save_password:
log.debug("Saving password for fast user switching: {0}", hashed_username)
log.debug("Saving password for fast user switching: {0}".format(hashed_username))
settings.setSetting("saved_user_password_" + hashed_username, kb.getText())
else:
log.debug("Saving username with no password: {0}", selected_user_name)
log.debug("Saving username with no password: {0}".format(selected_user_name))
save_user_details(settings, selected_user_name, "")
if something_changed: