ukamnya
/
plugin.video.torrenter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

anteo beta

pull/1/head
DiMartinoXBMC 2015-12-17 21:17:40 +03:00
parent f9e5c8efc0
commit 1c0a168e0e
9 changed files with 619 additions and 824 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

592
.idea/workspace.xml
View File

@ -2,13 +2,15 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment=""> <list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/BTClientPlayer.py" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Anteoloader.py" afterPath="$PROJECT_DIR$/Anteoloader.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Anteoloader.py" afterPath="$PROJECT_DIR$/Anteoloader.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Core.py" afterPath="$PROJECT_DIR$/Core.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Core.py" afterPath="$PROJECT_DIR$/Core.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Downloader.py" afterPath="$PROJECT_DIR$/Downloader.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Downloader.py" afterPath="$PROJECT_DIR$/Downloader.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Player.py" afterPath="$PROJECT_DIR$/Player.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/language/English/strings.xml" afterPath="$PROJECT_DIR$/resources/language/English/strings.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/language/English/strings.xml" afterPath="$PROJECT_DIR$/resources/language/English/strings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/language/Hebrew/strings.xml" afterPath="$PROJECT_DIR$/resources/language/Hebrew/strings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/language/Russian/strings.xml" afterPath="$PROJECT_DIR$/resources/language/Russian/strings.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/language/Russian/strings.xml" afterPath="$PROJECT_DIR$/resources/language/Russian/strings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/settings.xml" afterPath="$PROJECT_DIR$/resources/settings.xml" />
</list> </list>
<ignored path="plugin.video.torrenter.iws" /> <ignored path="plugin.video.torrenter.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
@ -42,7 +44,7 @@
<entry file="file://$PROJECT_DIR$/functions.py"> <entry file="file://$PROJECT_DIR$/functions.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="1564" column="7" selection-start-line="1564" selection-start-column="4" selection-end-line="1564" selection-end-column="7" /> <caret line="137" column="4" selection-start-line="137" selection-start-column="4" selection-end-line="137" selection-end-column="4" />
<folding> <folding>
<element signature="e#24#832#1" expanded="false" /> <element signature="e#24#832#1" expanded="false" />
</folding> </folding>
@ -53,21 +55,37 @@
<file leaf-file-name="Anteoloader.py" pinned="false" current-in-tab="true"> <file leaf-file-name="Anteoloader.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Anteoloader.py"> <entry file="file://$PROJECT_DIR$/Anteoloader.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.46523178"> <state vertical-scroll-proportion="-1.4399351">
<caret line="320" column="20" selection-start-line="320" selection-start-column="20" selection-end-line="320" selection-end-column="20" /> <caret line="341" column="49" selection-start-line="341" selection-start-column="49" selection-end-line="341" selection-end-column="49" />
<folding> <folding>
<element signature="e#24#785#1" expanded="false" /> <element signature="e#24#785#1" expanded="false" />
<element signature="e#2114#6189#0" expanded="false" /> <element signature="e#2113#2156#0" expanded="false" />
<element signature="e#3015#3125#0" expanded="false" /> <element signature="e#2181#6614#0" expanded="false" />
<element signature="e#3167#3262#0" expanded="false" /> <element signature="e#2344#3105#0" expanded="false" />
<element signature="e#3302#3966#0" expanded="false" /> <element signature="e#3139#3249#0" expanded="false" />
<element signature="e#4015#5899#0" expanded="false" /> <element signature="e#3291#3386#0" expanded="false" />
<element signature="e#5936#6115#0" expanded="false" /> <element signature="e#3426#4090#0" expanded="false" />
<element signature="e#6164#6189#0" expanded="false" /> <element signature="e#4139#6324#0" expanded="false" />
<element signature="e#7824#7934#0" expanded="false" /> <element signature="e#6361#6540#0" expanded="false" />
<element signature="e#7964#8559#0" expanded="false" /> <element signature="e#6589#6614#0" expanded="false" />
<element signature="e#9099#12516#0" expanded="false" /> <element signature="e#9406#9516#0" expanded="false" />
<element signature="e#12977#13072#0" expanded="false" /> <element signature="e#10010#12303#0" expanded="false" />
<element signature="e#15315#15859#0" expanded="false" />
<element signature="e#19792#19923#0" expanded="false" />
<element signature="e#19966#20049#0" expanded="false" />
<element signature="e#20091#20221#0" expanded="false" />
<element signature="e#20264#20395#0" expanded="false" />
<element signature="e#20466#20599#0" expanded="false" />
<element signature="e#21116#21211#0" expanded="false" />
<element signature="e#22386#22601#0" expanded="false" />
<element signature="e#22634#24350#0" expanded="false" />
<element signature="e#22685#23340#0" expanded="false" />
<element signature="e#23370#23548#0" expanded="false" />
<element signature="e#23578#23756#0" expanded="false" />
<element signature="e#23787#23798#0" expanded="false" />
<element signature="e#23842#23859#0" expanded="false" />
<element signature="e#23912#24004#0" expanded="false" />
<element signature="e#24079#24350#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -76,36 +94,25 @@
<file leaf-file-name="engine.py" pinned="false" current-in-tab="false"> <file leaf-file-name="engine.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../script.module.torrent2http/lib/torrent2http/engine.py"> <entry file="file://$PROJECT_DIR$/../script.module.torrent2http/lib/torrent2http/engine.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="-9.275862">
<caret line="449" column="20" selection-start-line="449" selection-start-column="20" selection-end-line="449" selection-end-column="20" /> <caret line="347" column="13" selection-start-line="347" selection-start-column="13" selection-end-line="347" selection-end-column="13" />
<folding> <folding>
<element signature="e#425#493#1" expanded="false" /> <element signature="e#425#493#1" expanded="false" />
<element signature="e#729#1169#0" expanded="false" /> <element signature="e#729#1169#0" expanded="false" />
<element signature="e#1212#1326#0" expanded="false" /> <element signature="e#1212#1326#0" expanded="false" />
<element signature="e#1383#3673#0" expanded="false" />
<element signature="e#1383#1547#1" expanded="false" /> <element signature="e#1383#1547#1" expanded="false" />
<element signature="e#4693#9946#0" expanded="false" /> <element signature="e#4693#9946#0" expanded="false" />
<element signature="e#4693#7968#1" expanded="false" /> <element signature="e#4693#7968#1" expanded="false" />
<element signature="e#10009#10695#0" expanded="false" />
<element signature="e#10009#10148#1" expanded="false" />
<element signature="e#10744#15304#0" expanded="false" />
<element signature="e#10744#11054#1" expanded="false" /> <element signature="e#10744#11054#1" expanded="false" />
<element signature="e#15362#15961#0" expanded="false" /> <element signature="e#15362#15961#0" expanded="false" />
<element signature="e#15362#15776#1" expanded="false" /> <element signature="e#15362#15776#1" expanded="false" />
<element signature="e#16005#16313#0" expanded="false" />
<element signature="e#16005#16186#1" expanded="false" /> <element signature="e#16005#16186#1" expanded="false" />
<element signature="e#16363#16875#0" expanded="false" />
<element signature="e#16935#17842#0" expanded="false" />
<element signature="e#16935#17470#1" expanded="false" /> <element signature="e#16935#17470#1" expanded="false" />
<element signature="e#17903#18703#0" expanded="false" /> <element signature="e#17903#18703#0" expanded="false" />
<element signature="e#17903#18366#1" expanded="false" /> <element signature="e#17903#18366#1" expanded="false" />
<element signature="e#18746#19093#0" expanded="false" />
<element signature="e#18746#18954#1" expanded="false" /> <element signature="e#18746#18954#1" expanded="false" />
<element signature="e#19127#19178#0" expanded="false" /> <element signature="e#19127#19178#0" expanded="false" />
<element signature="e#19233#19415#0" expanded="false" /> <element signature="e#19233#19415#0" expanded="false" />
<element signature="e#19468#20511#0" expanded="false" />
<element signature="e#20567#21033#0" expanded="false" />
<element signature="e#20567#20983#1" expanded="false" />
<element signature="e#21064#21229#1" expanded="false" /> <element signature="e#21064#21229#1" expanded="false" />
</folding> </folding>
</state> </state>
@ -116,7 +123,7 @@
<entry file="file://$PROJECT_DIR$/../script.module.torrent2http/lib/torrent2http/__init__.py"> <entry file="file://$PROJECT_DIR$/../script.module.torrent2http/lib/torrent2http/__init__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="32" column="13" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="13" /> <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="29" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -125,8 +132,8 @@
<file leaf-file-name="Downloader.py" pinned="false" current-in-tab="false"> <file leaf-file-name="Downloader.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Downloader.py"> <entry file="file://$PROJECT_DIR$/Downloader.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.1724138"> <state vertical-scroll-proportion="0.0">
<caret line="28" column="16" selection-start-line="28" selection-start-column="16" selection-end-line="28" selection-end-column="16" /> <caret line="47" column="25" selection-start-line="47" selection-start-column="25" selection-end-line="47" selection-end-column="25" />
<folding> <folding>
<element signature="e#838#852#0" expanded="true" /> <element signature="e#838#852#0" expanded="true" />
</folding> </folding>
@ -141,10 +148,9 @@
<file leaf-file-name="Player.py" pinned="false" current-in-tab="true"> <file leaf-file-name="Player.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Player.py"> <entry file="file://$PROJECT_DIR$/Player.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.47847682"> <state vertical-scroll-proportion="0.50974023">
<caret line="209" column="19" selection-start-line="209" selection-start-column="19" selection-end-line="209" selection-end-column="19" /> <caret line="425" column="36" selection-start-line="425" selection-start-column="29" selection-end-line="425" selection-end-column="36" />
<folding> <folding>
<element signature="e#24#832#1" expanded="false" />
<element signature="e#834#843#0" expanded="true" /> <element signature="e#834#843#0" expanded="true" />
<element signature="e#1950#3666#0" expanded="false" /> <element signature="e#1950#3666#0" expanded="false" />
<element signature="e#2001#2656#0" expanded="false" /> <element signature="e#2001#2656#0" expanded="false" />
@ -154,18 +160,14 @@
<element signature="e#3158#3175#0" expanded="false" /> <element signature="e#3158#3175#0" expanded="false" />
<element signature="e#3228#3320#0" expanded="false" /> <element signature="e#3228#3320#0" expanded="false" />
<element signature="e#3395#3666#0" expanded="false" /> <element signature="e#3395#3666#0" expanded="false" />
<element signature="e#8424#11253#0" expanded="false" /> <element signature="e#15037#15168#0" expanded="false" />
<element signature="e#11289#13581#0" expanded="false" /> <element signature="e#15211#15294#0" expanded="false" />
<element signature="e#13630#14978#0" expanded="false" /> <element signature="e#15336#15466#0" expanded="false" />
<element signature="e#15021#15152#0" expanded="false" /> <element signature="e#15509#15640#0" expanded="false" />
<element signature="e#15195#15278#0" expanded="false" /> <element signature="e#15711#15844#0" expanded="false" />
<element signature="e#15320#15450#0" expanded="false" /> <element signature="e#19198#19339#0" expanded="false" />
<element signature="e#15493#15624#0" expanded="false" /> <element signature="e#19380#19716#0" expanded="false" />
<element signature="e#15695#15828#0" expanded="false" /> <element signature="e#20048#20143#0" expanded="false" />
<element signature="e#15858#18558#0" expanded="false" />
<element signature="e#19182#19323#0" expanded="false" />
<element signature="e#19364#19700#0" expanded="false" />
<element signature="e#20032#20127#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -174,8 +176,8 @@
<file leaf-file-name="Libtorrent.py" pinned="false" current-in-tab="false"> <file leaf-file-name="Libtorrent.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Libtorrent.py"> <entry file="file://$PROJECT_DIR$/Libtorrent.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="-8.827586">
<caret line="80" column="0" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" /> <caret line="480" column="0" selection-start-line="480" selection-start-column="0" selection-end-line="482" selection-end-column="74" />
<folding> <folding>
<element signature="e#24#836#1" expanded="false" /> <element signature="e#24#836#1" expanded="false" />
<element signature="e#6352#7821#0" expanded="false" /> <element signature="e#6352#7821#0" expanded="false" />
@ -190,13 +192,11 @@
<element signature="e#11026#11337#0" expanded="false" /> <element signature="e#11026#11337#0" expanded="false" />
<element signature="e#11621#12998#0" expanded="false" /> <element signature="e#11621#12998#0" expanded="false" />
<element signature="e#13043#13971#0" expanded="false" /> <element signature="e#13043#13971#0" expanded="false" />
<element signature="e#14008#16484#0" expanded="false" />
<element signature="e#16524#17167#0" expanded="false" /> <element signature="e#16524#17167#0" expanded="false" />
<element signature="e#17205#17906#0" expanded="false" /> <element signature="e#17205#17906#0" expanded="false" />
<element signature="e#17943#18045#0" expanded="false" /> <element signature="e#17943#18045#0" expanded="false" />
<element signature="e#18137#19309#0" expanded="false" /> <element signature="e#18137#19309#0" expanded="false" />
<element signature="e#19346#19750#0" expanded="false" /> <element signature="e#19346#19750#0" expanded="false" />
<element signature="e#19781#21708#0" expanded="false" />
<element signature="e#21754#22851#0" expanded="false" /> <element signature="e#21754#22851#0" expanded="false" />
<element signature="e#22886#23029#0" expanded="false" /> <element signature="e#22886#23029#0" expanded="false" />
</folding> </folding>
@ -229,66 +229,53 @@
<entry file="file://$PROJECT_DIR$/Core.py"> <entry file="file://$PROJECT_DIR$/Core.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="1309" column="28" selection-start-line="1309" selection-start-column="28" selection-end-line="1309" selection-end-column="28" /> <caret line="239" column="25" selection-start-line="239" selection-start-column="25" selection-end-line="239" selection-end-column="25" />
<folding> <folding>
<element signature="e#24#837#1" expanded="false" /> <element signature="e#24#837#1" expanded="false" />
<element signature="e#1759#2052#0" expanded="false" /> <element signature="e#1759#2052#0" expanded="false" />
<element signature="e#2089#5558#0" expanded="false" /> <element signature="e#2089#5558#0" expanded="false" />
<element signature="e#5597#17562#0" expanded="false" /> <element signature="e#5597#17562#0" expanded="false" />
<element signature="e#17603#18377#0" expanded="false" /> <element signature="e#18551#25634#0" expanded="false" />
<element signature="e#18428#25511#0" expanded="false" /> <element signature="e#25678#29107#0" expanded="false" />
<element signature="e#25555#28984#0" expanded="false" /> <element signature="e#29148#30375#0" expanded="false" />
<element signature="e#29025#30252#0" expanded="false" /> <element signature="e#30475#34829#0" expanded="false" />
<element signature="e#30352#34706#0" expanded="false" /> <element signature="e#34877#36966#0" expanded="false" />
<element signature="e#34754#36843#0" expanded="false" /> <element signature="e#37008#38738#0" expanded="false" />
<element signature="e#36885#38615#0" expanded="false" /> <element signature="e#38788#43550#0" expanded="false" />
<element signature="e#38665#43427#0" expanded="false" /> <element signature="e#43615#50029#0" expanded="false" />
<element signature="e#43492#49906#0" expanded="false" /> <element signature="e#50093#52603#0" expanded="false" />
<element signature="e#49970#52480#0" expanded="false" /> <element signature="e#52650#53517#0" expanded="false" />
<element signature="e#52527#53394#0" expanded="false" /> <element signature="e#53566#55755#0" expanded="false" />
<element signature="e#53443#55632#0" expanded="false" /> <element signature="e#55912#57271#0" expanded="false" />
<element signature="e#55789#57148#0" expanded="false" /> <element signature="e#57327#57744#0" expanded="false" />
<element signature="e#57204#57621#0" expanded="false" /> <element signature="e#57794#57945#0" expanded="false" />
<element signature="e#57671#57822#0" expanded="false" /> <element signature="e#57997#66646#0" expanded="false" />
<element signature="e#57874#66523#0" expanded="false" /> <element signature="e#66695#66734#0" expanded="false" />
<element signature="e#66572#66611#0" expanded="false" /> <element signature="e#66783#67563#0" expanded="false" />
<element signature="e#66660#67440#0" expanded="false" /> <element signature="e#70144#71344#0" expanded="false" />
<element signature="e#70021#71221#0" expanded="false" /> <element signature="e#74174#74775#0" expanded="false" />
<element signature="e#73133#74006#0" expanded="false" /> <element signature="e#78449#79692#0" expanded="false" />
<element signature="e#74051#74652#0" expanded="false" /> <element signature="e#79742#79838#0" expanded="false" />
<element signature="e#74700#78278#0" expanded="false" /> <element signature="e#79899#85225#0" expanded="false" />
<element signature="e#78326#79569#0" expanded="false" /> <element signature="e#85269#85326#0" expanded="false" />
<element signature="e#79619#79715#0" expanded="false" /> <element signature="e#85380#88614#0" expanded="false" />
<element signature="e#79776#85102#0" expanded="false" /> <element signature="e#88669#90275#0" expanded="false" />
<element signature="e#85146#85203#0" expanded="false" /> <element signature="e#90341#90961#0" expanded="false" />
<element signature="e#85257#88491#0" expanded="false" /> <element signature="e#91004#91988#0" expanded="false" />
<element signature="e#88546#90152#0" expanded="false" /> <element signature="e#92030#92806#0" expanded="false" />
<element signature="e#90218#90838#0" expanded="false" /> <element signature="e#92848#92943#0" expanded="false" />
<element signature="e#90881#91865#0" expanded="false" /> <element signature="e#92993#93141#0" expanded="false" />
<element signature="e#91907#92683#0" expanded="false" /> <element signature="e#93187#93471#0" expanded="false" />
<element signature="e#92725#92820#0" expanded="false" />
<element signature="e#92870#93018#0" expanded="false" />
<element signature="e#93064#93348#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="settings.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/settings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="16" column="15" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="README.txt" pinned="false" current-in-tab="false"> <file leaf-file-name="README.txt" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/README.txt"> <entry file="file://$PROJECT_DIR$/README.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="3" column="67" selection-start-line="3" selection-start-column="67" selection-end-line="3" selection-end-column="67" /> <caret line="1" column="31" selection-start-line="1" selection-start-column="31" selection-end-line="1" selection-end-column="95" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -354,18 +341,18 @@
<option value="$PROJECT_DIR$/../torrenter.searcher.PornoLabNet/addon.xml" /> <option value="$PROJECT_DIR$/../torrenter.searcher.PornoLabNet/addon.xml" />
<option value="$PROJECT_DIR$/../torrenter.searcher.PornoLabNet/PornoLabNet.py" /> <option value="$PROJECT_DIR$/../torrenter.searcher.PornoLabNet/PornoLabNet.py" />
<option value="$PROJECT_DIR$/resources/contenters/CXZ.py" /> <option value="$PROJECT_DIR$/resources/contenters/CXZ.py" />
<option value="$PROJECT_DIR$/resources/settings.xml" />
<option value="$PROJECT_DIR$/README.txt" /> <option value="$PROJECT_DIR$/README.txt" />
<option value="$PROJECT_DIR$/SearcherABC.py" /> <option value="$PROJECT_DIR$/SearcherABC.py" />
<option value="$PROJECT_DIR$/functions.py" /> <option value="$PROJECT_DIR$/functions.py" />
<option value="$PROJECT_DIR$/Player.py" />
<option value="$PROJECT_DIR$/Libtorrent.py" /> <option value="$PROJECT_DIR$/Libtorrent.py" />
<option value="$PROJECT_DIR$/addon.xml" /> <option value="$PROJECT_DIR$/addon.xml" />
<option value="$PROJECT_DIR$/Downloader.py" />
<option value="$PROJECT_DIR$/resources/language/English/strings.xml" />
<option value="$PROJECT_DIR$/resources/language/Hebrew/strings.xml" /> <option value="$PROJECT_DIR$/resources/language/Hebrew/strings.xml" />
<option value="$PROJECT_DIR$/resources/language/Russian/strings.xml" /> <option value="$PROJECT_DIR$/Downloader.py" />
<option value="$PROJECT_DIR$/Player.py" />
<option value="$PROJECT_DIR$/Core.py" /> <option value="$PROJECT_DIR$/Core.py" />
<option value="$PROJECT_DIR$/resources/settings.xml" />
<option value="$PROJECT_DIR$/resources/language/Russian/strings.xml" />
<option value="$PROJECT_DIR$/resources/language/English/strings.xml" />
<option value="$PROJECT_DIR$/Anteoloader.py" /> <option value="$PROJECT_DIR$/Anteoloader.py" />
</list> </list>
</option> </option>
@ -401,8 +388,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
@ -474,9 +459,55 @@
<option name="myItemId" value="language" /> <option name="myItemId" value="language" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Russian" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="plugin.video.torrenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="plugin.video.torrenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="language" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="plugin.video.torrenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="plugin.video.torrenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="language" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="English" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -658,12 +689,6 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<updated>1420801533300</updated> <updated>1420801533300</updated>
</task> </task>
<task id="LOCAL-00093" summary="settings only for active searchers">
<created>1437164160795</created>
<option name="number" value="00093" />
<option name="project" value="LOCAL" />
<updated>1437164160795</updated>
</task>
<task id="LOCAL-00094" summary="trans fix"> <task id="LOCAL-00094" summary="trans fix">
<created>1437255878279</created> <created>1437255878279</created>
<option name="number" value="00094" /> <option name="number" value="00094" />
@ -952,18 +977,25 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1450296096323</updated> <updated>1450296096323</updated>
</task> </task>
<option name="localTasksCounter" value="142" /> <task id="LOCAL-00142" summary="anteo prototype">
<created>1450299338138</created>
<option name="number" value="00142" />
<option name="project" value="LOCAL" />
<updated>1450299338138</updated>
</task>
<option name="localTasksCounter" value="143" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" /> <editor active="false" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13224447" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13224447" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925472" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925472" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32182628" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32814237" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32814237" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2647386" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2505568" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32703003" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32703003" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1319149" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1319149" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@ -976,7 +1008,6 @@
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24946696" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24946696" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32182628" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout> </layout>
@ -993,7 +1024,6 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="dht fix" />
<MESSAGE value="module over system" /> <MESSAGE value="module over system" />
<MESSAGE value="speed &amp; encryption" /> <MESSAGE value="speed &amp; encryption" />
<MESSAGE value="include btclient" /> <MESSAGE value="include btclient" />
@ -1018,7 +1048,8 @@
<MESSAGE value="RussakHH stable roll-back" /> <MESSAGE value="RussakHH stable roll-back" />
<MESSAGE value="RussakHH stable roll-back 2" /> <MESSAGE value="RussakHH stable roll-back 2" />
<MESSAGE value="icon fix + anteo start" /> <MESSAGE value="icon fix + anteo start" />
<option name="LAST_COMMIT_MESSAGE" value="icon fix + anteo start" /> <MESSAGE value="anteo prototype" />
<option name="LAST_COMMIT_MESSAGE" value="anteo prototype" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
@ -1230,14 +1261,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/README.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="3" column="67" selection-start-line="3" selection-start-column="67" selection-end-line="3" selection-end-column="67" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/SearcherABC.py"> <entry file="file://$PROJECT_DIR$/SearcherABC.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
@ -1264,13 +1287,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/BTClientPlayer.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-12.6643715">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.RuTrackerOrg/RuTrackerOrg.py"> <entry file="file://$PROJECT_DIR$/../torrenter.searcher.RuTrackerOrg/RuTrackerOrg.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.30327868"> <state vertical-scroll-proportion="0.30327868">
@ -1292,14 +1308,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/settings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="16" column="15" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../script.module.torrent2http/lib/torrent2http/mimetypes.py"> <entry file="file://$PROJECT_DIR$/../script.module.torrent2http/lib/torrent2http/mimetypes.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-5.072131"> <state vertical-scroll-proportion="-5.072131">
@ -1315,75 +1323,77 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/functions.py"> <entry file="file://$PROJECT_DIR$/resources/language/Ukrainian/strings.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.3360791">
<caret line="1564" column="7" selection-start-line="1564" selection-start-column="4" selection-end-line="1564" selection-end-column="7" /> <caret line="24" column="46" selection-start-line="24" selection-start-column="46" selection-end-line="24" selection-end-column="46" />
<folding>
<element signature="e#24#832#1" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../script.module.torrent2http/lib/torrent2http/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="32" column="13" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Downloader.py"> <entry file="file://$PROJECT_DIR$/resources/language/Hebrew/strings.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.1724138"> <state vertical-scroll-proportion="0.7561779">
<caret line="28" column="16" selection-start-line="28" selection-start-column="16" selection-end-line="28" selection-end-column="16" /> <caret line="45" column="35" selection-start-line="45" selection-start-column="35" selection-end-line="45" selection-end-column="35" />
<folding>
<element signature="e#838#852#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/../script.module.torrent2http/lib/torrent2http/engine.py"> <entry file="file://$PROJECT_DIR$/README.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="449" column="20" selection-start-line="449" selection-start-column="20" selection-end-line="449" selection-end-column="20" /> <caret line="1" column="31" selection-start-line="1" selection-start-column="31" selection-end-line="1" selection-end-column="95" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Core.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="239" column="25" selection-start-line="239" selection-start-column="25" selection-end-line="239" selection-end-column="25" />
<folding> <folding>
<element signature="e#425#493#1" expanded="false" /> <element signature="e#24#837#1" expanded="false" />
<element signature="e#729#1169#0" expanded="false" /> <element signature="e#1759#2052#0" expanded="false" />
<element signature="e#1212#1326#0" expanded="false" /> <element signature="e#2089#5558#0" expanded="false" />
<element signature="e#1383#3673#0" expanded="false" /> <element signature="e#5597#17562#0" expanded="false" />
<element signature="e#1383#1547#1" expanded="false" /> <element signature="e#18551#25634#0" expanded="false" />
<element signature="e#4693#9946#0" expanded="false" /> <element signature="e#25678#29107#0" expanded="false" />
<element signature="e#4693#7968#1" expanded="false" /> <element signature="e#29148#30375#0" expanded="false" />
<element signature="e#10009#10695#0" expanded="false" /> <element signature="e#30475#34829#0" expanded="false" />
<element signature="e#10009#10148#1" expanded="false" /> <element signature="e#34877#36966#0" expanded="false" />
<element signature="e#10744#15304#0" expanded="false" /> <element signature="e#37008#38738#0" expanded="false" />
<element signature="e#10744#11054#1" expanded="false" /> <element signature="e#38788#43550#0" expanded="false" />
<element signature="e#15362#15961#0" expanded="false" /> <element signature="e#43615#50029#0" expanded="false" />
<element signature="e#15362#15776#1" expanded="false" /> <element signature="e#50093#52603#0" expanded="false" />
<element signature="e#16005#16313#0" expanded="false" /> <element signature="e#52650#53517#0" expanded="false" />
<element signature="e#16005#16186#1" expanded="false" /> <element signature="e#53566#55755#0" expanded="false" />
<element signature="e#16363#16875#0" expanded="false" /> <element signature="e#55912#57271#0" expanded="false" />
<element signature="e#16935#17842#0" expanded="false" /> <element signature="e#57327#57744#0" expanded="false" />
<element signature="e#16935#17470#1" expanded="false" /> <element signature="e#57794#57945#0" expanded="false" />
<element signature="e#17903#18703#0" expanded="false" /> <element signature="e#57997#66646#0" expanded="false" />
<element signature="e#17903#18366#1" expanded="false" /> <element signature="e#66695#66734#0" expanded="false" />
<element signature="e#18746#19093#0" expanded="false" /> <element signature="e#66783#67563#0" expanded="false" />
<element signature="e#18746#18954#1" expanded="false" /> <element signature="e#70144#71344#0" expanded="false" />
<element signature="e#19127#19178#0" expanded="false" /> <element signature="e#74174#74775#0" expanded="false" />
<element signature="e#19233#19415#0" expanded="false" /> <element signature="e#78449#79692#0" expanded="false" />
<element signature="e#19468#20511#0" expanded="false" /> <element signature="e#79742#79838#0" expanded="false" />
<element signature="e#20567#21033#0" expanded="false" /> <element signature="e#79899#85225#0" expanded="false" />
<element signature="e#20567#20983#1" expanded="false" /> <element signature="e#85269#85326#0" expanded="false" />
<element signature="e#21064#21229#1" expanded="false" /> <element signature="e#85380#88614#0" expanded="false" />
<element signature="e#88669#90275#0" expanded="false" />
<element signature="e#90341#90961#0" expanded="false" />
<element signature="e#91004#91988#0" expanded="false" />
<element signature="e#92030#92806#0" expanded="false" />
<element signature="e#92848#92943#0" expanded="false" />
<element signature="e#92993#93141#0" expanded="false" />
<element signature="e#93187#93471#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Libtorrent.py"> <entry file="file://$PROJECT_DIR$/Libtorrent.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="-8.827586">
<caret line="80" column="0" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" /> <caret line="480" column="0" selection-start-line="480" selection-start-column="0" selection-end-line="482" selection-end-column="74" />
<folding> <folding>
<element signature="e#24#836#1" expanded="false" /> <element signature="e#24#836#1" expanded="false" />
<element signature="e#6352#7821#0" expanded="false" /> <element signature="e#6352#7821#0" expanded="false" />
@ -1398,104 +1408,58 @@
<element signature="e#11026#11337#0" expanded="false" /> <element signature="e#11026#11337#0" expanded="false" />
<element signature="e#11621#12998#0" expanded="false" /> <element signature="e#11621#12998#0" expanded="false" />
<element signature="e#13043#13971#0" expanded="false" /> <element signature="e#13043#13971#0" expanded="false" />
<element signature="e#14008#16484#0" expanded="false" />
<element signature="e#16524#17167#0" expanded="false" /> <element signature="e#16524#17167#0" expanded="false" />
<element signature="e#17205#17906#0" expanded="false" /> <element signature="e#17205#17906#0" expanded="false" />
<element signature="e#17943#18045#0" expanded="false" /> <element signature="e#17943#18045#0" expanded="false" />
<element signature="e#18137#19309#0" expanded="false" /> <element signature="e#18137#19309#0" expanded="false" />
<element signature="e#19346#19750#0" expanded="false" /> <element signature="e#19346#19750#0" expanded="false" />
<element signature="e#19781#21708#0" expanded="false" />
<element signature="e#21754#22851#0" expanded="false" /> <element signature="e#21754#22851#0" expanded="false" />
<element signature="e#22886#23029#0" expanded="false" /> <element signature="e#22886#23029#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/language/Ukrainian/strings.xml"> <entry file="file://$PROJECT_DIR$/../script.module.torrent2http/lib/torrent2http/engine.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3360791"> <state vertical-scroll-proportion="-9.275862">
<caret line="24" column="46" selection-start-line="24" selection-start-column="46" selection-end-line="24" selection-end-column="46" /> <caret line="347" column="13" selection-start-line="347" selection-start-column="13" selection-end-line="347" selection-end-column="13" />
<folding /> <folding>
<element signature="e#425#493#1" expanded="false" />
<element signature="e#729#1169#0" expanded="false" />
<element signature="e#1212#1326#0" expanded="false" />
<element signature="e#1383#1547#1" expanded="false" />
<element signature="e#4693#9946#0" expanded="false" />
<element signature="e#4693#7968#1" expanded="false" />
<element signature="e#10744#11054#1" expanded="false" />
<element signature="e#15362#15961#0" expanded="false" />
<element signature="e#15362#15776#1" expanded="false" />
<element signature="e#16005#16186#1" expanded="false" />
<element signature="e#16935#17470#1" expanded="false" />
<element signature="e#17903#18703#0" expanded="false" />
<element signature="e#17903#18366#1" expanded="false" />
<element signature="e#18746#18954#1" expanded="false" />
<element signature="e#19127#19178#0" expanded="false" />
<element signature="e#19233#19415#0" expanded="false" />
<element signature="e#21064#21229#1" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/language/Russian/strings.xml"> <entry file="file://$PROJECT_DIR$/functions.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.5881384">
<caret line="45" column="35" selection-start-line="45" selection-start-column="35" selection-end-line="45" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/language/Hebrew/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.7561779">
<caret line="45" column="35" selection-start-line="45" selection-start-column="35" selection-end-line="45" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/language/English/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.33217993">
<caret line="45" column="35" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Core.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="1309" column="28" selection-start-line="1309" selection-start-column="28" selection-end-line="1309" selection-end-column="28" /> <caret line="137" column="4" selection-start-line="137" selection-start-column="4" selection-end-line="137" selection-end-column="4" />
<folding> <folding>
<element signature="e#24#837#1" expanded="false" /> <element signature="e#24#832#1" expanded="false" />
<element signature="e#1759#2052#0" expanded="false" />
<element signature="e#2089#5558#0" expanded="false" />
<element signature="e#5597#17562#0" expanded="false" />
<element signature="e#17603#18377#0" expanded="false" />
<element signature="e#18428#25511#0" expanded="false" />
<element signature="e#25555#28984#0" expanded="false" />
<element signature="e#29025#30252#0" expanded="false" />
<element signature="e#30352#34706#0" expanded="false" />
<element signature="e#34754#36843#0" expanded="false" />
<element signature="e#36885#38615#0" expanded="false" />
<element signature="e#38665#43427#0" expanded="false" />
<element signature="e#43492#49906#0" expanded="false" />
<element signature="e#49970#52480#0" expanded="false" />
<element signature="e#52527#53394#0" expanded="false" />
<element signature="e#53443#55632#0" expanded="false" />
<element signature="e#55789#57148#0" expanded="false" />
<element signature="e#57204#57621#0" expanded="false" />
<element signature="e#57671#57822#0" expanded="false" />
<element signature="e#57874#66523#0" expanded="false" />
<element signature="e#66572#66611#0" expanded="false" />
<element signature="e#66660#67440#0" expanded="false" />
<element signature="e#70021#71221#0" expanded="false" />
<element signature="e#73133#74006#0" expanded="false" />
<element signature="e#74051#74652#0" expanded="false" />
<element signature="e#74700#78278#0" expanded="false" />
<element signature="e#78326#79569#0" expanded="false" />
<element signature="e#79619#79715#0" expanded="false" />
<element signature="e#79776#85102#0" expanded="false" />
<element signature="e#85146#85203#0" expanded="false" />
<element signature="e#85257#88491#0" expanded="false" />
<element signature="e#88546#90152#0" expanded="false" />
<element signature="e#90218#90838#0" expanded="false" />
<element signature="e#90881#91865#0" expanded="false" />
<element signature="e#91907#92683#0" expanded="false" />
<element signature="e#92725#92820#0" expanded="false" />
<element signature="e#92870#93018#0" expanded="false" />
<element signature="e#93064#93348#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Player.py"> <entry file="file://$PROJECT_DIR$/Player.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.47847682"> <state vertical-scroll-proportion="0.50974023">
<caret line="209" column="19" selection-start-line="209" selection-start-column="19" selection-end-line="209" selection-end-column="19" /> <caret line="425" column="36" selection-start-line="425" selection-start-column="29" selection-end-line="425" selection-end-column="36" />
<folding> <folding>
<element signature="e#24#832#1" expanded="false" />
<element signature="e#834#843#0" expanded="true" /> <element signature="e#834#843#0" expanded="true" />
<element signature="e#1950#3666#0" expanded="false" /> <element signature="e#1950#3666#0" expanded="false" />
<element signature="e#2001#2656#0" expanded="false" /> <element signature="e#2001#2656#0" expanded="false" />
@ -1505,39 +1469,93 @@
<element signature="e#3158#3175#0" expanded="false" /> <element signature="e#3158#3175#0" expanded="false" />
<element signature="e#3228#3320#0" expanded="false" /> <element signature="e#3228#3320#0" expanded="false" />
<element signature="e#3395#3666#0" expanded="false" /> <element signature="e#3395#3666#0" expanded="false" />
<element signature="e#8424#11253#0" expanded="false" /> <element signature="e#15037#15168#0" expanded="false" />
<element signature="e#11289#13581#0" expanded="false" /> <element signature="e#15211#15294#0" expanded="false" />
<element signature="e#13630#14978#0" expanded="false" /> <element signature="e#15336#15466#0" expanded="false" />
<element signature="e#15021#15152#0" expanded="false" /> <element signature="e#15509#15640#0" expanded="false" />
<element signature="e#15195#15278#0" expanded="false" /> <element signature="e#15711#15844#0" expanded="false" />
<element signature="e#15320#15450#0" expanded="false" /> <element signature="e#19198#19339#0" expanded="false" />
<element signature="e#15493#15624#0" expanded="false" /> <element signature="e#19380#19716#0" expanded="false" />
<element signature="e#15695#15828#0" expanded="false" /> <element signature="e#20048#20143#0" expanded="false" />
<element signature="e#15858#18558#0" expanded="false" /> </folding>
<element signature="e#19182#19323#0" expanded="false" /> </state>
<element signature="e#19364#19700#0" expanded="false" /> </provider>
<element signature="e#20032#20127#0" expanded="false" /> </entry>
<entry file="file://$PROJECT_DIR$/resources/settings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.72432435">
<caret line="28" column="81" selection-start-line="28" selection-start-column="81" selection-end-line="28" selection-end-column="81" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../script.module.torrent2http/lib/torrent2http/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="29" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/language/English/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.14234234">
<caret line="50" column="55" selection-start-line="50" selection-start-column="55" selection-end-line="50" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/language/Russian/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.43603605">
<caret line="50" column="54" selection-start-line="50" selection-start-column="54" selection-end-line="50" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Downloader.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="47" column="25" selection-start-line="47" selection-start-column="25" selection-end-line="47" selection-end-column="25" />
<folding>
<element signature="e#838#852#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Anteoloader.py"> <entry file="file://$PROJECT_DIR$/Anteoloader.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.46523178"> <state vertical-scroll-proportion="-1.4399351">
<caret line="320" column="20" selection-start-line="320" selection-start-column="20" selection-end-line="320" selection-end-column="20" /> <caret line="341" column="49" selection-start-line="341" selection-start-column="49" selection-end-line="341" selection-end-column="49" />
<folding> <folding>
<element signature="e#24#785#1" expanded="false" /> <element signature="e#24#785#1" expanded="false" />
<element signature="e#2114#6189#0" expanded="false" /> <element signature="e#2113#2156#0" expanded="false" />
<element signature="e#3015#3125#0" expanded="false" /> <element signature="e#2181#6614#0" expanded="false" />
<element signature="e#3167#3262#0" expanded="false" /> <element signature="e#2344#3105#0" expanded="false" />
<element signature="e#3302#3966#0" expanded="false" /> <element signature="e#3139#3249#0" expanded="false" />
<element signature="e#4015#5899#0" expanded="false" /> <element signature="e#3291#3386#0" expanded="false" />
<element signature="e#5936#6115#0" expanded="false" /> <element signature="e#3426#4090#0" expanded="false" />
<element signature="e#6164#6189#0" expanded="false" /> <element signature="e#4139#6324#0" expanded="false" />
<element signature="e#7824#7934#0" expanded="false" /> <element signature="e#6361#6540#0" expanded="false" />
<element signature="e#7964#8559#0" expanded="false" /> <element signature="e#6589#6614#0" expanded="false" />
<element signature="e#9099#12516#0" expanded="false" /> <element signature="e#9406#9516#0" expanded="false" />
<element signature="e#12977#13072#0" expanded="false" /> <element signature="e#10010#12303#0" expanded="false" />
<element signature="e#15315#15859#0" expanded="false" />
<element signature="e#19792#19923#0" expanded="false" />
<element signature="e#19966#20049#0" expanded="false" />
<element signature="e#20091#20221#0" expanded="false" />
<element signature="e#20264#20395#0" expanded="false" />
<element signature="e#20466#20599#0" expanded="false" />
<element signature="e#21116#21211#0" expanded="false" />
<element signature="e#22386#22601#0" expanded="false" />
<element signature="e#22634#24350#0" expanded="false" />
<element signature="e#22685#23340#0" expanded="false" />
<element signature="e#23370#23548#0" expanded="false" />
<element signature="e#23578#23756#0" expanded="false" />
<element signature="e#23787#23798#0" expanded="false" />
<element signature="e#23842#23859#0" expanded="false" />
<element signature="e#23912#24004#0" expanded="false" />
<element signature="e#24079#24350#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>

