add linux_mips by inpos

pull/1/head
DiMartinoXBMC 2016-03-11 19:20:59 +03:00
parent 88e141f4c7
commit c8c8f50eea
10 changed files with 105 additions and 13 deletions

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.9d' name='python-libtorrent' provider-name='DiMartino, srg70, RussakHH, aisman'> <addon id='script.module.libtorrent' version='1.0.9f' 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,5 @@
1.0.9: 1.0.9:
Added 1.0.9 for Android, Mac, iOS, Unix ARM & mipsel
Added 1.0.9 for Windows, Unix x86 & amd64 Added 1.0.9 for Windows, Unix x86 & amd64
1.0.8: 1.0.8:

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 @@
4598636

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

@ -27,12 +27,28 @@ import sys
import os import os
try: try:
import xbmc, xbmcaddon import xbmc, xbmcaddon
__settings__ = xbmcaddon.Addon(id='script.module.libtorrent')
__version__ = __settings__.getAddonInfo('version')
__plugin__ = __settings__.getAddonInfo('name') + " v." + __version__
except: except:
__plugin__ = 'script.module.libtorrent'
pass pass
def log(msg):
try:
xbmc.log("### [%s]: %s" % (__plugin__,msg,), level=xbmc.LOGNOTICE )
except UnicodeEncodeError:
xbmc.log("### [%s]: %s" % (__plugin__,msg.encode("utf-8", "ignore"),), level=xbmc.LOGNOTICE )
except:
try:
xbmc.log("### [%s]: %s" % (__plugin__,'ERROR LOG',), level=xbmc.LOGNOTICE )
except:
print msg
def get_libname(platform): def get_libname(platform):
libname=[] libname=[]
if platform['system'] in ['darwin', 'linux_x86', 'linux_arm', 'linux_armv6', 'linux_armv7', 'linux_x86_64', 'ios_arm']: if platform['system'] in ['darwin', 'linux_x86', 'linux_arm', 'linux_armv6',
'linux_armv7', 'linux_x86_64', 'ios_arm', 'linux_mips']:
libname=['libtorrent.so'] libname=['libtorrent.so']
elif platform['system'] == 'windows': elif platform['system'] == 'windows':
libname=['libtorrent.pyd'] libname=['libtorrent.pyd']
@ -48,7 +64,7 @@ def get_platform():
if __settings__.getSetting('custom_system').lower() == "true": if __settings__.getSetting('custom_system').lower() == "true":
system = int(__settings__.getSetting('set_system')) system = int(__settings__.getSetting('set_system'))
print 'USE CUSTOM SYSTEM: '+__language__(1100+system) log('USE CUSTOM SYSTEM: '+__language__(1100+system))
ret={} ret={}
@ -82,7 +98,9 @@ def get_platform():
elif system==9: elif system==9:
ret["os"] = "ios" ret["os"] = "ios"
ret["arch"] = "arm" ret["arch"] = "arm"
elif system==10:
ret["os"] = "linux"
ret["arch"] = "mips"
else: else:
ret = { ret = {
@ -102,6 +120,8 @@ def get_platform():
ret["arch"] = "armv6" ret["arch"] = "armv6"
else: else:
ret["arch"] = "arm" ret["arch"] = "arm"
elif "mips" in uname:
ret["arch"] = "mips"
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"):
@ -129,7 +149,7 @@ def get_system(ret):
ret["system"] = 'linux_x86' ret["system"] = 'linux_x86'
ret["message"] = ['Linux has static compiled python-libtorrent included but it didn\'t work.', 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"'] 'You should install it by "sudo apt-get install python-libtorrent"']
elif ret["os"] == "linux" and "arm" in ret["arch"]: elif ret["os"] == "linux" and ("arm" or "mips" in ret["arch"]):
ret["system"] = 'linux_'+ret["arch"] ret["system"] = 'linux_'+ret["arch"]
ret["message"] = ['As far as I know you can compile python-libtorrent for ARMv6-7.', 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.'] 'You should search for "OneEvil\'s OpenELEC libtorrent" or use Ace Stream.']

View File

@ -91,7 +91,8 @@ if platform['system'] not in ['windows']:
log('os: '+str(os.uname())) log('os: '+str(os.uname()))
try: try:
if platform['system'] in ['linux_x86', 'windows', 'linux_armv6', 'linux_armv7', 'linux_x86_64']: if platform['system'] in ['linux_x86', 'windows', 'linux_armv6', 'linux_armv7',
'linux_x86_64', 'linux_mips']:
import libtorrent import libtorrent
elif platform['system'] in ['darwin', 'ios_arm']: elif platform['system'] in ['darwin', 'ios_arm']:
import imp import imp

View File

@ -27,12 +27,28 @@ import sys
import os import os
try: try:
import xbmc, xbmcaddon import xbmc, xbmcaddon
__settings__ = xbmcaddon.Addon(id='script.module.libtorrent')
__version__ = __settings__.getAddonInfo('version')
__plugin__ = __settings__.getAddonInfo('name') + " v." + __version__
except: except:
__plugin__ = 'script.module.libtorrent'
pass pass
def log(msg):
try:
xbmc.log("### [%s]: %s" % (__plugin__,msg,), level=xbmc.LOGNOTICE )
except UnicodeEncodeError:
xbmc.log("### [%s]: %s" % (__plugin__,msg.encode("utf-8", "ignore"),), level=xbmc.LOGNOTICE )
except:
try:
xbmc.log("### [%s]: %s" % (__plugin__,'ERROR LOG',), level=xbmc.LOGNOTICE )
except:
print msg
def get_libname(platform): def get_libname(platform):
libname=[] libname=[]
if platform['system'] in ['darwin', 'linux_x86', 'linux_arm', 'linux_armv6', 'linux_armv7', 'linux_x86_64', 'ios_arm']: if platform['system'] in ['darwin', 'linux_x86', 'linux_arm', 'linux_armv6',
'linux_armv7', 'linux_x86_64', 'ios_arm', 'linux_mips']:
libname=['libtorrent.so'] libname=['libtorrent.so']
elif platform['system'] == 'windows': elif platform['system'] == 'windows':
libname=['libtorrent.pyd'] libname=['libtorrent.pyd']
@ -48,7 +64,7 @@ def get_platform():
if __settings__.getSetting('custom_system').lower() == "true": if __settings__.getSetting('custom_system').lower() == "true":
system = int(__settings__.getSetting('set_system')) system = int(__settings__.getSetting('set_system'))
print 'USE CUSTOM SYSTEM: '+__language__(1100+system) log('USE CUSTOM SYSTEM: '+__language__(1100+system))
ret={} ret={}
@ -82,7 +98,9 @@ def get_platform():
elif system==9: elif system==9:
ret["os"] = "ios" ret["os"] = "ios"
ret["arch"] = "arm" ret["arch"] = "arm"
elif system==10:
ret["os"] = "linux"
ret["arch"] = "mips"
else: else:
ret = { ret = {
@ -102,6 +120,8 @@ def get_platform():
ret["arch"] = "armv6" ret["arch"] = "armv6"
else: else:
ret["arch"] = "arm" ret["arch"] = "arm"
elif "mips" in uname:
ret["arch"] = "mips"
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"):
@ -129,7 +149,7 @@ def get_system(ret):
ret["system"] = 'linux_x86' ret["system"] = 'linux_x86'
ret["message"] = ['Linux has static compiled python-libtorrent included but it didn\'t work.', 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"'] 'You should install it by "sudo apt-get install python-libtorrent"']
elif ret["os"] == "linux" and "arm" in ret["arch"]: elif ret["os"] == "linux" and ("arm" or "mips" in ret["arch"]):
ret["system"] = 'linux_'+ret["arch"] ret["system"] = 'linux_'+ret["arch"]
ret["message"] = ['As far as I know you can compile python-libtorrent for ARMv6-7.', 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.'] 'You should search for "OneEvil\'s OpenELEC libtorrent" or use Ace Stream.']

View File

@ -13,12 +13,13 @@
<string id="1101">Linux 32-bit</string> <string id="1101">Linux 32-bit</string>
<string id="1102">Linux 64-bit</string> <string id="1102">Linux 64-bit</string>
<string id="1103">Linux ARM v7 (RPi 2)</string> <string id="1103">Linux ARM v7 (RPi 2)</string>
<string id="1104">Linux ARM v6 (RPi, not ready)</string> <string id="1104">Linux ARM v6 (RPi)</string>
<string id="1105">Android ARM v7</string> <string id="1105">Android ARM v7</string>
<string id="1106">Android 32-bit</string> <string id="1106">Android 32-bit</string>
<string id="1107">OS X</string> <string id="1107">OS X</string>
<string id="1108">Apple TV2 (not ready)</string> <string id="1108">Apple TV2</string>
<string id="1109">iOS (not ready)</string> <string id="1109">iOS</string>
<string id="1110">Linux MIPS</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>