mirrors/kodi.plugin.video.youtube
1
Fork 0
mirror of https://github.com/anxdpanic/plugin.video.youtube.git synced 2025-12-15 15:10:34 -08:00
Code Issues Projects Releases Packages Wiki Activity

Misc tidy ups

Browse source
This commit is contained in:
MoojMidge 2025-11-09 10:28:44 +11:00
parent 86008ba189
commit b585725a04
4 changed files with 40 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/lib/youtube_plugin/kodion/context/xbmc/xbmc_context.py
View file

@ -10,9 +10,9 @@
from __future__ import absolute_import, division, unicode_literals
import atexit
import json
import sys
from atexit import register as atexit_register
from timeit import default_timer
from weakref import proxy
@ -461,7 +461,7 @@ class XbmcContext(AbstractContext):
self._ui = None
self._playlist = None
atexit.register(self.tear_down)
atexit_register(self.tear_down)
def init(self):
num_args = len(sys.argv)

49
resources/lib/youtube_plugin/kodion/network/requests.py
View file

@ -9,8 +9,8 @@
from __future__ import absolute_import, division, unicode_literals
import atexit
import socket
from atexit import register as atexit_register
from requests import Request, Session
from requests.adapters import HTTPAdapter, Retry
@ -79,7 +79,7 @@ class BaseRequestsClass(object):
allowed_methods=None,
)
))
atexit.register(_session.close)
atexit_register(_session.close)
_context = None
_verify = True
@ -390,27 +390,28 @@ class BaseRequestsClass(object):
raise raise_exc
raise exc
if cache:
if cached_response is not None:
self.log.debug(('Using cached response',
'Request ID: {request_id}',
'Etag: {etag}',
'Modified: {timestamp}'),
request_id=request_id,
etag=etag,
timestamp=timestamp,
stacklevel=stacklevel)
cache.set(request_id)
response = cached_response
elif response is not None:
self.log.debug(('Saving response to cache',
'Request ID: {request_id}',
'Etag: {etag}',
'Modified: {timestamp}'),
request_id=request_id,
etag=etag,
timestamp=timestamp,
stacklevel=stacklevel)
cache.set(request_id, response, etag)
if not cache:
pass
elif cached_response is not None:
self.log.debug(('Using cached response',
'Request ID: {request_id}',
'Etag: {etag}',
'Modified: {timestamp}'),
request_id=request_id,
etag=etag,
timestamp=timestamp,
stacklevel=stacklevel)
cache.set(request_id)
response = cached_response
elif response is not None:
self.log.debug(('Saving response to cache',
'Request ID: {request_id}',
'Etag: {etag}',
'Modified: {timestamp}'),
request_id=request_id,
etag=etag,
timestamp=timestamp,
stacklevel=stacklevel)
cache.set(request_id, response, etag)
return response

4
resources/lib/youtube_plugin/kodion/sql_store/storage.py
View file

@ -10,10 +10,10 @@
from __future__ import absolute_import, division, unicode_literals
import atexit
import os
import sqlite3
import time
from atexit import register as atexit_register
from threading import RLock, Timer
from .. import logging
@ -234,7 +234,7 @@ class Storage(object):
self._close_actions = False
self._max_item_count = -1 if migrate else max_item_count
self._max_file_size_kb = -1 if migrate else max_file_size_kb
atexit.register(self._close, event='shutdown')
atexit_register(self._close, event='shutdown')
if migrate:
self._base = self

26
resources/lib/youtube_plugin/youtube/client/request_client.py
View file

@ -803,26 +803,21 @@ class YouTubeRequestClient(BaseRequestsClass):
if isinstance(keys, slice):
next_key = path[idx + 1]
parts = result[keys]
if next_key is None:
for part in result[keys]:
new_result = cls.json_traverse(
part,
path[idx + 2:],
default=default,
)
new_path = path[idx + 2:]
for part in parts:
new_result = cls.json_traverse(part, new_path, default)
if not new_result or new_result == default:
continue
return new_result
if isinstance(next_key, range_type):
results_limit = len(next_key)
new_path = path[idx + 2:]
new_results = []
for part in result[keys]:
new_result = cls.json_traverse(
part,
path[idx + 2:],
default=default,
)
for part in parts:
new_result = cls.json_traverse(part, new_path, default)
if not new_result or new_result == default:
continue
new_results.append(new_result)
@ -831,9 +826,10 @@ class YouTubeRequestClient(BaseRequestsClass):
break
results_limit -= 1
else:
new_path = path[idx + 1:]
new_results = [
cls.json_traverse(part, path[idx + 1:], default=default)
for part in result[keys]
cls.json_traverse(part, new_path, default)
for part in parts
if part
]
return new_results
@ -843,7 +839,7 @@ class YouTubeRequestClient(BaseRequestsClass):
for key in keys:
if isinstance(key, tuple):
new_result = cls.json_traverse(result, key, default=default)
new_result = cls.json_traverse(result, key, default)
if new_result:
result = new_result
break