338
Anteoloader.py
View File

@ -81,6 +81,11 @@ ENCRYPTION_SETTINGS = {
"Disabled": 2, "Disabled": 2,
} }
class Encryption:
FORCED = 0
ENABLED = 1
DISABLED = 2
class AnteoLoader: class AnteoLoader:
magnetLink = None magnetLink = None
engine = None engine = None
@ -97,10 +102,12 @@ class AnteoLoader:
sys.exit(1) sys.exit(1)
#pre settings #pre settings
if xbmcvfs.exists(torrentFile): if os.path.exists(torrentFile):
self.torrentFile = "file:///"+torrentFile.replace('\\','//').replace('////','//') self.torrentFile = "file:///"+torrentFile.replace('\\','//').replace('////','//')
elif re.match("^magnet\:.+$", torrentFile): elif re.match("^magnet\:.+$", torrentFile):
self.magnetLink = torrentFile self.magnetLink = torrentFile
else:
self.torrentFile = torrentFile
def __exit__(self): def __exit__(self):
log('on __exit__') log('on __exit__')
@ -134,17 +141,15 @@ class AnteoLoader:
return filelist return filelist
def saveTorrent(self, torrentUrl): def saveTorrent(self, torrentUrl):
if not xbmcvfs.exists(torrentUrl): if not xbmcvfs.exists(torrentUrl) or re.match("^http.+$", torrentUrl):
if re.match("^magnet\:.+$", torrentUrl): if re.match("^magnet\:.+$", torrentUrl):
self.magnetLink = torrentUrl self.magnetLink = torrentUrl
self.magnetToTorrent(torrentUrl) self.magnetToTorrent(torrentUrl)
self.magnetLink = None self.magnetLink = None
return self.torrentFile return self.torrentFile
else: else:
if not xbmcvfs.exists(self.torrentFilesPath): if not xbmcvfs.exists(self.torrentFilesPath): xbmcvfs.mkdirs(self.torrentFilesPath)
xbmcvfs.mkdirs(self.torrentFilesPath) torrentFile = self.torrentFilesPath + self.md5(torrentUrl) + '.torrent'
torrentFile = self.torrentFilesPath + self.md5(
torrentUrl) + '.torrent'
try: try:
if not re.match("^http\:.+$", torrentUrl): if not re.match("^http\:.+$", torrentUrl):
content = xbmcvfs.File(torrentUrl, "rb").read() content = xbmcvfs.File(torrentUrl, "rb").read()
@ -169,6 +174,10 @@ class AnteoLoader:
return return
else: else:
torrentFile = torrentUrl torrentFile = torrentUrl
if xbmcvfs.exists(torrentFile) and not os.path.exists(torrentFile):
if not xbmcvfs.exists(self.torrentFilesPath): xbmcvfs.mkdirs(self.torrentFilesPath)
torrentFile = self.torrentFilesPath + self.md5(torrentUrl) + '.torrent'
xbmcvfs.copy(torrentUrl, torrentFile)
if xbmcvfs.exists(torrentFile): if xbmcvfs.exists(torrentFile):
self.torrentFile = "file:///"+torrentFile.replace('\\','//').replace('////','//') self.torrentFile = "file:///"+torrentFile.replace('\\','//').replace('////','//')
return self.torrentFile return self.torrentFile
@ -203,26 +212,44 @@ class AnteoPlayer(xbmc.Player):
self.userStorageDirectory = userStorageDirectory self.userStorageDirectory = userStorageDirectory
self.torrentUrl = torrentUrl self.torrentUrl = torrentUrl
xbmc.Player.__init__(self) xbmc.Player.__init__(self)
log("[TorrentPlayer] Initalized") log("[AnteoPlayer] Initalized")
self.params = params self.params = params
self.get = self.params.get self.get = self.params.get
self.contentId = int(self.get("url")) self.contentId = int(self.get("url"))
self.torrent = AnteoLoader(self.userStorageDirectory, self.torrentUrl, self.torrentFilesDirectory) #self.torrent = AnteoLoader(self.userStorageDirectory, self.torrentUrl, self.torrentFilesDirectory)
try:
if self.get("url2"):
self.ids_video = urllib.unquote_plus(self.get("url2")).split(',')
else:
self.ids_video = self.get_ids()
except:
pass
self.init() self.init()
self.setup_engine() self.setup_engine()
with closing(self.engine): with closing(self.engine):
self.engine.start(self.contentId) self.engine.start(self.contentId)
ready = self.buffer() self.setup_nextep()
if ready: while True:
self.stream() if self.buffer():
log('[AnteoPlayer]: ************************************* GOING LOOP')
if self.setup_play():
self.loop()
else:
log('[AnteoPlayer]: ************************************* break')
break
log('[AnteoPlayer]: ************************************* GO NEXT?')
if self.next_dl and isinstance(self.next_contentId, int) and self.iterator == 100:
self.contentId = self.next_contentId
continue
log('[AnteoPlayer]: ************************************* NO! break')
break
xbmc.Player().stop()
if '1' != self.__settings__.getSetting("keep_files") and 'Saved Files' not in self.userStorageDirectory:
xbmc.sleep(1000)
clearStorage(self.userStorageDirectory)
else:
if self.seeding_status:
showMessage(self.localize('Information'),
self.localize('Torrent is seeding. To stop it use Download Status.'), forced=True)
else:
if self.seeding: self.db_delete()
showMessage(self.localize('Information'),
self.localize('Torrent downloading is stopped.'), forced=True)
def __exit__(self): def __exit__(self):
log('on __exit__') log('on __exit__')
@ -231,8 +258,6 @@ class AnteoPlayer(xbmc.Player):
log('__exit__ worked!') log('__exit__ worked!')
def init(self): def init(self):
self.next_dl = True if self.__settings__.getSetting('next_dl') == 'true' and self.ids_video else False
log('[AnteoPlayer]: init - ' + str(self.next_dl))
self.next_contentId = False self.next_contentId = False
self.display_name = '' self.display_name = ''
self.downloadedSize = 0 self.downloadedSize = 0
@ -245,16 +270,43 @@ class AnteoPlayer(xbmc.Player):
self.torrentUrl = "file:///"+str(self.torrentUrl).replace('\\','//').replace('////','//') self.torrentUrl = "file:///"+str(self.torrentUrl).replace('\\','//').replace('////','//')
def setup_engine(self): def setup_engine(self):
encryption = True if self.__settings__.getSetting('encryption') == 'true' else False #uri=None, binaries_path=None, platform=None, download_path=".",
#bind_host='127.0.0.1', bind_port=5001, connections_limit=None, download_kbps=None, upload_kbps=None,
#enable_dht=True, enable_lsd=True, enable_natpmp=True, enable_upnp=True, enable_scrape=False,
#log_stats=False, encryption=Encryption.ENABLED, keep_complete=False, keep_incomplete=False,
#keep_files=False, log_files_progress=False, log_overall_progress=False, log_pieces_progress=False,
#listen_port=6881, use_random_port=False, max_idle_timeout=None, no_sparse=False, resume_file=None,
#user_agent=None, startup_timeout=5, state_file=None, enable_utp=True, enable_tcp=True,
#debug_alerts=False, logger=None, torrent_connect_boost=50, connection_speed=50,
#peer_connect_timeout=15, request_timeout=20, min_reconnect_time=60, max_failcount=3,
#dht_routers=None, trackers=None)
upload_limit = self.__settings__.getSetting("upload_limit") if self.__settings__.getSetting( encryption = Encryption.ENABLED if self.__settings__.getSetting('encryption') == 'true' else Encryption.DISABLED
upload_limit = int(self.__settings__.getSetting("upload_limit"))*1024 if self.__settings__.getSetting(
"upload_limit") != "" else 0 "upload_limit") != "" else 0
download_limit = self.__settings__.getSetting("download_limit") if self.__settings__.getSetting( download_limit = int(self.__settings__.getSetting("download_limit"))*1024 if self.__settings__.getSetting(
"download_limit") != "" else 0 "download_limit") != "" else 0
self.pre_buffer_bytes = 15*1024*1024
self.engine = Engine(uri=self.torrentUrl) if self.__settings__.getSetting("connections_limit") not in ["",0,"0"]:
connections_limit = int(self.__settings__.getSetting("connections_limit"))
else:
connections_limit = None
if '1' != self.__settings__.getSetting("keep_files") and 'Saved Files' not in self.userStorageDirectory:
keep_complete = False
keep_incomplete = False
else:
keep_complete = True
keep_incomplete = True
dht_routers = ["router.bittorrent.com:6881","router.utorrent.com:6881"]
self.engine = Engine(uri=self.torrentUrl, download_path=self.userStorageDirectory,
connections_limit=connections_limit, download_kbps=download_limit, upload_kbps=upload_limit,
encryption=encryption, keep_complete=keep_complete, keep_incomplete=keep_incomplete,
dht_routers=dht_routers)
def buffer(self): def buffer(self):
self.pre_buffer_bytes = 30*1024*1024 #30 MB
ready = False ready = False
progressBar = xbmcgui.DialogProgress() progressBar = xbmcgui.DialogProgress()
progressBar.create(self.localize('Please Wait'), progressBar.create(self.localize('Please Wait'),
@ -265,22 +317,14 @@ class AnteoPlayer(xbmc.Player):
# for ind, title in subs: # for ind, title in subs:
# self.torrent.continueSession(ind) # self.torrent.continueSession(ind)
#FileStatus = namedtuple('FileStatus', "name, save_path, url, size, offset, download, progress, index, media_type")
#SessionStatus = namedtuple('SessionStatus', "name, state, state_str, error, progress, download_rate, upload_rate, "
# "total_download, total_upload, num_peers, num_seeds, total_seeds, "
# "total_peers")
while not xbmc.abortRequested and not ready: while not xbmc.abortRequested and not ready:
xbmc.sleep(500) xbmc.sleep(500)
status = self.engine.status() status = self.engine.status()
self.print_debug(status)
self.engine.check_torrent_error(status) self.engine.check_torrent_error(status)
file_status = self.engine.file_status(self.contentId) file_status = self.engine.file_status(self.contentId)
if not file_status: if not file_status:
continue continue
log('[buffer] file_status:'+str(file_status))
log('[buffer] status:'+str(status))
#self.torrent.debug()
fullSize = file_status.size / 1024 / 1024 fullSize = file_status.size / 1024 / 1024
downloadedSize = status.total_download / 1024 / 1024 downloadedSize = status.total_download / 1024 / 1024
getDownloadRate = status.download_rate / 1024 * 8 getDownloadRate = status.download_rate / 1024 * 8
@ -320,19 +364,227 @@ class AnteoPlayer(xbmc.Player):
progressBar.close() progressBar.close()
return ready return ready
def stream(self): def setup_nextep(self):
try:
if self.get("url2"):
debug("url2")
self.ids_video = urllib.unquote_plus(self.get("url2")).split(',')
else:
debug("not url2")
self.ids_video = self.get_ids()
except:
pass
if self.__settings__.getSetting('next_dl') == 'true' and self.ids_video:
self.next_dl = True
else:
self.next_dl = False
log('[AnteoPlayer]: nextdl - %s, ids_video - %s' % (str(self.next_dl), str(self.ids_video)))
def setup_play(self):
file_status = self.engine.file_status(self.contentId) file_status = self.engine.file_status(self.contentId)
listitem = xbmcgui.ListItem('xxxx') self.iterator = 0
playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO) url = file_status.url
playlist.clear() label = os.path.basename(file_status.name)
playlist.add(file_status.url, listitem) self.basename = label
xbmc.Player().play(playlist) self.seeding_run = False
while not xbmc.abortRequested and xbmc.Player().isPlaying(): subtitles = None
xbmc.sleep(500) listitem = xbmcgui.ListItem(label, path=url)
xbmc.Player().stop()
if self.next_dl:
next_contentId_index = self.ids_video.index(str(self.contentId)) + 1
if len(self.ids_video) > next_contentId_index:
self.next_contentId = int(self.ids_video[next_contentId_index])
else:
self.next_contentId = False
log('[AnteoPlayer][setup_play]: next_contentId: '+str(self.next_contentId))
if self.subs_dl:
sub_files = self.engine.list(media_types=[MediaType.SUBTITLES])
if sub_files:
log("[AnteoPlayer][setup_play]: Detected subtitles: %s" % str(sub_files[0]))
subtitles = sub_files[0]
try:
seasonId = self.get("seasonId")
self.episodeId = self.get("episodeId") if not self.episodeId else int(self.episodeId) + 1
title = urllib.unquote_plus(self.get("title")) if self.get("title") else None
if self.get("label") and self.episodeId == self.get("episodeId"):
label = urllib.unquote_plus(self.get("label"))
elif seasonId and self.episodeId and title:
label = '%s S%02dE%02d.%s (%s)' % (
title, int(seasonId), int(self.episodeId), self.basename.split('.')[-1], self.basename)
if seasonId and self.episodeId and label and title:
listitem = xbmcgui.ListItem(label, path=url)
listitem.setInfo(type='video', infoLabels={'title': label,
'episode': int(self.episodeId),
'season': int(seasonId),
'tvshowtitle': title})
except:
log('[AnteoPlayer]: Operation INFO failed!')
thumbnail = self.get("thumbnail")
if thumbnail:
listitem.setThumbnailImage(urllib.unquote_plus(thumbnail))
self.display_name = label
player = xbmc.Player()
player.play(url, listitem)
xbmc.sleep(1000)
if subtitles:
player.setSubtitles(subtitles.url)
xbmc.sleep(2000) # very important, do not edit this, podavan
return True
def loop(self):
debug_counter=0
xbmc.sleep(1000)
with closing(
OverlayText(w=OVERLAY_WIDTH, h=OVERLAY_HEIGHT, alignment=XBFONT_CENTER_X | XBFONT_CENTER_Y)) as overlay:
with nested(self.attach(overlay.show, self.on_playback_paused),
self.attach(overlay.hide, self.on_playback_resumed, self.on_playback_stopped)):
while not xbmc.abortRequested and self.isPlaying():
#self.print_fulldebug()
status = self.engine.status()
file_status = self.engine.file_status(self.contentId)
if self.iterator == 100 and debug_counter < 100:
debug_counter += 1
else:
self.print_debug(status)
debug_counter=0
overlay.text = "\n".join(self._get_status_lines(status, file_status))
self.iterator = int(file_status.progress * 100)
xbmc.sleep(1000)
#if not self.seeding_run and self.iterator == 100 and self.seeding:
#self.seeding_run = True
#self.seed(self.contentId)
#self.seeding_status = True
# xbmc.sleep(7000)
def onPlayBackStarted(self):
for f in self.on_playback_started:
f()
log('[onPlayBackStarted]: '+(str(("video", "play", self.display_name))))
def onPlayBackResumed(self):
for f in self.on_playback_resumed:
f()
self.onPlayBackStarted()
def onPlayBackPaused(self):
for f in self.on_playback_paused:
f()
log('[onPlayBackPaused]: '+(str(("video", "pause", self.display_name))))
def onPlayBackStopped(self):
for f in self.on_playback_stopped:
f()
log('[onPlayBackStopped]: '+(str(("video", "stop", self.display_name))))
@contextmanager
def attach(self, callback, *events):
for event in events:
event.append(callback)
yield
for event in events:
event.remove(callback)
def _get_status_lines(self, s, f):
return [
self.display_name,
"%.2f%% %s" % (f.progress * 100, self.localize(STATE_STRS[s.state]).decode('utf-8')),
"D:%.2f%s U:%.2f%s S:%d P:%d" % (s.download_rate * 8, self.localize('kb/s').decode('utf-8'),
s.upload_rate * 8, self.localize('kb/s').decode('utf-8'),
s.num_seeds, s.num_peers)
]
def localize(self, string): def localize(self, string):
try: try:
return Localization.localize(string) return Localization.localize(string)
except: except:
return string return string
def print_debug(self, status=None):
#FileStatus = namedtuple('FileStatus', "name, save_path, url, size, offset, download, progress, index, media_type")
#SessionStatus = namedtuple('SessionStatus', "name, state, state_str, error, progress, download_rate, upload_rate, "
# "total_download, total_upload, num_peers, num_seeds, total_seeds, "
# "total_peers")
#log('[buffer] file_status:'+str(file_status))
#log('[buffer] status:'+str(status))
if not status:
status = self.engine.status()
self.engine.check_torrent_error(status)
log('[AnteoPlayer]: %.2f%% complete (down: %.1f kb/s up: %.1f kb/s peers: %d) %s' % \
(status.progress * 100, status.download_rate * 8,
status.upload_rate * 8, status.num_peers, status.state_str))
def print_fulldebug(self):
status = self.engine.status()
file_status = self.engine.file_status(self.contentId)
log('[buffer] file_status:'+str(file_status))
log('[buffer] status:'+str(status))
def get_ids(self):
contentList = []
for fs in self.engine.list():
contentList.append((fs.name, str(fs.index)))
contentList = sorted(contentList, key=lambda x: x[0])
return get_ids_video(contentList)
class OverlayText(object):
def __init__(self, w, h, *args, **kwargs):
self.window = xbmcgui.Window(WINDOW_FULLSCREEN_VIDEO)
viewport_w, viewport_h = self._get_skin_resolution()
# Adjust size based on viewport, we are using 1080p coordinates
w = int(w * viewport_w / VIEWPORT_WIDTH)
h = int(h * viewport_h / VIEWPORT_HEIGHT)
x = (viewport_w - w) / 2
y = (viewport_h - h) / 2
self._shown = False
self._text = ""
self._label = xbmcgui.ControlLabel(x, y, w, h, self._text, *args, **kwargs)
self._background = xbmcgui.ControlImage(x, y, w, h, os.path.join(RESOURCES_PATH, "images", "black.png"))
self._background.setColorDiffuse("0xD0000000")
def show(self):
if not self._shown:
self.window.addControls([self._background, self._label])
self._shown = True
self._background.setColorDiffuse("0xD0000000")
def hide(self):
if self._shown:
self._shown = False
self.window.removeControls([self._background, self._label])
self._background.setColorDiffuse("0xFF000000")
def close(self):
self.hide()
@property
def text(self):
return self._text
@text.setter
def text(self, text):
self._text = text
if self._shown:
self._label.setLabel(self._text)
# This is so hackish it hurts.
def _get_skin_resolution(self):
import xml.etree.ElementTree as ET
skin_path = xbmc.translatePath("special://skin/")
tree = ET.parse(os.path.join(skin_path, "addon.xml"))
res = tree.findall("./extension/res")[0]
return int(res.attrib["width"]), int(res.attrib["height"])

479
BTClientPlayer.py
View File

@ -1,479 +0,0 @@
# -*- coding: utf-8 -*-
'''
Torrenter v2 plugin for XBMC/Kodi
Copyright (C) 2012-2015 Vadim Skorba v1 - DiMartino v2
http://forum.kodi.tv/showthread.php?tid=214366
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
'''
import os
import urllib
import json
import sys
from contextlib import contextmanager, closing, nested
import xbmc
import xbmcgui
import Downloader
import xbmcgui
import xbmcvfs
import Localization
from platform_pulsar import get_platform
import traceback
from btclient import *
from functions import calculate, showMessage, clearStorage, DownloadDB, get_ids_video, log, debug, is_writable
from argparse import Namespace
from Player import OverlayText
from Libtorrent import Libtorrent
ROOT = sys.modules["__main__"].__root__
RESOURCES_PATH = os.path.join(ROOT, 'resources')
TORRENT2HTTP_TIMEOUT = 20
TORRENT2HTTP_POLL = 1000
PLAYING_EVENT_INTERVAL = 60
MIN_COMPLETED_PIECES = 0.5
WINDOW_FULLSCREEN_VIDEO = 12005
XBFONT_LEFT = 0x00000000
XBFONT_RIGHT = 0x00000001
XBFONT_CENTER_X = 0x00000002
XBFONT_CENTER_Y = 0x00000004
XBFONT_TRUNCATED = 0x00000008
XBFONT_JUSTIFY = 0x00000010
STATE_STRS = [
'Queued',
'Checking',
'Downloading metadata',
'Downloading',
'Finished',
'Seeding',
'Allocating',
'Allocating file & Checking resume'
]
VIEWPORT_WIDTH = 1920.0
VIEWPORT_HEIGHT = 1088.0
OVERLAY_WIDTH = int(VIEWPORT_WIDTH * 0.7) # 70% size
OVERLAY_HEIGHT = 150
ENCRYPTION_SETTINGS = {
"Forced": 0,
"Enabled": 1,
"Disabled": 2,
}
class BTClientPlayer(xbmc.Player):
__plugin__ = sys.modules["__main__"].__plugin__
__settings__ = sys.modules["__main__"].__settings__
ROOT = sys.modules["__main__"].__root__ # .decode('utf-8').encode(sys.getfilesystemencoding())
USERAGENT = "Mozilla/5.0 (Windows NT 6.1; rv:5.0) Gecko/20100101 Firefox/5.0"
torrentFilesDirectory = 'torrents'
debug = __settings__.getSetting('debug') == 'true'
subs_dl = __settings__.getSetting('subs_dl') == 'true'
seeding = __settings__.getSetting('keep_seeding') == 'true' and __settings__.getSetting('keep_files') == '1'
seeding_status = False
seeding_run = False
ids_video = None
episodeId = None
basename = ''
def __init__(self, userStorageDirectory, torrentUrl, params={}):
self.userStorageDirectory = userStorageDirectory
self.torrentUrl = torrentUrl
xbmc.Player.__init__(self)
log("[BTClientPlayer] Initalized")
self.params = params
self.get = self.params.get
self.contentId = int(self.get("url"))
self.platform = get_platform()
self.init()
self.torrent = Downloader.Torrent(self.userStorageDirectory, self.torrentUrl, self.torrentFilesDirectory).player
self.lt=self.torrent.lt
try:
if self.get("url2"):
self.ids_video = urllib.unquote_plus(self.get("url2")).split(',')
else:
self.ids_video = self.get_ids()
except:
pass
args=Namespace(bt_download_limit=self.download_limit,#KB
bt_upload_limit=self.upload_limit,
choose_subtitles=False,
clear_older=0,
debug_log='',#os.path.join(self.userStorageDirectory, 'log.txt'),
delete_on_finish=False,
directory=self.userStorageDirectory,
listen_port_max=6891,#
listen_port_min=6881,
no_resume=False,
player='kodi',
port=5001,
print_pieces=False,
quiet=False,
stdin=False,
stream=True,
subtitles=None,
trace=False,
content_id=self.contentId,
url=self.torrentUrl)
args=main(args) #config
self.free_port = args.port
log('BTClientPlayer: args '+str(args))
self.btclient=self.stream(args, BTClient)
#self.init()
#self.setup_torrent()
#if self.buffer():
# while True:
# if self.setup_play():
# debug('************************************* GOING LOOP')
# #self.torrent.continueSession(self.contentId)
# self.loop()
# else:
# break
# debug('************************************* GO NEXT?')
# if self.next_dl and self.next_dling and isinstance(self.next_contentId, int) and self.iterator == 100:
# self.contentId = self.next_contentId
# continue
# debug('************************************* NO! break')
# break
#self.torrent.stopSession()
#self.torrent.threadComplete = True
#self.torrent.checkThread()
#if '1' != self.__settings__.getSetting("keep_files") and 'Saved Files' not in self.userStorageDirectory:
# xbmc.sleep(1000)
# clearStorage(self.userStorageDirectory)
#else:
# if self.seeding_status:
# showMessage(self.localize('Information'),
# self.localize('Torrent is seeding. To stop it use Download Status.'), forced=True)
# else:
# if self.seeding: self.db_delete()
# showMessage(self.localize('Information'),
# self.localize('Torrent downloading is stopped.'), forced=True)
def on_exit(self):
self.c.close()
sys.exit(0)
def stream(self, args, client_class):
self.c = client_class(args.directory, args=args, lt=self.lt)
try:
while True:
try:
s = socket.socket()
res = s.connect_ex(('127.0.0.1', self.free_port))
if res:
break
finally:
s.close()
self.free_port += 1
self.server = StreamServer(('127.0.0.1', self.free_port), BTFileHandler, allow_range=True,
status_fn=self.c.get_normalized_status)
log('Started http server on port %d' % self.free_port)
self.server.run()
log('Starting btclient - libtorrent version %s' % self.lt.version)
self.c.start_url(args.url)
if self.buffer():
f = self.c._file
self.server.set_file(f)
self.setup_play()
with closing(
OverlayText(w=OVERLAY_WIDTH, h=OVERLAY_HEIGHT, alignment=XBFONT_CENTER_X | XBFONT_CENTER_Y)) as overlay:
with nested(self.attach(overlay.show, self.on_playback_paused),
self.attach(overlay.hide, self.on_playback_resumed, self.on_playback_stopped)):
while True:
if xbmc.abortRequested or not self.isPlaying():
break
status = self.c.status
overlay.text = "\n".join(self._get_status_lines(status))
xbmc.sleep(1000)
log('Play ended')
if self.server:
self.server.stop()
except Exception:
traceback.print_exc()
finally:
self.on_exit()
def init(self):
self.next_dl = True if self.__settings__.getSetting('next_dl') == 'true' and self.ids_video else False
log('[BTClientPlayer]: init next_dl - ' + str(self.next_dl))
self.next_contentId = False
self.display_name = ''
self.downloadedSize = 0
self.dialog = xbmcgui.Dialog()
self.on_playback_started = []
self.on_playback_resumed = []
self.on_playback_paused = []
self.on_playback_stopped = []
self.fullSize = 0
if self.__settings__.getSetting("upload_limit") == "":
self.upload_limit = 0.0
else:
self.upload_limit = float(self.__settings__.getSetting("upload_limit")) / 8 * 1024
if self.__settings__.getSetting("download_limit") == "":
self.download_limit = 0.0
else:
self.download_limit = float(self.__settings__.getSetting("download_limit")) / 8 * 1024
def setup_torrent(self):
pass
#if self.__settings__.getSetting('encryption') == 'true':
# self.torrent.encryptSession()
#self.torrent.startSession()
#if self.subs_dl:
# subs = self.torrent.getSubsIds(os.path.basename(self.torrent.getFilePath(self.contentId)))
# if len(subs) > 0:
# for ind, title in subs:
# self.torrent.continueSession(ind)
def buffer(self):
#iterator = 0
progressBar = xbmcgui.DialogProgress()
progressBar.create(self.localize('Please Wait') + str(' [%s]' % str(self.lt.version)),
self.localize('Seeds searching.'))
while not self.c.is_file_ready: #iterator < 100:#or not self.torrent.is_playble()
status = self.c.get_normalized_status()
iterator = int(status['progress'] * 10000)
if iterator > 99: iterator = 99
if status['state'] in ['queued','checking','checking fastresume'] or (status['progress'] == 0 and status['num_pieces'] > 0):
progressBar.update(iterator, self.localize('Checking preloaded files...'), ' ', ' ')
elif status['state'] == 'downloading':
dialogText = self.localize('Preloaded: ') + str(status['downloaded'] / 1024 / 1024) + ' MB / ' + str(
status['total_size'] / 1024 / 1024) + ' MB'
peersText = ' [%s: %s; %s: %s]' % (
self.localize('Seeds'), str(status['seeds_connected']), self.localize('Peers'),
str(status['peers_connected']),)
speedsText = '%s: %s Mbit/s; %s: %s Mbit/s' % (
self.localize('Downloading'), str(status['download_rate'] * 8 / 1000000),
self.localize('Uploading'), str(status['upload_rate'] * 8 / 1000000))
#if self.debug:
# peersText=peersText + ' ' + self.torrent.get_debug_info('dht_state')
# dialogText=dialogText.replace(self.localize('Preloaded: '),'') + ' ' + self.torrent.get_debug_info('trackers_sum')
progressBar.update(iterator, self.localize('Seeds searching.') + peersText, dialogText,
speedsText)
else:
progressBar.update(iterator, self.localize('UNKNOWN STATUS'), ' ', ' ')
if progressBar.iscanceled():
self.c.close()
break
xbmc.sleep(1000)
progressBar.update(0)
progressBar.close()
return True
def setup_subs(self, label, path):
iterator = 0
subs = self.torrent.getSubsIds(label)
debug('[setup_subs] subs: '+str(subs))
if len(subs) > 0:
showMessage(self.localize('Information'),
self.localize('Downloading and copy subtitles. Please wait.'), forced=True)
for ind, title in subs:
self.torrent.continueSession(ind)
while iterator < 100:
xbmc.sleep(1000)
self.torrent.debug()
status = self.torrent.torrentHandle.status()
iterator = int(status.progress * 100)
# xbmc.sleep(2000)
for ind, title in subs:
folder = title.split(os.sep)[0]
temp = os.path.basename(title)
addition = os.path.dirname(title).lstrip(folder + os.sep).replace(os.sep, '.').replace(' ', '_').strip()
ext = temp.split('.')[-1]
temp = temp[:len(temp) - len(ext) - 1] + '.' + addition + '.' + ext
newFileName = os.path.join(os.path.dirname(path), temp)
debug('[setup_subs]: '+str((os.path.join(os.path.dirname(os.path.dirname(path)),title),newFileName)))
if not xbmcvfs.exists(newFileName):
xbmcvfs.copy(os.path.join(os.path.dirname(os.path.dirname(path)), title), newFileName)
def setup_play(self):
#self.next_dling = False
#self.iterator = 0
path = os.path.join(self.userStorageDirectory, self.c._file.path)
label = os.path.basename(self.c._file.path)
self.basename = label
#self.seeding_run = False
listitem = xbmcgui.ListItem(label)
#if self.subs_dl:
# self.setup_subs(label, path)
try:
seasonId = self.get("seasonId")
self.episodeId = self.get("episodeId") if not self.episodeId else int(self.episodeId) + 1
title = urllib.unquote_plus(self.get("title")) if self.get("title") else None
if self.get("label") and self.episodeId == self.get("episodeId"):
label = urllib.unquote_plus(self.get("label"))
elif seasonId and self.episodeId and title:
label = '%s S%02dE%02d.%s (%s)' % (
title, int(seasonId), int(self.episodeId), self.basename.split('.')[-1], self.basename)
if seasonId and self.episodeId and label and title:
listitem = xbmcgui.ListItem(label)
listitem.setInfo(type='video', infoLabels={'title': label,
'episode': int(self.episodeId),
'season': int(seasonId),
'tvshowtitle': title})
except:
log('[BTClientPlayer] Operation INFO failed!')
thumbnail = self.get("thumbnail")
if thumbnail:
listitem.setThumbnailImage(urllib.unquote_plus(thumbnail))
self.display_name = label
base = 'http://127.0.0.1:' + str(self.free_port) + '/'
url = urlparse.urljoin(base, urllib.quote(self.c._file.path))
# мегакостыль!
rpc = ({'jsonrpc': '2.0', 'method': 'Files.GetDirectory', 'params': {
'media': 'video', 'directory': path}, 'id': 0})
data = json.dumps(rpc)
request = xbmc.executeJSONRPC(data)
response = json.loads(request)
while not response:
xbmc.sleep(100)
if response:
playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)
playlist.clear()
playlist.add(url, listitem)
xbmc.Player().play(playlist)
print "\nServing file on %s" % url
return True
def onPlayBackStarted(self):
for f in self.on_playback_started:
f()
log('[onPlayBackStarted]: '+(str(("video", "play", self.display_name))))
def onPlayBackResumed(self):
for f in self.on_playback_resumed:
f()
self.onPlayBackStarted()
def onPlayBackPaused(self):
for f in self.on_playback_paused:
f()
log('[onPlayBackPaused]: '+(str(("video", "pause", self.display_name))))
def onPlayBackStopped(self):
for f in self.on_playback_stopped:
f()
log('[onPlayBackStopped]: '+(str(("video", "stop", self.display_name))))
@contextmanager
def attach(self, callback, *events):
for event in events:
event.append(callback)
yield
for event in events:
event.remove(callback)
def loop(self):
debug_counter=0
with closing(
OverlayText(w=OVERLAY_WIDTH, h=OVERLAY_HEIGHT, alignment=XBFONT_CENTER_X | XBFONT_CENTER_Y)) as overlay:
with nested(self.attach(overlay.show, self.on_playback_paused),
self.attach(overlay.hide, self.on_playback_resumed, self.on_playback_stopped)):
while not xbmc.abortRequested and self.isPlaying() and not self.torrent.threadComplete:
self.torrent.checkThread()
if self.iterator == 100 and debug_counter < 100:
debug_counter += 1
else:
self.torrent.debug()
debug_counter=0
status = self.torrent.torrentHandle.status()
overlay.text = "\n".join(self._get_status_lines(status))
# downloadedSize = torrent.torrentHandle.file_progress()[contentId]
self.iterator = int(status.progress * 100)
xbmc.sleep(1000)
if self.iterator == 100 and self.next_dl:
next_contentId_index = self.ids_video.index(str(self.contentId)) + 1
if len(self.ids_video) > next_contentId_index:
self.next_contentId = int(self.ids_video[next_contentId_index])
else:
self.next_contentId = False
debug('[loop] next_contentId: '+str(self.next_contentId))
if not self.seeding_run and self.iterator == 100 and self.seeding:
self.seeding_run = True
self.seed(self.contentId)
self.seeding_status = True
# xbmc.sleep(7000)
if self.iterator == 100 and self.next_dl and not self.next_dling and isinstance(self.next_contentId,
int) and self.next_contentId != False:
showMessage(self.localize('Torrent Downloading'),
self.localize('Starting download next episode!'), forced=True)
self.torrent.stopSession()
# xbmc.sleep(1000)
path = self.torrent.getFilePath(self.next_contentId)
self.basename = self.display_name = os.path.basename(path)
self.torrent.continueSession(self.next_contentId)
self.next_dling = True
def _get_status_lines(self, s):
return [
self.display_name.decode('utf-8'),
"%.2f%% %s" % (s.progress * 100, self.localize(STATE_STRS[s.state]).decode('utf-8')),
"D:%.2f%s U:%.2f%s S:%d P:%d" % (s.download_rate / 1024, self.localize('kb/s').decode('utf-8'),
s.upload_rate / 1024, self.localize('kb/s').decode('utf-8'),
s.num_seeds, s.num_peers)
]
def db_delete(self):
if self.basename:
db = DownloadDB()
get = db.get(self.basename)
if get:
db.delete(get[0])
def seed(self, contentId):
self.db_delete()
exec_str = 'XBMC.RunPlugin(%s)' % \
('%s?action=%s&url=%s&storage=%s&ind=%s') % \
(sys.argv[0], 'downloadLibtorrent', urllib.quote_plus(self.torrentUrl),
urllib.quote_plus(self.userStorageDirectory), str(contentId))
xbmc.executebuiltin(exec_str)
def get_ids(self):
contentList = []
for filedict in self.torrent.getContentList():
contentList.append((filedict.get('title'), str(filedict.get('ind'))))
contentList = sorted(contentList, key=lambda x: x[0])
return get_ids_video(contentList)
def localize(self, string):
try:
return Localization.localize(string)
except:
return string

