diff --git a/python_libtorrent/platform_pulsar.py b/python_libtorrent/platform_pulsar.py index 7b3f412..4df87ee 100644 --- a/python_libtorrent/platform_pulsar.py +++ b/python_libtorrent/platform_pulsar.py @@ -107,10 +107,13 @@ def get_platform(): ret["arch"] = "mipsel_ucs4" elif system == 12: ret["os"] = "linux" - ret["arch"] = "linux_aarch64_ucs2" + ret["arch"] = "aarch64_ucs2" elif system == 13: ret["os"] = "linux" - ret["arch"] = "linux_aarch64_ucs4" + ret["arch"] = "aarch64_ucs4" + elif system == 14: + ret["os"] = "windows" + ret["arch"] = "x64" else: ret = { @@ -157,7 +160,7 @@ def get_system(ret): ret["message"] = ['', ''] if ret["os"] == 'windows': - ret["system"] = 'windows' + ret["system"] = 'windows_' + ret['arch'] ret["message"] = ['Windows has static compiled python-libtorrent included.', 'You should install "script.module.libtorrent" from "MyShows.me Kodi Repo"'] elif ret["os"] == "linux" and ret["arch"] == "x64": @@ -172,7 +175,7 @@ def get_system(ret): ret["system"] = 'linux_' + ret["arch"] ret["message"] = ['Linux has static compiled python-libtorrent included but it didn\'t work.', 'You should install it by "sudo apt-get install python-libtorrent"'] - elif ret["os"] == "linux" and ("arm" or "mips" in ret["arch"]): + elif ret["os"] == "linux" and ("arm" in ret["arch"] or 'mips' in ret["arch"]): ret["system"] = 'linux_'+ret["arch"] ret["message"] = ['As far as I know you can compile python-libtorrent for ARMv6-7.', 'You should search for "OneEvil\'s OpenELEC libtorrent" or use Ace Stream.'] @@ -192,4 +195,4 @@ def get_system(ret): ret["message"] = ['It is probably NOT possible to compile python-libtorrent for iOS.', 'But you can use torrent-client control functions.'] - return ret \ No newline at end of file + return ret diff --git a/python_libtorrent/python_libtorrent/platform_pulsar.py b/python_libtorrent/python_libtorrent/platform_pulsar.py index 7b3f412..4df87ee 100644 --- a/python_libtorrent/python_libtorrent/platform_pulsar.py +++ b/python_libtorrent/python_libtorrent/platform_pulsar.py @@ -107,10 +107,13 @@ def get_platform(): ret["arch"] = "mipsel_ucs4" elif system == 12: ret["os"] = "linux" - ret["arch"] = "linux_aarch64_ucs2" + ret["arch"] = "aarch64_ucs2" elif system == 13: ret["os"] = "linux" - ret["arch"] = "linux_aarch64_ucs4" + ret["arch"] = "aarch64_ucs4" + elif system == 14: + ret["os"] = "windows" + ret["arch"] = "x64" else: ret = { @@ -157,7 +160,7 @@ def get_system(ret): ret["message"] = ['', ''] if ret["os"] == 'windows': - ret["system"] = 'windows' + ret["system"] = 'windows_' + ret['arch'] ret["message"] = ['Windows has static compiled python-libtorrent included.', 'You should install "script.module.libtorrent" from "MyShows.me Kodi Repo"'] elif ret["os"] == "linux" and ret["arch"] == "x64": @@ -172,7 +175,7 @@ def get_system(ret): ret["system"] = 'linux_' + ret["arch"] ret["message"] = ['Linux has static compiled python-libtorrent included but it didn\'t work.', 'You should install it by "sudo apt-get install python-libtorrent"'] - elif ret["os"] == "linux" and ("arm" or "mips" in ret["arch"]): + elif ret["os"] == "linux" and ("arm" in ret["arch"] or 'mips' in ret["arch"]): ret["system"] = 'linux_'+ret["arch"] ret["message"] = ['As far as I know you can compile python-libtorrent for ARMv6-7.', 'You should search for "OneEvil\'s OpenELEC libtorrent" or use Ace Stream.'] @@ -192,4 +195,4 @@ def get_system(ret): ret["message"] = ['It is probably NOT possible to compile python-libtorrent for iOS.', 'But you can use torrent-client control functions.'] - return ret \ No newline at end of file + return ret diff --git a/python_libtorrent/windows/0.16.19/__init__.py b/python_libtorrent/windows_x86/0.16.19/__init__.py similarity index 100% rename from python_libtorrent/windows/0.16.19/__init__.py rename to python_libtorrent/windows_x86/0.16.19/__init__.py diff --git a/python_libtorrent/windows/0.16.19/libtorrent.pyd.size.txt b/python_libtorrent/windows_x86/0.16.19/libtorrent.pyd.size.txt similarity index 100% rename from python_libtorrent/windows/0.16.19/libtorrent.pyd.size.txt rename to python_libtorrent/windows_x86/0.16.19/libtorrent.pyd.size.txt diff --git a/python_libtorrent/windows/0.16.19/libtorrent.pyd.zip b/python_libtorrent/windows_x86/0.16.19/libtorrent.pyd.zip similarity index 100% rename from python_libtorrent/windows/0.16.19/libtorrent.pyd.zip rename to python_libtorrent/windows_x86/0.16.19/libtorrent.pyd.zip diff --git a/python_libtorrent/windows/1.0.6/__init__.py b/python_libtorrent/windows_x86/1.0.6/__init__.py similarity index 100% rename from python_libtorrent/windows/1.0.6/__init__.py rename to python_libtorrent/windows_x86/1.0.6/__init__.py diff --git a/python_libtorrent/windows/1.0.6/libtorrent.pyd.size.txt b/python_libtorrent/windows_x86/1.0.6/libtorrent.pyd.size.txt similarity index 100% rename from python_libtorrent/windows/1.0.6/libtorrent.pyd.size.txt rename to python_libtorrent/windows_x86/1.0.6/libtorrent.pyd.size.txt diff --git a/python_libtorrent/windows/1.0.6/libtorrent.pyd.zip b/python_libtorrent/windows_x86/1.0.6/libtorrent.pyd.zip similarity index 100% rename from python_libtorrent/windows/1.0.6/libtorrent.pyd.zip rename to python_libtorrent/windows_x86/1.0.6/libtorrent.pyd.zip diff --git a/python_libtorrent/windows/1.0.8/__init__.py b/python_libtorrent/windows_x86/1.0.8/__init__.py similarity index 100% rename from python_libtorrent/windows/1.0.8/__init__.py rename to python_libtorrent/windows_x86/1.0.8/__init__.py diff --git a/python_libtorrent/windows/1.0.8/libtorrent.pyd.size.txt b/python_libtorrent/windows_x86/1.0.8/libtorrent.pyd.size.txt similarity index 100% rename from python_libtorrent/windows/1.0.8/libtorrent.pyd.size.txt rename to python_libtorrent/windows_x86/1.0.8/libtorrent.pyd.size.txt diff --git a/python_libtorrent/windows/1.0.8/libtorrent.pyd.zip b/python_libtorrent/windows_x86/1.0.8/libtorrent.pyd.zip similarity index 100% rename from python_libtorrent/windows/1.0.8/libtorrent.pyd.zip rename to python_libtorrent/windows_x86/1.0.8/libtorrent.pyd.zip diff --git a/python_libtorrent/windows/1.0.9/__init__.py b/python_libtorrent/windows_x86/1.0.9/__init__.py similarity index 100% rename from python_libtorrent/windows/1.0.9/__init__.py rename to python_libtorrent/windows_x86/1.0.9/__init__.py diff --git a/python_libtorrent/windows/1.0.9/libtorrent.pyd.size.txt b/python_libtorrent/windows_x86/1.0.9/libtorrent.pyd.size.txt similarity index 100% rename from python_libtorrent/windows/1.0.9/libtorrent.pyd.size.txt rename to python_libtorrent/windows_x86/1.0.9/libtorrent.pyd.size.txt diff --git a/python_libtorrent/windows/1.0.9/libtorrent.pyd.zip b/python_libtorrent/windows_x86/1.0.9/libtorrent.pyd.zip similarity index 100% rename from python_libtorrent/windows/1.0.9/libtorrent.pyd.zip rename to python_libtorrent/windows_x86/1.0.9/libtorrent.pyd.zip diff --git a/python_libtorrent/windows/1.1.1/__init__.py b/python_libtorrent/windows_x86/1.1.1/__init__.py similarity index 100% rename from python_libtorrent/windows/1.1.1/__init__.py rename to python_libtorrent/windows_x86/1.1.1/__init__.py diff --git a/python_libtorrent/windows/1.1.1/libtorrent.pyd.size.txt b/python_libtorrent/windows_x86/1.1.1/libtorrent.pyd.size.txt similarity index 100% rename from python_libtorrent/windows/1.1.1/libtorrent.pyd.size.txt rename to python_libtorrent/windows_x86/1.1.1/libtorrent.pyd.size.txt diff --git a/python_libtorrent/windows/1.1.1/libtorrent.pyd.zip b/python_libtorrent/windows_x86/1.1.1/libtorrent.pyd.zip similarity index 100% rename from python_libtorrent/windows/1.1.1/libtorrent.pyd.zip rename to python_libtorrent/windows_x86/1.1.1/libtorrent.pyd.zip diff --git a/python_libtorrent/windows/__init__.py b/python_libtorrent/windows_x86/__init__.py similarity index 100% rename from python_libtorrent/windows/__init__.py rename to python_libtorrent/windows_x86/__init__.py diff --git a/python_libtorrent/windows_x86_64/1.2.7/__init__.py b/python_libtorrent/windows_x86_64/1.2.7/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/python_libtorrent/windows_x86_64/1.2.7/libtorrent.pyd.size.txt b/python_libtorrent/windows_x86_64/1.2.7/libtorrent.pyd.size.txt new file mode 100644 index 0000000..8bc6bcc --- /dev/null +++ b/python_libtorrent/windows_x86_64/1.2.7/libtorrent.pyd.size.txt @@ -0,0 +1 @@ +5052416 \ No newline at end of file diff --git a/python_libtorrent/windows_x86_64/1.2.7/libtorrent.pyd.zip b/python_libtorrent/windows_x86_64/1.2.7/libtorrent.pyd.zip new file mode 100644 index 0000000..3251fb9 Binary files /dev/null and b/python_libtorrent/windows_x86_64/1.2.7/libtorrent.pyd.zip differ diff --git a/python_libtorrent/windows_x86_64/__init__.py b/python_libtorrent/windows_x86_64/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/resources/language/english/strings.xml b/resources/language/english/strings.xml index e1b9eae..6ff120e 100644 --- a/resources/language/english/strings.xml +++ b/resources/language/english/strings.xml @@ -9,7 +9,7 @@ Custom python-libtorrent version Use python-libtorrent (if available) - Windows 32-bit, 64-bit + Windows 32-bit Linux 32-bit Linux 64-bit Linux ARM v7 (RPi 2) @@ -23,6 +23,7 @@ Linux MIPSEL (UCS4) Linux ARM v8 AARCH64 (UCS2) Linux ARM v8 AARCH64 (UCS4) + Windows 64-bit 0.16.19 1.0.6 diff --git a/resources/settings.xml b/resources/settings.xml index a43ac8f..2e16edf 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -5,7 +5,7 @@ - +