Skip to content

Commit 249ec9c

Browse files
brikimbrikim
committed
Formatting updates
1 parent 8643dd6 commit 249ec9c

16 files changed

+1593
-658
lines changed

‎api/emby.py

+183-97
Large diffs are not rendered by default.

‎api/jellystat.py

+60-24
Original file line numberDiff line numberDiff line change
@@ -5,87 +5,123 @@
55
from common import utils
66

77
class JellystatAPI:
8-
def __init__(self, url: str, api_key: str, logger: Logger):
9-
self.url = url.rstrip('/')
8+
def __init__(
9+
self,
10+
url: str,
11+
api_key: str,
12+
logger: Logger
13+
):
14+
self.url = url.rstrip("/")
1015
self.api_key = api_key
1116
self.logger = logger
1217
self.invalid_type = None
13-
self.log_header = utils.get_log_header(utils.get_jellystat_ansi_code(), self.__module__)
18+
self.log_header = utils.get_log_header(
19+
utils.get_jellystat_ansi_code(),
20+
self.__module__
21+
)
1422

1523
def get_valid(self) -> bool:
1624
try:
1725
payload = {}
18-
r = requests.get(self.get_api_url() + '/getconfig', headers=self.get_headers(), params=payload)
26+
r = requests.get(
27+
self.get_api_url() + "/getconfig",
28+
headers=self.get_headers(),
29+
params=payload
30+
)
1931
if r.status_code < 300:
2032
return True
2133
except Exception as e:
2234
pass
2335
return False
2436

2537
def get_connection_error_log(self) -> str:
26-
return 'Could not connect to {} {} {}'.format(utils.get_formatted_jellystat(), utils.get_tag('url', self.url), utils.get_tag('api_key', self.api_key))
38+
return f"Could not connect to {utils.get_formatted_jellystat()} {utils.get_tag("url", self.url)} {utils.get_tag("api_key", self.api_key)}"
2739

2840
def get_invalid_type(self) -> Any:
2941
return self.invalid_type
3042

3143
def get_api_url(self) -> str:
32-
return self.url + '/api'
44+
return self.url + "/api"
3345

3446
def get_headers(self) -> Any:
35-
return {'x-api-token': self.api_key,
47+
return {"x-api-token": self.api_key,
3648
"Content-Type": "application/json"}
3749

3850
def get_library_id(self, libName: str) -> str:
3951
try:
4052
payload = {}
41-
r = requests.get(self.get_api_url() + '/getLibraries', headers=self.get_headers(), params=payload)
53+
r = requests.get(
54+
self.get_api_url() + "/getLibraries",
55+
headers=self.get_headers(),
56+
params=payload
57+
)
4258
response = r.json()
4359
for lib in response:
44-
if lib['Name'] == libName:
45-
return lib['Id']
60+
if lib["Name"] == libName:
61+
return lib["Id"]
4662
except Exception as e:
47-
self.logger.error("{} get_library_id {} {}".format(self.log_header, utils.get_tag('library_id', libName), utils.get_tag('error', e)))
63+
self.logger.error(
64+
f"{self.log_header} get_library_id {utils.get_tag("library_id", libName)} {utils.get_tag("error", e)}"
65+
)
4866

4967
return self.get_invalid_type()
5068

5169
def get_user_watch_history(self, userId: str) -> Any:
5270
try:
5371
payload = {
54-
'userid': userId}
55-
r = requests.post(self.get_api_url() + '/getUserHistory', headers=self.get_headers(), data=json.dumps(payload))
72+
"userid": userId}
73+
r = requests.post(
74+
self.get_api_url() + "/getUserHistory",
75+
headers=self.get_headers(),
76+
data=json.dumps(payload)
77+
)
5678

5779
response = r.json()
58-
if 'results' in response:
59-
return response['results']
80+
if "results" in response:
81+
return response["results"]
6082
else:
6183
return response
6284
except Exception as e:
63-
self.logger.error("{} get_user_watch_history {} {}".format(self.log_header, utils.get_tag('user_id', userId), utils.get_tag('error', e)))
85+
self.logger.error(
86+
f"{self.log_header} get_user_watch_history {utils.get_tag("user_id", userId)} {utils.get_tag("error", e)}"
87+
)
6488

6589
return self.get_invalid_type()
6690

6791
def get_library_history(self, libId: str) -> Any:
6892
try:
6993
payload = {
70-
'libraryid': libId}
71-
r = requests.post(self.get_api_url() + '/getLibraryHistory', headers=self.get_headers(), data=json.dumps(payload))
94+
"libraryid": libId}
95+
r = requests.post(
96+
self.get_api_url() + "/getLibraryHistory",
97+
headers=self.get_headers(),
98+
data=json.dumps(payload)
99+
)
72100

73101
response = r.json()
74-
if 'results' in response:
75-
return response['results']
102+
if "results" in response:
103+
return response["results"]
76104
else:
77105
return response
78106
except Exception as e:
79-
self.logger.error("{} get_library_history {} {}".format(self.log_header, utils.get_tag('lib_id', libId), utils.get_tag('error', e)))
107+
self.logger.error(
108+
f"{self.log_header} get_library_history {utils.get_tag("lib_id", libId)} {utils.get_tag("error", e)}"
109+
)
80110

81111
return self.get_invalid_type()
82112