15
Core.py
View File

@ -233,8 +233,8 @@ class Core:
lockView('wide') lockView('wide')
def test(self, params={}): def test(self, params={}):
from Anteoloader import AnteoLoader from Anteoloader import AnteoPlayer
torrentUrl='D:\\ntest.torrent' torrentUrl='D:\\test.torrent'
params['url']='0' params['url']='0'
if not xbmcvfs.exists(torrentUrl): if not xbmcvfs.exists(torrentUrl):
action = xbmcgui.Dialog() action = xbmcgui.Dialog()
@ -244,11 +244,12 @@ class Core:
self.Downloader = Downloader.Torrent(self.userStorageDirectory, torrentUrl) self.Downloader = Downloader.Torrent(self.userStorageDirectory, torrentUrl)
else: else:
print self.__plugin__ + " Unexpected access to method Anteoloader() without torrent content" print self.__plugin__ + " Unexpected access to method Anteoloader() without torrent content"
if self.Downloader: #if self.Downloader:
x=self.Downloader.getContentList() # x=self.Downloader.getContentList()
print str(x) # print str(x)
xbmc.sleep(1000) # xbmc.sleep(1000)
#self.Downloader.__exit__() # self.Downloader.__exit__()
self.Player = AnteoPlayer(userStorageDirectory=self.userStorageDirectory, torrentUrl=torrentUrl, params=params)
def DownloadStatus(self, params={}): def DownloadStatus(self, params={}):
db = DownloadDB() db = DownloadDB()

