Skip to content

Commit c2c47e0

Browse files
committed
Allow Negative Filter IDs for Future Compat
1 parent d2b1d63 commit c2c47e0

File tree

5 files changed

+17
-5
lines changed

5 files changed

+17
-5
lines changed

plugin.video.shokodi/addon_leia.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<addon id="plugin.video.shokodi" name="Shokodi" version="3.6.22" provider-name="da3dsoul">
2+
<addon id="plugin.video.shokodi" name="Shokodi" version="3.6.24" provider-name="da3dsoul">
33
<requires>
44
<import addon="xbmc.python" version="2.14.0" />
55
<import addon="script.module.web-pdb" optional="true"/>

plugin.video.shokodi/addon_matrix.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<addon id="plugin.video.shokodi" name="Shokodi" version="3.6.122" provider-name="da3dsoul">
2+
<addon id="plugin.video.shokodi" name="Shokodi" version="3.6.124" provider-name="da3dsoul">
33
<requires>
44
<import addon="xbmc.python" version="3.0.0" />
55
<import addon="script.module.web-pdb" optional="true"/>

plugin.video.shokodi/lib/proxy/python/python_2_proxy.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@ def is_string(self, i):
3434
return isinstance(i, (str, unicode, basestring))
3535

3636
def isnumeric(self, value):
37-
return unicode(value).isnumeric()
37+
if unicode(value).isnumeric():
38+
return True
39+
try:
40+
float(value)
41+
return True
42+
except (ValueError, TypeError):
43+
return False
3844

3945
def http_error(self, url, code, msg, hdrs):
4046
# noinspection PyArgumentList

plugin.video.shokodi/lib/proxy/python/python_3_proxy.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@ def is_string(self, i):
3434

3535
def isnumeric(self, value):
3636
# noinspection PyUnresolvedReferences
37-
return str(value).isnumeric()
37+
if str(value).isnumeric():
38+
return True
39+
try:
40+
float(value)
41+
return True
42+
except (ValueError, TypeError):
43+
return False
3844

3945
def http_error(self, url, code, msg, hdrs):
4046
from urllib.error import HTTPError

plugin.video.shokodi/lib/shoko/v2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ def get_api_url(self):
420420
level = 0
421421
if self.get_children and self.size > 0:
422422
level = 1 if self.directory_filter else 2
423-
url = model_utils.add_default_parameters(url, self.id, level)
423+
url = model_utils.add_default_parameters(url, int(self.id), level)
424424
if self.id == 0:
425425
url = pyproxy.set_parameter(url, 'notag', 1)
426426
return url

0 commit comments

Comments
 (0)