83113
def get_item_details(self, itemId: str) -> Any:
84114
try:
85-
payload = {'Id': itemId}
86-
r = requests.post(self.get_api_url() + '/getItemDetails', headers=self.get_headers(), data=json.dumps(payload))
115+
payload = {"Id": itemId}
116+
r = requests.post(
117+
self.get_api_url() + "/getItemDetails",
118+
headers=self.get_headers(),
119+
data=json.dumps(payload)
120+
)
87121
return r.json()
88122
except Exception as e:
89-
self.logger.error("{} get_item_details {} {}".format(self.log_header, utils.get_tag('item', itemId), utils.get_tag('error', e)))
123+
self.logger.error(
124+
f"{self.log_header} get_item_details {utils.get_tag("item", itemId)} {utils.get_tag("error", e)}"
125+
)
90126

91127
return self.get_invalid_type()

‎api/plex.py

+37-12
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,25 @@ class PlexCollection:
1515
items: list[PlexCollectionItem] = field(default_factory=list)
1616

1717
class PlexAPI:
18-
def __init__(self, url: str, api_key: str, admin_user_name: str, media_path: str, logger: Logger):
18+
def __init__(
19+
self,
20+
url: str,
21+
api_key: str,
22+
admin_user_name: str,
23+
media_path: str,
24+
logger: Logger
25+
):
1926
self.url = url
2027
self.api_key = api_key
21-
self.plex_server = server.PlexServer(url.rstrip('/'), api_key)
28+
self.plex_server = server.PlexServer(url.rstrip("/"), api_key)
2229
self.admin_user_name = admin_user_name
2330
self.media_path = media_path
2431
self.logger = logger
2532
self.item_invalid_type = None
26-
self.log_header = utils.get_log_header(utils.get_plex_ansi_code(), self.__module__)
33+
self.log_header = utils.get_log_header(
34+
utils.get_plex_ansi_code(),
35+
self.__module__
36+
)
2737

2838
def get_valid(self) -> bool:
2939
try:
@@ -37,13 +47,13 @@ def get_name(self) -> str:
3747
return self.plex_server.friendlyName
3848

3949
def get_connection_error_log(self) -> str:
40-
return 'Could not connect to {} server {} {}'.format(utils.get_formatted_plex(), utils.get_tag('url', self.url), utils.get_tag('api_key', self.api_key))
50+
return f"Could not connect to {utils.get_formatted_plex()} server {utils.get_tag("url", self.url)} {utils.get_tag("api_key", self.api_key)}"
4151

4252
def get_media_type_show_name(self) -> str:
43-
return 'show'
53+
return "show"
4454

4555
def get_media_type_movie_name(self) -> str:
46-
return 'movie'
56+
return "movie"
4757

4858
def get_media_path(self) -> str:
4959
return self.media_path
@@ -57,7 +67,9 @@ def switch_plex_account(self, user_name):
5767
if current_user.username != user_name:
5868
self.plex_server.switchUser(user_name)
5969
except Exception as e:
60-
self.logger.error('{} switch_plex_account {} {}'.format(self.log_header, utils.get_tag('user', user_name), utils.get_tag('error', e)))
70+
self.logger.error(
71+
f"{self.log_header} switch_plex_account {utils.get_tag("user", user_name)} {utils.get_tag("error", e)}"
72+
)
6173

6274
def switch_plex_account_admin(self):
6375
self.switch_plex_account(self.admin_user_name)
@@ -92,7 +104,9 @@ def set_library_scan(self, library_name: str):
92104
library = self.plex_server.library.section(library_name)
93105
library.update()
94106
except Exception as e:
95-
self.logger.error('{} set_library_scan {} {}'.format(self.log_header, utils.get_tag('library', library_name), utils.get_tag('error', e)))
107+
self.logger.error(
108+
f"{self.log_header} set_library_scan {utils.get_tag("library", library_name)} {utils.get_tag("error", e)}"
109+
)
96110

97111
def get_library_name_from_path(self, path: str) -> str:
98112
# Get all libraries
@@ -102,10 +116,16 @@ def get_library_name_from_path(self, path: str) -> str:
102116
if location == path:
103117
return library.title
104118

105-
self.logger.warning('{} No library found with {}'.format(self.log_header, utils.get_tag('path', path)))
106-
return ''
119+
self.logger.warning(
120+
f"{self.log_header} No library found with {utils.get_tag("path", path)}"
121+
)
122+
return ""
107123

108-
def get_collection_valid(self, library_name: str, collection_name: str) -> bool:
124+
def get_collection_valid(
125+
self,
126+
library_name: str,
127+
collection_name: str
128+
) -> bool:
109129
try:
110130
library = self.plex_server.library.section(library_name)
111131
for collection in library.collections():
@@ -123,7 +143,12 @@ def get_collection(self, library_name: str, collection_name: str) -> PlexCollect
123143
items: list[PlexCollectionItem] = []
124144
for item in collection.children:
125145
if len(item.locations) > 0:
126-
items.append(PlexCollectionItem(item.title, item.locations[0]))
146+
items.append(
147+
PlexCollectionItem(
148+
item.title,
149+
item.locations[0]
150+
)
151+
)
127152
return PlexCollection(collection.title, items)
128153
except Exception as e:
129154
pass

0 commit comments

Comments
 (0)