1.1.0 by aisman

pull/1/head
DiMartinoXBMC 2016-04-14 19:10:16 +03:00
parent 9ddf530d77
commit b9ccd9e348
26 changed files with 199 additions and 10 deletions

4
.idea/misc.xml 100644
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7.7 (D:/Python27/python.exe)" project-jdk-type="Python SDK" />
</project>

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/script.module.libtorrent.iml" filepath="$PROJECT_DIR$/.idea/script.module.libtorrent.iml" />
</modules>
</component>
</project>

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TestRunnerService">
<option name="PROJECT_TEST_RUNNER" value="Unittests" />
</component>
</module>

6
.idea/vcs.xml 100644
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?> <?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<addon id='script.module.libtorrent' version='1.0.9h' name='python-libtorrent' provider-name='DiMartino, srg70, RussakHH, aisman, inpos'> <addon id='script.module.libtorrent' version='1.1.0' name='python-libtorrent' provider-name='DiMartino, srg70, RussakHH, aisman, inpos'>
<requires> <requires>
<import addon='xbmc.python' version='2.1.0'/> <import addon='xbmc.python' version='2.1.0'/>
</requires> </requires>

View File

@ -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 1.0.9 is default
Added 1.0.9 for Android, Mac, iOS, Unix ARM & mipsel (UCS2, UCS4) Added 1.0.9 for Android, Mac, iOS, Unix ARM & mipsel (UCS2, UCS4)
Added 1.0.9 for Windows, Unix x86 & amd64 Added 1.0.9 for Windows, Unix x86 & amd64

View File

@ -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.
'''

View File

@ -0,0 +1 @@
2868344

View File

@ -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.
'''

View File

@ -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.
'''

View File

@ -0,0 +1 @@
2388664

View File

@ -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.
'''

View File

@ -0,0 +1 @@
2337400

View File

@ -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.
'''

View File

@ -0,0 +1 @@
3952640

View File

@ -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.
'''

View File

@ -0,0 +1 @@
3999848

View File

@ -49,7 +49,7 @@ def get_libname(platform):
libname=[] libname=[]
if platform['system'] in ['darwin', 'linux_x86', 'linux_arm', 'linux_armv6', if platform['system'] in ['darwin', 'linux_x86', 'linux_arm', 'linux_armv6',
'linux_armv7', 'linux_x86_64', 'ios_arm', 'linux_armv7', 'linux_x86_64', 'ios_arm',
'linux_mipsel_ucs2', 'linux_mipsel_ucs4']: 'linux_mipsel_ucs2', 'linux_mipsel_ucs4', 'linux_aarch64']:
libname=['libtorrent.so'] libname=['libtorrent.so']
elif platform['system'] == 'windows': elif platform['system'] == 'windows':
libname=['libtorrent.pyd'] libname=['libtorrent.pyd']
@ -105,6 +105,9 @@ def get_platform():
elif system==11: elif system==11:
ret["os"] = "linux" ret["os"] = "linux"
ret["arch"] = "mipsel_ucs4" ret["arch"] = "mipsel_ucs4"
elif system == 12:
ret["os"] = "linux"
ret["arch"] = "linux_aarch64"
else: else:
ret = { ret = {
@ -122,6 +125,8 @@ def get_platform():
ret["arch"] = "armv7" ret["arch"] = "armv7"
elif "armv6" in uname: elif "armv6" in uname:
ret["arch"] = "armv6" ret["arch"] = "armv6"
elif "aarch64" in os.uname()[4]:
ret["arch"] = "aarch64"
else: else:
ret["arch"] = "arm" ret["arch"] = "arm"
elif "mips" in uname: elif "mips" in uname:

View File

@ -46,12 +46,12 @@ else:
log('dirname:' +str(dirname)) log('dirname:' +str(dirname))
default_version = 4 #[0.16.19, 1.0.6, 1.0.7, 1.0.8, 1.0.9] versions = ['0.16.19', '1.0.6', '1.0.7', '1.0.8', '1.0.9', '1.1.0']
set_version = __settings__.getSetting('set_version') default_path = versions[-1]
default_path = __language__(1150+default_version) set_version = int(__settings__.getSetting('set_version'))
if getSettingAsBool('custom_version'): if getSettingAsBool('custom_version'):
log('set_version:' +str(set_version)+' '+__language__(1150+int(set_version))) log('set_version:' +str(set_version)+' '+versions[set_version])
platform['version'] = __language__(1150+int(set_version)) platform['version'] = versions[set_version]
else: else:
platform['version'] = default_path platform['version'] = default_path

View File

@ -21,12 +21,14 @@
<string id="1109">iOS</string> <string id="1109">iOS</string>
<string id="1110">Linux MIPSEL (UCS2)</string> <string id="1110">Linux MIPSEL (UCS2)</string>
<string id="1111">Linux MIPSEL (UCS4)</string> <string id="1111">Linux MIPSEL (UCS4)</string>
<string id="1112">Linux ARM v8 64 (AARCH64)</string>
<string id="1150">0.16.19</string> <string id="1150">0.16.19</string>
<string id="1151">1.0.6</string> <string id="1151">1.0.6</string>
<string id="1152">1.0.7</string> <string id="1152">1.0.7</string>
<string id="1153">1.0.8</string> <string id="1153">1.0.8</string>
<string id="1154">1.0.9</string> <string id="1154">1.0.9</string>
<string id="1154">1.1.0</string>
<string id="1010">TS Engine not running!</string> <string id="1010">TS Engine not running!</string>
<string id="1011">No answer</string> <string id="1011">No answer</string>

View File

@ -5,8 +5,8 @@
<setting id="dirname" type="folder" label="1002" visible="eq(-1,true)" /> <setting id="dirname" type="folder" label="1002" visible="eq(-1,true)" />
<setting id="ask_dirname" type="bool" label="1005" default="false" /> <setting id="ask_dirname" type="bool" label="1005" default="false" />
<setting id="custom_system" type="bool" label="1003" default="false" /> <setting id="custom_system" type="bool" label="1003" default="false" />
<setting id="set_system" type="enum" label="1004" visible="eq(-1,true)" default="0" lvalues="1100|1101|1102|1103|1104|1105|1106|1107|1108|1109"/> <setting id="set_system" type="enum" label="1004" visible="eq(-1,true)" default="0" lvalues="1100|1101|1102|1103|1104|1105|1106|1107|1108|1109|1110|1111|1112"/>
<setting id="custom_version" type="bool" label="1006" default="false" /> <setting id="custom_version" type="bool" label="1006" default="false" />
<setting id="set_version" type="enum" label="1007" visible="eq(-1,true)" default="0" lvalues="1150|1151|1152|1153|1154"/> <setting id="set_version" type="enum" label="1007" visible="eq(-1,true)" default="0" lvalues="1150|1151|1152|1153|1154|1155"/>
</category> </category>
</settings> </settings>