mirror of
https://github.com/jellyfin/jellyfin-kodi.git
synced 2024-12-26 02:36:10 +00:00
Clear old path replacement before writing new one + linting
This commit is contained in:
parent
3e3a79c6bb
commit
cea2da2e3c
3 changed files with 10 additions and 4 deletions
|
@ -27,7 +27,12 @@ from ..helper import (
|
||||||
JSONRPC,
|
JSONRPC,
|
||||||
LazyLogger,
|
LazyLogger,
|
||||||
)
|
)
|
||||||
from ..helper.utils import JsonDebugPrinter, translate_path, kodi_version, path_replacements
|
from ..helper.utils import (
|
||||||
|
JsonDebugPrinter,
|
||||||
|
translate_path,
|
||||||
|
kodi_version,
|
||||||
|
path_replacements
|
||||||
|
)
|
||||||
from ..jellyfin import Jellyfin
|
from ..jellyfin import Jellyfin
|
||||||
|
|
||||||
#################################################################################################
|
#################################################################################################
|
||||||
|
|
|
@ -32,7 +32,6 @@ class API(object):
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.warning("Addon appears to not be configured yet: {}".format(e))
|
LOG.warning("Addon appears to not be configured yet: {}".format(e))
|
||||||
|
|
||||||
|
|
||||||
def get_playcount(self, played, playcount):
|
def get_playcount(self, played, playcount):
|
||||||
"""Convert Jellyfin played/playcount into
|
"""Convert Jellyfin played/playcount into
|
||||||
the Kodi equivalent. The playcount is tied to the watch status.
|
the Kodi equivalent. The playcount is tied to the watch status.
|
||||||
|
|
|
@ -493,7 +493,7 @@ def path_replacements():
|
||||||
|
|
||||||
# Retrieve existing stored paths
|
# Retrieve existing stored paths
|
||||||
credentials = get_credentials()
|
credentials = get_credentials()
|
||||||
if credentials['Servers']:
|
if credentials["Servers"]:
|
||||||
paths = credentials["Servers"][0].get("paths", {})
|
paths = credentials["Servers"][0].get("paths", {})
|
||||||
else:
|
else:
|
||||||
paths = {}
|
paths = {}
|
||||||
|
@ -501,7 +501,7 @@ def path_replacements():
|
||||||
|
|
||||||
# 0 is Finish, -1 is Cancel
|
# 0 is Finish, -1 is Cancel
|
||||||
while selected_path not in [0, -1]:
|
while selected_path not in [0, -1]:
|
||||||
replace_paths = [ f'{x} : {paths[x]}' for x in paths.keys() ]
|
replace_paths = [f"{x} : {paths[x]}" for x in paths.keys()]
|
||||||
# Insert a "Finish" entry first, and an "Add" entry second
|
# Insert a "Finish" entry first, and an "Add" entry second
|
||||||
replace_paths.insert(0, translate(33204))
|
replace_paths.insert(0, translate(33204))
|
||||||
replace_paths.insert(1, translate(33205))
|
replace_paths.insert(1, translate(33205))
|
||||||
|
@ -516,6 +516,8 @@ def path_replacements():
|
||||||
# Edit an existing path replacement
|
# Edit an existing path replacement
|
||||||
edit_remote_path = list(paths.keys())[selected_path - 2]
|
edit_remote_path = list(paths.keys())[selected_path - 2]
|
||||||
edit_local_path = paths[edit_remote_path]
|
edit_local_path = paths[edit_remote_path]
|
||||||
|
# Deleting the existing path
|
||||||
|
del paths[edit_remote_path]
|
||||||
# Prepopulate the text box with the existing value
|
# Prepopulate the text box with the existing value
|
||||||
remote_path = dialog("input", translate(33206), defaultt=edit_remote_path)
|
remote_path = dialog("input", translate(33206), defaultt=edit_remote_path)
|
||||||
local_path = dialog("input", translate(33207), defaultt=edit_local_path)
|
local_path = dialog("input", translate(33207), defaultt=edit_local_path)
|
||||||
|
|
Loading…
Reference in a new issue