2
Downloader.py
View File

@ -74,7 +74,7 @@ class Torrent():
return self.player.getPeers() return self.player.getPeers()
def getSeeds(self): def getSeeds(self):
return self.player.getMagnetInfo() return self.player.getSeeds()
def getFileSize(self, contentId=0): def getFileSize(self, contentId=0):
return self.player.getFileSize(contentId) return self.player.getFileSize(contentId)

12
Player.py
View File

@ -205,12 +205,12 @@ class TorrentPlayer(xbmc.Player):
upload_limit = self.__settings__.getSetting("upload_limit") if self.__settings__.getSetting( upload_limit = self.__settings__.getSetting("upload_limit") if self.__settings__.getSetting(
"upload_limit") != "" else 0 "upload_limit") != "" else 0
if 0 < int(upload_limit): if 0 < int(upload_limit):
self.torrent.setUploadLimit(int(upload_limit) * 1000000 / 8) # MBits/second self.torrent.setUploadLimit(int(upload_limit) * 1024 * 1024 / 8) # MBits/second
download_limit = self.__settings__.getSetting("download_limit") if self.__settings__.getSetting( download_limit = self.__settings__.getSetting("download_limit") if self.__settings__.getSetting(
"download_limit") != "" else 0 "download_limit") != "" else 0
if 0 < int(download_limit): if 0 < int(download_limit):
self.torrent.setDownloadLimit( self.torrent.setDownloadLimit(
int(download_limit) * 1000000 / 8) # MBits/second int(download_limit) * 1024 * 1024 / 8) # MBits/second
self.torrent.status = False self.torrent.status = False
self.fullSize = self.torrent.getFileSize(self.contentId) self.fullSize = self.torrent.getFileSize(self.contentId)
Offset = calculate(self.fullSize) Offset = calculate(self.fullSize)
@ -253,8 +253,8 @@ class TorrentPlayer(xbmc.Player):
self.localize('Seeds'), str(self.torrent.getSeeds()), self.localize('Peers'), self.localize('Seeds'), str(self.torrent.getSeeds()), self.localize('Peers'),
str(self.torrent.getPeers()),) str(self.torrent.getPeers()),)
speedsText = '%s: %s Mbit/s; %s: %s Mbit/s' % ( speedsText = '%s: %s Mbit/s; %s: %s Mbit/s' % (
self.localize('Downloading'), str(self.torrent.getDownloadRate() * 8 / 1000000), self.localize('Downloading'), str(self.torrent.getDownloadRate() * 8 / 1024 / 1024),
self.localize('Uploading'), str(self.torrent.getUploadRate() * 8 / 1000000)) self.localize('Uploading'), str(self.torrent.getUploadRate() * 8 / 1024 / 1024))
if self.debug: if self.debug:
peersText=peersText + ' ' + self.torrent.get_debug_info('dht_state') peersText=peersText + ' ' + self.torrent.get_debug_info('dht_state')
dialogText=dialogText.replace(self.localize('Preloaded: '),'') + ' ' + self.torrent.get_debug_info('trackers_sum') dialogText=dialogText.replace(self.localize('Preloaded: '),'') + ' ' + self.torrent.get_debug_info('trackers_sum')
@ -431,8 +431,8 @@ class TorrentPlayer(xbmc.Player):
return [ return [
self.display_name.decode('utf-8')+'; '+self.torrent.get_debug_info('dht_state'), self.display_name.decode('utf-8')+'; '+self.torrent.get_debug_info('dht_state'),
"%.2f%% %s; %s" % (s.progress * 100, self.localize(STATE_STRS[s.state]).decode('utf-8'), self.torrent.get_debug_info('trackers_sum')), "%.2f%% %s; %s" % (s.progress * 100, self.localize(STATE_STRS[s.state]).decode('utf-8'), self.torrent.get_debug_info('trackers_sum')),
"D:%.2f%s U:%.2f%s S:%d P:%d" % (s.download_rate / 1000, self.localize('kb/s').decode('utf-8'), "D:%.2f%s U:%.2f%s S:%d P:%d" % (s.download_rate / 1024, self.localize('kb/s').decode('utf-8'),
s.upload_rate / 1000, self.localize('kb/s').decode('utf-8'), s.upload_rate / 1024, self.localize('kb/s').decode('utf-8'),
s.num_seeds, s.num_peers) s.num_seeds, s.num_peers)
] ]

