ukamnya/script.module.libtorrent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

32bit possible auto

Browse Source
This commit is contained in:
DiMartinoXBMC 2017-01-18 18:56:25 +03:00
parent 2a8a1f7d54
commit 178111a1f5
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addon.xml
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.1.1' name='python-libtorrent' provider-name='DiMartino, srg70, RussakHH, aisman, inpos'> <addon id='script.module.libtorrent' version='1.1.1e' 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>

9
python_libtorrent/platform_pulsar.py
View File

@ -136,10 +136,13 @@ def get_platform():
else: else:
ret["arch"] = 'mipsel_ucs2' ret["arch"] = 'mipsel_ucs2'
elif "aarch64" in uname: elif "aarch64" in uname:
if sys.maxunicode > 65536: if sys.maxint > 2147483647: #is_64bit_system
ret["arch"] = 'aarch64_ucs4' if sys.maxunicode > 65536:
ret["arch"] = 'aarch64_ucs4'
else:
ret["arch"] = 'aarch64_ucs2'
else: else:
ret["arch"] = 'aarch64_ucs2' ret["arch"] = "armv7" #32-bit userspace
elif xbmc.getCondVisibility("system.platform.windows"): elif xbmc.getCondVisibility("system.platform.windows"):
ret["os"] = "windows" ret["os"] = "windows"
elif xbmc.getCondVisibility("system.platform.osx"): elif xbmc.getCondVisibility("system.platform.osx"):

7
python_libtorrent/python_libtorrent/__init__.py
View File

@ -89,10 +89,9 @@ if __settings__.getSetting('plugin_name')!=__plugin__:
log('platform: ' + str(platform)) log('platform: ' + str(platform))
if platform['system'] not in ['windows']: if platform['system'] not in ['windows']:
log('os: '+str(os.uname())) log('os: '+str(os.uname()))
if sys.maxunicode > 65536: log_text = 'ucs4' if sys.maxunicode > 65536 else 'ucs2'
log('ucs4') log_text += ' x64' if sys.maxint > 2147483647 else ' x86'
else: log(log_text)
log('ucs2')
try: try:
if platform['system'] in ['linux_x86', 'windows', 'linux_armv6', 'linux_armv7', if platform['system'] in ['linux_x86', 'windows', 'linux_armv6', 'linux_armv7',

2
python_libtorrent/python_libtorrent/functions.py
View File

@ -108,6 +108,8 @@ class LibraryManager():
if not xbmcvfs.exists(new_libpath): if not xbmcvfs.exists(new_libpath):
xbmcvfs.copy(libpath, new_libpath) xbmcvfs.copy(libpath, new_libpath)
log('Copied %s -> %s' %(libpath, new_libpath)) log('Copied %s -> %s' %(libpath, new_libpath))
if not xbmcvfs.exists(new_libpath):
log('Failed!')
else: else:
new_size=str(os.path.getsize(new_libpath)) new_size=str(os.path.getsize(new_libpath))
if size!=new_size: if size!=new_size:

9
python_libtorrent/python_libtorrent/platform_pulsar.py
View File

@ -136,10 +136,13 @@ def get_platform():
else: else:
ret["arch"] = 'mipsel_ucs2' ret["arch"] = 'mipsel_ucs2'
elif "aarch64" in uname: elif "aarch64" in uname:
if sys.maxunicode > 65536: if sys.maxint > 2147483647: #is_64bit_system
ret["arch"] = 'aarch64_ucs4' if sys.maxunicode > 65536:
ret["arch"] = 'aarch64_ucs4'
else:
ret["arch"] = 'aarch64_ucs2'
else: else:
ret["arch"] = 'aarch64_ucs2' ret["arch"] = "armv7" #32-bit userspace
elif xbmc.getCondVisibility("system.platform.windows"): elif xbmc.getCondVisibility("system.platform.windows"):
ret["os"] = "windows" ret["os"] = "windows"
elif xbmc.getCondVisibility("system.platform.osx"): elif xbmc.getCondVisibility("system.platform.osx"):