diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..999e7a8 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..7ff4ff3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/script.module.libtorrent.iml b/.idea/script.module.libtorrent.iml new file mode 100644 index 0000000..6711606 --- /dev/null +++ b/.idea/script.module.libtorrent.iml @@ -0,0 +1,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/addon.xml b/addon.xml index 2209d82..abd88d0 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/changelog.txt b/changelog.txt index 3d47473..9ceffba 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,8 @@ -1.0.9: +1.1.0: +Lastest library is default +Added 1.1.0 for Unix x86, Unix amd64, Unix ARM v6,7,8-64 + +1.0.9: 1.0.9 is default Added 1.0.9 for Android, Mac, iOS, Unix ARM & mipsel (UCS2, UCS4) Added 1.0.9 for Windows, Unix x86 & amd64 diff --git a/python_libtorrent/linux_aarch64/1.1.0/__init__.py b/python_libtorrent/linux_aarch64/1.1.0/__init__.py new file mode 100644 index 0000000..e0aed70 --- /dev/null +++ b/python_libtorrent/linux_aarch64/1.1.0/__init__.py @@ -0,0 +1,24 @@ +#-*- coding: utf-8 -*- +''' + python-libtorrent for Kodi (script.module.libtorrent) + Copyright (C) 2015-2016 DiMartino, srg70, RussakHH, aisman + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +''' diff --git a/python_libtorrent/linux_aarch64/1.1.0/libtorrent.so.size.txt b/python_libtorrent/linux_aarch64/1.1.0/libtorrent.so.size.txt new file mode 100644 index 0000000..241679e --- /dev/null +++ b/python_libtorrent/linux_aarch64/1.1.0/libtorrent.so.size.txt @@ -0,0 +1 @@ +2868344 \ No newline at end of file diff --git a/python_libtorrent/linux_aarch64/1.1.0/libtorrent.so.zip b/python_libtorrent/linux_aarch64/1.1.0/libtorrent.so.zip new file mode 100644 index 0000000..7ec243a Binary files /dev/null and b/python_libtorrent/linux_aarch64/1.1.0/libtorrent.so.zip differ diff --git a/python_libtorrent/linux_aarch64/__init__.py b/python_libtorrent/linux_aarch64/__init__.py new file mode 100644 index 0000000..e0aed70 --- /dev/null +++ b/python_libtorrent/linux_aarch64/__init__.py @@ -0,0 +1,24 @@ +#-*- coding: utf-8 -*- +''' + python-libtorrent for Kodi (script.module.libtorrent) + Copyright (C) 2015-2016 DiMartino, srg70, RussakHH, aisman + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +''' diff --git a/python_libtorrent/linux_armv6/1.1.0/__init__.py b/python_libtorrent/linux_armv6/1.1.0/__init__.py new file mode 100644 index 0000000..e0aed70 --- /dev/null +++ b/python_libtorrent/linux_armv6/1.1.0/__init__.py @@ -0,0 +1,24 @@ +#-*- coding: utf-8 -*- +''' + python-libtorrent for Kodi (script.module.libtorrent) + Copyright (C) 2015-2016 DiMartino, srg70, RussakHH, aisman + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +''' diff --git a/python_libtorrent/linux_armv6/1.1.0/libtorrent.so.size.txt b/python_libtorrent/linux_armv6/1.1.0/libtorrent.so.size.txt new file mode 100644 index 0000000..56d0afe --- /dev/null +++ b/python_libtorrent/linux_armv6/1.1.0/libtorrent.so.size.txt @@ -0,0 +1 @@ +2388664 \ No newline at end of file diff --git a/python_libtorrent/linux_armv6/1.1.0/libtorrent.so.zip b/python_libtorrent/linux_armv6/1.1.0/libtorrent.so.zip new file mode 100644 index 0000000..3e9c7ea Binary files /dev/null and b/python_libtorrent/linux_armv6/1.1.0/libtorrent.so.zip differ diff --git a/python_libtorrent/linux_armv7/1.1.0/__init__.py b/python_libtorrent/linux_armv7/1.1.0/__init__.py new file mode 100644 index 0000000..e0aed70 --- /dev/null +++ b/python_libtorrent/linux_armv7/1.1.0/__init__.py @@ -0,0 +1,24 @@ +#-*- coding: utf-8 -*- +''' + python-libtorrent for Kodi (script.module.libtorrent) + Copyright (C) 2015-2016 DiMartino, srg70, RussakHH, aisman + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +''' diff --git a/python_libtorrent/linux_armv7/1.1.0/libtorrent.so.size.txt b/python_libtorrent/linux_armv7/1.1.0/libtorrent.so.size.txt new file mode 100644 index 0000000..599e8c7 --- /dev/null +++ b/python_libtorrent/linux_armv7/1.1.0/libtorrent.so.size.txt @@ -0,0 +1 @@ +2337400 \ No newline at end of file diff --git a/python_libtorrent/linux_armv7/1.1.0/libtorrent.so.zip b/python_libtorrent/linux_armv7/1.1.0/libtorrent.so.zip new file mode 100644 index 0000000..77b38ca Binary files /dev/null and b/python_libtorrent/linux_armv7/1.1.0/libtorrent.so.zip differ diff --git a/python_libtorrent/linux_x86/1.1.0/__init__.py b/python_libtorrent/linux_x86/1.1.0/__init__.py new file mode 100644 index 0000000..e0aed70 --- /dev/null +++ b/python_libtorrent/linux_x86/1.1.0/__init__.py @@ -0,0 +1,24 @@ +#-*- coding: utf-8 -*- +''' + python-libtorrent for Kodi (script.module.libtorrent) + Copyright (C) 2015-2016 DiMartino, srg70, RussakHH, aisman + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +''' diff --git a/python_libtorrent/linux_x86/1.1.0/libtorrent.so.size.txt b/python_libtorrent/linux_x86/1.1.0/libtorrent.so.size.txt new file mode 100644 index 0000000..7e1b900 --- /dev/null +++ b/python_libtorrent/linux_x86/1.1.0/libtorrent.so.size.txt @@ -0,0 +1 @@ +3952640 \ No newline at end of file diff --git a/python_libtorrent/linux_x86/1.1.0/libtorrent.so.zip b/python_libtorrent/linux_x86/1.1.0/libtorrent.so.zip new file mode 100644 index 0000000..6964c35 Binary files /dev/null and b/python_libtorrent/linux_x86/1.1.0/libtorrent.so.zip differ diff --git a/python_libtorrent/linux_x86_64/1.1.0/__init__.py b/python_libtorrent/linux_x86_64/1.1.0/__init__.py new file mode 100644 index 0000000..e0aed70 --- /dev/null +++ b/python_libtorrent/linux_x86_64/1.1.0/__init__.py @@ -0,0 +1,24 @@ +#-*- coding: utf-8 -*- +''' + python-libtorrent for Kodi (script.module.libtorrent) + Copyright (C) 2015-2016 DiMartino, srg70, RussakHH, aisman + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +''' diff --git a/python_libtorrent/linux_x86_64/1.1.0/libtorrent.so.size.txt b/python_libtorrent/linux_x86_64/1.1.0/libtorrent.so.size.txt new file mode 100644 index 0000000..5cc118d --- /dev/null +++ b/python_libtorrent/linux_x86_64/1.1.0/libtorrent.so.size.txt @@ -0,0 +1 @@ +3999848 \ No newline at end of file diff --git a/python_libtorrent/linux_x86_64/1.1.0/libtorrent.so.zip b/python_libtorrent/linux_x86_64/1.1.0/libtorrent.so.zip new file mode 100644 index 0000000..91280f6 Binary files /dev/null and b/python_libtorrent/linux_x86_64/1.1.0/libtorrent.so.zip differ diff --git a/python_libtorrent/platform_pulsar.py b/python_libtorrent/platform_pulsar.py index b67df58..19367f4 100644 --- a/python_libtorrent/platform_pulsar.py +++ b/python_libtorrent/platform_pulsar.py @@ -49,7 +49,7 @@ def get_libname(platform): libname=[] if platform['system'] in ['darwin', 'linux_x86', 'linux_arm', 'linux_armv6', 'linux_armv7', 'linux_x86_64', 'ios_arm', - 'linux_mipsel_ucs2', 'linux_mipsel_ucs4']: + 'linux_mipsel_ucs2', 'linux_mipsel_ucs4', 'linux_aarch64']: libname=['libtorrent.so'] elif platform['system'] == 'windows': libname=['libtorrent.pyd'] @@ -105,6 +105,9 @@ def get_platform(): elif system==11: ret["os"] = "linux" ret["arch"] = "mipsel_ucs4" + elif system == 12: + ret["os"] = "linux" + ret["arch"] = "linux_aarch64" else: ret = { @@ -122,6 +125,8 @@ def get_platform(): ret["arch"] = "armv7" elif "armv6" in uname: ret["arch"] = "armv6" + elif "aarch64" in os.uname()[4]: + ret["arch"] = "aarch64" else: ret["arch"] = "arm" elif "mips" in uname: diff --git a/python_libtorrent/python_libtorrent/__init__.py b/python_libtorrent/python_libtorrent/__init__.py index 99b6176..d89fe99 100644 --- a/python_libtorrent/python_libtorrent/__init__.py +++ b/python_libtorrent/python_libtorrent/__init__.py @@ -46,12 +46,12 @@ else: log('dirname:' +str(dirname)) -default_version = 4 #[0.16.19, 1.0.6, 1.0.7, 1.0.8, 1.0.9] -set_version = __settings__.getSetting('set_version') -default_path = __language__(1150+default_version) +versions = ['0.16.19', '1.0.6', '1.0.7', '1.0.8', '1.0.9', '1.1.0'] +default_path = versions[-1] +set_version = int(__settings__.getSetting('set_version')) if getSettingAsBool('custom_version'): - log('set_version:' +str(set_version)+' '+__language__(1150+int(set_version))) - platform['version'] = __language__(1150+int(set_version)) + log('set_version:' +str(set_version)+' '+versions[set_version]) + platform['version'] = versions[set_version] else: platform['version'] = default_path diff --git a/resources/language/english/strings.xml b/resources/language/english/strings.xml index 5362f2b..73b4b88 100644 --- a/resources/language/english/strings.xml +++ b/resources/language/english/strings.xml @@ -21,12 +21,14 @@ iOS Linux MIPSEL (UCS2) Linux MIPSEL (UCS4) + Linux ARM v8 64 (AARCH64) 0.16.19 1.0.6 1.0.7 1.0.8 1.0.9 + 1.1.0 TS Engine not running! No answer diff --git a/resources/settings.xml b/resources/settings.xml index 28f9026..32c643d 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -5,8 +5,8 @@ - + - +