1
resources/language/English/strings.xml
View File

@ -48,6 +48,7 @@
<string id="30048">None</string> <string id="30048">None</string>
<string id="30049">Anti-zapret</string> <string id="30049">Anti-zapret</string>
<string id="30050">Immunicity</string> <string id="30050">Immunicity</string>
<string id="30051">Max. connections (0 - unlimited)</string>
<string id="30101">Interface</string> <string id="30101">Interface</string>
<string id="30102">P2P Network</string> <string id="30102">P2P Network</string>
<string id="30103">Advanced</string> <string id="30103">Advanced</string>

1
resources/language/Russian/strings.xml
View File

@ -48,6 +48,7 @@
<string id="30048">Не использовать</string> <string id="30048">Не использовать</string>
<string id="30049">Anti-zapret</string> <string id="30049">Anti-zapret</string>
<string id="30050">Immunicity</string> <string id="30050">Immunicity</string>
<string id="30051">Макс. соединений (0 - безлимит)</string>
<string id="30101">Интерфейс</string> <string id="30101">Интерфейс</string>
<string id="30102">P2P Сеть</string> <string id="30102">P2P Сеть</string>
<string id="30103">Дополнительные</string> <string id="30103">Дополнительные</string>

1
resources/settings.xml
View File

@ -26,6 +26,7 @@
<setting id="subs_dl" type="bool" label="30029" default="true" visible="!eq(-8,1)"/> <setting id="subs_dl" type="bool" label="30029" default="true" visible="!eq(-8,1)"/>
<setting id="keep_seeding" type="bool" label="30030" default="false" visible="!eq(-9,1)" enable="eq(-7,1)"/> <setting id="keep_seeding" type="bool" label="30030" default="false" visible="!eq(-9,1)" enable="eq(-7,1)"/>
<setting id="encryption" type="bool" label="30041" default="true" visible="!eq(-10,1)"/> <setting id="encryption" type="bool" label="30041" default="true" visible="!eq(-10,1)"/>
<setting id="connections_limit" type="number" label="30051" default="200" visible="eq(-11,2)"/>
</category> </category>
<category label="Torrent-client"> <category label="Torrent-client">
<setting id="torrent_save" type="enum" label="50301" lvalues="50302|50303" default="0"/> <setting id="torrent_save" type="enum" label="50301" lvalues="50302|50303" default="0"/>