Merge pull request #1 from DiMartinoXBMC/master

merge from upstream
master
Роман 2018-09-11 13:43:56 +03:00 committed by GitHub
commit 7a053dca7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 62 additions and 44 deletions

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="PROJECT" charset="UTF-8" />
</component>
</project>

View File

@ -1,4 +0,0 @@
<?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

@ -1,8 +0,0 @@
<?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

@ -1,11 +0,0 @@
<?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>

View File

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

View File

@ -3,7 +3,6 @@ python-libtorrent for Kodi
script.module.libtorrent is a Kodi module that makes easy import of python-libtorrent script.module.libtorrent is a Kodi module that makes easy import of python-libtorrent
**Support** **Support**
- English forum: https://forums.tvaddons.ag/addon-releases/29224-torrenter-v2.html
- Russian forum: http://xbmc.ru/forum/showthread.php?t=4728 - Russian forum: http://xbmc.ru/forum/showthread.php?t=4728
**Used in projects** **Used in projects**
@ -13,15 +12,14 @@ script.module.libtorrent is a Kodi module that makes easy import of python-libto
**Usage** **Usage**
Add module in requires of your addon.xml: Add module to your repository and requires in addon.xml:
```python ```python
<import addon="script.module.libtorrent"/> <import addon="script.module.libtorrent"/>
``` ```
Use it in any python file: Use it in any python file:
```python ```python
from python_libtorrent import get_libtorrent from python_libtorrent import libtorrent
libtorrent=get_libtorrent()
``` ```
**License** **License**

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.2' name='python-libtorrent' provider-name='DiMartino, srg70, RussakHH, aisman, inpos'> <addon id='script.module.libtorrent' version='1.1.7' 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,7 @@
1.1.1: 1.1.7:
Added 1.1.6 and 1.1.7 for ARM v6 by Allin
1.1.1:
Added 1.1.1 for Windows by Roman_V_M Added 1.1.1 for Windows by Roman_V_M
Added 1.1.1 for iOS by HAL9000 Added 1.1.1 for iOS by HAL9000
Added 1.1.1 for Android, Mac by srg70 Added 1.1.1 for Android, Mac by srg70

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

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

View File

@ -46,8 +46,8 @@ else:
log('dirname:' +str(dirname)) log('dirname:' +str(dirname))
versions = ['0.16.19', '1.0.6', '1.0.7', '1.0.8', '1.0.9', '1.1.0', '1.1.1', '1.0.11'] versions = ['0.16.19', '1.0.6', '1.0.7', '1.0.8', '1.0.9', '1.1.0', '1.1.1', '1.0.11', '1.1.6', '1.1.7']
default_path = versions[-2] default_path = versions[-1]
set_version = int(__settings__.getSetting('set_version')) set_version = int(__settings__.getSetting('set_version'))
if getSettingAsBool('custom_version'): if getSettingAsBool('custom_version'):
log('set_version:' +str(set_version)+' '+versions[set_version]) log('set_version:' +str(set_version)+' '+versions[set_version])

View File

@ -32,6 +32,8 @@
<string id="1155">1.1.0</string> <string id="1155">1.1.0</string>
<string id="1156">1.1.1</string> <string id="1156">1.1.1</string>
<string id="1157">1.0.11</string> <string id="1157">1.0.11</string>
<string id="1158">1.1.6</string>
<string id="1159">1.1.7</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

@ -7,6 +7,6 @@
<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|1110|1111|1112"/> <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|1155|1156|1157"/> <setting id="set_version" type="enum" label="1007" visible="eq(-1,true)" default="0" lvalues="1150|1151|1152|1153|1154|1155|1156|1157|1158|1159"/>
</category> </category>
</settings> </settings>