pull/1/head
DiMartinoXBMC 2015-12-19 15:39:19 +03:00
parent 7b7ad016cc
commit 3bcb12f282
3 changed files with 376 additions and 96 deletions

View File

@ -4,6 +4,7 @@
<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="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$/functions.py" afterPath="$PROJECT_DIR$/functions.py" />
</list> </list>
<ignored path="plugin.video.torrenter.iws" /> <ignored path="plugin.video.torrenter.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
@ -37,9 +38,144 @@
<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="1350" column="28" selection-start-line="1350" selection-start-column="28" selection-end-line="1350" selection-end-column="28" /> <caret line="1851" column="12" selection-start-line="1851" selection-start-column="4" selection-end-line="1851" selection-end-column="12" />
<folding> <folding>
<element signature="e#24#832#1" expanded="false" /> <element signature="e#24#832#1" expanded="false" />
<element signature="e#834#848#0" expanded="true" />
<element signature="e#1749#3725#0" expanded="false" />
<element signature="e#3759#3998#0" expanded="false" />
<element signature="e#4022#4274#0" expanded="false" />
<element signature="e#4295#4604#0" expanded="false" />
<element signature="e#4641#5023#0" expanded="false" />
<element signature="e#5092#5317#0" expanded="false" />
<element signature="e#5344#5426#0" expanded="false" />
<element signature="e#5463#5982#0" expanded="false" />
<element signature="e#6006#6272#0" expanded="false" />
<element signature="e#6297#6843#0" expanded="false" />
<element signature="e#6882#7193#0" expanded="false" />
<element signature="e#7219#7315#0" expanded="false" />
<element signature="e#7362#7493#0" expanded="false" />
<element signature="e#7515#7754#0" expanded="false" />
<element signature="e#7777#7816#0" expanded="false" />
<element signature="e#7849#8813#0" expanded="false" />
<element signature="e#8858#9088#0" expanded="false" />
<element signature="e#9121#9706#0" expanded="false" />
<element signature="e#9735#9812#0" expanded="false" />
<element signature="e#9850#9907#0" expanded="false" />
<element signature="e#9935#10297#0" expanded="false" />
<element signature="e#10337#10887#0" expanded="false" />
<element signature="e#10915#12357#0" expanded="false" />
<element signature="e#12379#12475#0" expanded="false" />
<element signature="e#12505#13049#0" expanded="false" />
<element signature="e#13095#14353#0" expanded="false" />
<element signature="e#14378#15171#0" expanded="false" />
<element signature="e#15210#16481#0" expanded="false" />
<element signature="e#16533#17919#0" expanded="false" />
<element signature="e#17971#18047#0" expanded="false" />
<element signature="e#18067#18175#0" expanded="false" />
<element signature="e#18204#19566#0" expanded="false" />
<element signature="e#19614#20572#0" expanded="false" />
<element signature="e#20598#21632#0" expanded="false" />
<element signature="e#21661#21716#0" expanded="false" />
<element signature="e#21745#21879#0" expanded="false" />
<element signature="e#21907#22122#0" expanded="false" />
<element signature="e#22160#22527#0" expanded="false" />
<element signature="e#22563#23453#0" expanded="false" />
<element signature="e#23480#23957#0" expanded="false" />
<element signature="e#23991#25657#0" expanded="false" />
<element signature="e#25681#27217#0" expanded="false" />
<element signature="e#25709#25876#0" expanded="false" />
<element signature="e#25926#26665#0" expanded="false" />
<element signature="e#26700#26986#0" expanded="false" />
<element signature="e#27019#27217#0" expanded="false" />
<element signature="e#27238#29385#0" expanded="false" />
<element signature="e#27279#27694#0" expanded="false" />
<element signature="e#27728#28285#0" expanded="false" />
<element signature="e#28323#28509#0" expanded="false" />
<element signature="e#28542#28802#0" expanded="false" />
<element signature="e#28836#29022#0" expanded="false" />
<element signature="e#29063#29202#0" expanded="false" />
<element signature="e#29236#29313#0" expanded="false" />
<element signature="e#29345#29385#0" expanded="false" />
<element signature="e#29409#34250#0" expanded="false" />
<element signature="e#29450#29506#0" expanded="false" />
<element signature="e#29539#29729#0" expanded="false" />
<element signature="e#29763#29949#0" expanded="false" />
<element signature="e#29997#30300#0" expanded="false" />
<element signature="e#30359#30759#0" expanded="false" />
<element signature="e#30820#31322#0" expanded="false" />
<element signature="e#31356#31869#0" expanded="false" />
<element signature="e#31915#32072#0" expanded="false" />
<element signature="e#32110#32137#0" expanded="false" />
<element signature="e#32177#32204#0" expanded="false" />
<element signature="e#32245#32387#0" expanded="false" />
<element signature="e#32418#32540#0" expanded="false" />
<element signature="e#32574#34178#0" expanded="false" />
<element signature="e#34210#34250#0" expanded="false" />
<element signature="e#34276#38829#0" expanded="false" />
<element signature="e#34304#34308#0" expanded="false" />
<element signature="e#34357#34414#0" expanded="false" />
<element signature="e#34474#34535#0" expanded="false" />
<element signature="e#34576#35949#0" expanded="false" />
<element signature="e#35992#36209#0" expanded="false" />
<element signature="e#36248#36432#0" expanded="false" />
<element signature="e#36468#36676#0" expanded="false" />
<element signature="e#36739#37392#0" expanded="false" />
<element signature="e#37453#37986#0" expanded="false" />
<element signature="e#38032#38646#0" expanded="false" />
<element signature="e#38686#38829#0" expanded="false" />
<element signature="e#38880#41203#0" expanded="false" />
<element signature="e#39652#39656#0" expanded="false" />
<element signature="e#39692#40560#0" expanded="false" />
<element signature="e#41251#41350#0" expanded="false" />
<element signature="e#41377#45518#0" expanded="false" />
<element signature="e#41405#41409#0" expanded="false" />
<element signature="e#41476#44185#0" expanded="false" />
<element signature="e#44234#44291#0" expanded="false" />
<element signature="e#44351#44412#0" expanded="false" />
<element signature="e#44442#44732#0" expanded="false" />
<element signature="e#44761#44872#0" expanded="false" />
<element signature="e#44911#45116#0" expanded="false" />
<element signature="e#45155#45341#0" expanded="false" />
<element signature="e#45377#45518#0" expanded="false" />
<element signature="e#45550#46221#0" expanded="false" />
<element signature="e#46262#46862#0" expanded="false" />
<element signature="e#46896#47012#0" expanded="false" />
<element signature="e#47046#47196#0" expanded="false" />
<element signature="e#47233#47343#0" expanded="false" />
<element signature="e#47386#47767#0" expanded="false" />
<element signature="e#47811#48386#0" expanded="false" />
<element signature="e#48440#49952#0" expanded="false" />
<element signature="e#49977#55835#0" expanded="false" />
<element signature="e#50019#50076#0" expanded="false" />
<element signature="e#50109#50372#0" expanded="false" />
<element signature="e#50408#50694#0" expanded="false" />
<element signature="e#50742#51037#0" expanded="false" />
<element signature="e#51076#51890#0" expanded="false" />
<element signature="e#51933#52127#0" expanded="false" />
<element signature="e#52212#52751#0" expanded="false" />
<element signature="e#52799#53152#0" expanded="false" />
<element signature="e#53208#53379#0" expanded="false" />
<element signature="e#53420#53566#0" expanded="false" />
<element signature="e#53597#53706#0" expanded="false" />
<element signature="e#53740#55763#0" expanded="false" />
<element signature="e#55795#55835#0" expanded="false" />
<element signature="e#55872#56029#0" expanded="false" />
<element signature="e#56067#56205#0" expanded="false" />
<element signature="e#56240#56919#0" expanded="false" />
<element signature="e#56958#57655#0" expanded="false" />
<element signature="e#57697#58391#0" expanded="false" />
<element signature="e#58418#59445#0" expanded="false" />
<element signature="e#59476#60022#0" expanded="false" />
<element signature="e#60049#60228#0" expanded="false" />
<element signature="e#60253#60422#0" expanded="false" />
<element signature="e#60451#60708#0" expanded="false" />
<element signature="e#60736#60975#0" expanded="false" />
<element signature="e#61004#61333#0" expanded="false" />
<element signature="e#61365#62896#0" expanded="false" />
<element signature="e#62940#65977#0" expanded="false" />
<element signature="e#66007#66518#0" expanded="false" />
<element signature="e#66550#66807#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -48,36 +184,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.30470017"> <state vertical-scroll-proportion="0.2771475">
<caret line="206" column="43" selection-start-line="206" selection-start-column="43" selection-end-line="206" selection-end-column="43" /> <caret line="289" column="30" selection-start-line="289" selection-start-column="30" selection-end-line="289" selection-end-column="30" />
<folding> <folding>
<element signature="e#24#785#1" expanded="false" /> <element signature="e#24#785#1" expanded="false" />
<element signature="e#2078#2121#0" expanded="false" /> <element signature="e#788#802#0" expanded="true" />
<element signature="e#3310#3420#0" expanded="false" /> <element signature="e#2088#2131#0" expanded="false" />
<element signature="e#3458#4762#0" expanded="false" /> <element signature="e#3124#3234#0" expanded="false" />
<element signature="e#4804#4899#0" expanded="false" /> <element signature="e#3272#4576#0" expanded="false" />
<element signature="e#4939#5580#0" expanded="false" /> <element signature="e#4618#4713#0" expanded="false" />
<element signature="e#8060#8239#0" expanded="false" /> <element signature="e#4753#5394#0" expanded="false" />
<element signature="e#11550#11660#0" expanded="false" /> <element signature="e#7650#7829#0" expanded="false" />
<element signature="e#18113#18657#0" expanded="false" /> <element signature="e#10916#11026#0" expanded="false" />
<element signature="e#22819#22950#0" expanded="false" /> <element signature="e#17331#17875#0" expanded="false" />
<element signature="e#22993#23076#0" expanded="false" /> <element signature="e#22037#22168#0" expanded="false" />
<element signature="e#23118#23248#0" expanded="false" /> <element signature="e#22211#22294#0" expanded="false" />
<element signature="e#23291#23422#0" expanded="false" /> <element signature="e#22336#22466#0" expanded="false" />
<element signature="e#23493#23626#0" expanded="false" /> <element signature="e#22509#22640#0" expanded="false" />
<element signature="e#23675#24093#0" expanded="false" /> <element signature="e#22711#22844#0" expanded="false" />
<element signature="e#24135#24230#0" expanded="false" /> <element signature="e#22893#23311#0" expanded="false" />
<element signature="e#24280#25134#0" expanded="false" /> <element signature="e#23353#23448#0" expanded="false" />
<element signature="e#25175#25364#0" expanded="false" /> <element signature="e#23498#24352#0" expanded="false" />
<element signature="e#25397#25612#0" expanded="false" /> <element signature="e#24393#24582#0" expanded="false" />
<element signature="e#25645#27361#0" expanded="false" /> <element signature="e#24615#24830#0" expanded="false" />
<element signature="e#25696#26351#0" expanded="false" /> <element signature="e#24863#26579#0" expanded="false" />
<element signature="e#26381#26559#0" expanded="false" /> <element signature="e#24914#25569#0" expanded="false" />
<element signature="e#26589#26767#0" expanded="false" /> <element signature="e#25599#25777#0" expanded="false" />
<element signature="e#26798#26809#0" expanded="false" /> <element signature="e#25807#25985#0" expanded="false" />
<element signature="e#26853#26870#0" expanded="false" /> <element signature="e#26016#26027#0" expanded="false" />
<element signature="e#26923#27015#0" expanded="false" /> <element signature="e#26071#26088#0" expanded="false" />
<element signature="e#27090#27361#0" expanded="false" /> <element signature="e#26141#26233#0" expanded="false" />
<element signature="e#26308#26579#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -167,7 +304,7 @@
<file leaf-file-name="Libtorrent.py" pinned="false" current-in-tab="true"> <file leaf-file-name="Libtorrent.py" pinned="false" current-in-tab="true">
<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.34674922"> <state vertical-scroll-proportion="0.48142415">
<caret line="164" column="20" selection-start-line="164" selection-start-column="20" selection-end-line="164" selection-end-column="20" /> <caret line="164" column="20" selection-start-line="164" selection-start-column="20" selection-end-line="164" selection-end-column="20" />
<folding> <folding>
<element signature="e#24#836#1" expanded="false" /> <element signature="e#24#836#1" expanded="false" />
@ -357,7 +494,6 @@
<option value="$PROJECT_DIR$/resources/contenters/CXZ.py" /> <option value="$PROJECT_DIR$/resources/contenters/CXZ.py" />
<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$/resources/language/Hebrew/strings.xml" /> <option value="$PROJECT_DIR$/resources/language/Hebrew/strings.xml" />
<option value="$PROJECT_DIR$/Downloader.py" /> <option value="$PROJECT_DIR$/Downloader.py" />
<option value="$PROJECT_DIR$/Player.py" /> <option value="$PROJECT_DIR$/Player.py" />
@ -370,6 +506,7 @@
<option value="$PROJECT_DIR$/resources/settings.xml" /> <option value="$PROJECT_DIR$/resources/settings.xml" />
<option value="$PROJECT_DIR$/resources/language/Russian/strings.xml" /> <option value="$PROJECT_DIR$/resources/language/Russian/strings.xml" />
<option value="$PROJECT_DIR$/resources/language/English/strings.xml" /> <option value="$PROJECT_DIR$/resources/language/English/strings.xml" />
<option value="$PROJECT_DIR$/functions.py" />
<option value="$PROJECT_DIR$/Anteoloader.py" /> <option value="$PROJECT_DIR$/Anteoloader.py" />
</list> </list>
</option> </option>
@ -405,6 +542,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
@ -502,7 +640,6 @@
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" /> <pane id="Scope" />
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -684,12 +821,6 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<updated>1420801533300</updated> <updated>1420801533300</updated>
</task> </task>
<task id="LOCAL-00101" summary="settings fix">
<created>1437489171221</created>
<option name="number" value="00101" />
<option name="project" value="LOCAL" />
<updated>1437489171222</updated>
</task>
<task id="LOCAL-00102" summary="fix back"> <task id="LOCAL-00102" summary="fix back">
<created>1437496683560</created> <created>1437496683560</created>
<option name="number" value="00102" /> <option name="number" value="00102" />
@ -978,7 +1109,13 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1450454675383</updated> <updated>1450454675383</updated>
</task> </task>
<option name="localTasksCounter" value="150" /> <task id="LOCAL-00150" summary="file fix">
<created>1450525487060</created>
<option name="number" value="00150" />
<option name="project" value="LOCAL" />
<updated>1450525487061</updated>
</task>
<option name="localTasksCounter" value="151" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
@ -989,7 +1126,7 @@
<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="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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2502781" sideWeight="0.5" order="7" 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.2502781" 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" />
@ -1019,7 +1156,6 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="dht debug remove" />
<MESSAGE value="remove resume_data" /> <MESSAGE value="remove resume_data" />
<MESSAGE value="delete storage fix" /> <MESSAGE value="delete storage fix" />
<MESSAGE value="downloads fix" /> <MESSAGE value="downloads fix" />
@ -1044,7 +1180,8 @@
<MESSAGE value="fix" /> <MESSAGE value="fix" />
<MESSAGE value="subs and loop fix" /> <MESSAGE value="subs and loop fix" />
<MESSAGE value="settings update" /> <MESSAGE value="settings update" />
<option name="LAST_COMMIT_MESSAGE" value="settings update" /> <MESSAGE value="file fix" />
<option name="LAST_COMMIT_MESSAGE" value="file fix" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
@ -1361,16 +1498,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/functions.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="1350" column="28" selection-start-line="1350" selection-start-column="28" selection-end-line="1350" selection-end-column="28" />
<folding>
<element signature="e#24#832#1" expanded="false" />
</folding>
</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.33225283"> <state vertical-scroll-proportion="0.33225283">
@ -1491,7 +1618,7 @@
</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.34674922"> <state vertical-scroll-proportion="0.48142415">
<caret line="164" column="20" selection-start-line="164" selection-start-column="20" selection-end-line="164" selection-end-column="20" /> <caret line="164" column="20" selection-start-line="164" selection-start-column="20" selection-end-line="164" selection-end-column="20" />
<folding> <folding>
<element signature="e#24#836#1" expanded="false" /> <element signature="e#24#836#1" expanded="false" />
@ -1521,38 +1648,184 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/functions.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="1851" column="12" selection-start-line="1851" selection-start-column="4" selection-end-line="1851" selection-end-column="12" />
<folding>
<element signature="e#24#832#1" expanded="false" />
<element signature="e#834#848#0" expanded="true" />
<element signature="e#1749#3725#0" expanded="false" />
<element signature="e#3759#3998#0" expanded="false" />
<element signature="e#4022#4274#0" expanded="false" />
<element signature="e#4295#4604#0" expanded="false" />
<element signature="e#4641#5023#0" expanded="false" />
<element signature="e#5092#5317#0" expanded="false" />
<element signature="e#5344#5426#0" expanded="false" />
<element signature="e#5463#5982#0" expanded="false" />
<element signature="e#6006#6272#0" expanded="false" />
<element signature="e#6297#6843#0" expanded="false" />
<element signature="e#6882#7193#0" expanded="false" />
<element signature="e#7219#7315#0" expanded="false" />
<element signature="e#7362#7493#0" expanded="false" />
<element signature="e#7515#7754#0" expanded="false" />
<element signature="e#7777#7816#0" expanded="false" />
<element signature="e#7849#8813#0" expanded="false" />
<element signature="e#8858#9088#0" expanded="false" />
<element signature="e#9121#9706#0" expanded="false" />
<element signature="e#9735#9812#0" expanded="false" />
<element signature="e#9850#9907#0" expanded="false" />
<element signature="e#9935#10297#0" expanded="false" />
<element signature="e#10337#10887#0" expanded="false" />
<element signature="e#10915#12357#0" expanded="false" />
<element signature="e#12379#12475#0" expanded="false" />
<element signature="e#12505#13049#0" expanded="false" />
<element signature="e#13095#14353#0" expanded="false" />
<element signature="e#14378#15171#0" expanded="false" />
<element signature="e#15210#16481#0" expanded="false" />
<element signature="e#16533#17919#0" expanded="false" />
<element signature="e#17971#18047#0" expanded="false" />
<element signature="e#18067#18175#0" expanded="false" />
<element signature="e#18204#19566#0" expanded="false" />
<element signature="e#19614#20572#0" expanded="false" />
<element signature="e#20598#21632#0" expanded="false" />
<element signature="e#21661#21716#0" expanded="false" />
<element signature="e#21745#21879#0" expanded="false" />
<element signature="e#21907#22122#0" expanded="false" />
<element signature="e#22160#22527#0" expanded="false" />
<element signature="e#22563#23453#0" expanded="false" />
<element signature="e#23480#23957#0" expanded="false" />
<element signature="e#23991#25657#0" expanded="false" />
<element signature="e#25681#27217#0" expanded="false" />
<element signature="e#25709#25876#0" expanded="false" />
<element signature="e#25926#26665#0" expanded="false" />
<element signature="e#26700#26986#0" expanded="false" />
<element signature="e#27019#27217#0" expanded="false" />
<element signature="e#27238#29385#0" expanded="false" />
<element signature="e#27279#27694#0" expanded="false" />
<element signature="e#27728#28285#0" expanded="false" />
<element signature="e#28323#28509#0" expanded="false" />
<element signature="e#28542#28802#0" expanded="false" />
<element signature="e#28836#29022#0" expanded="false" />
<element signature="e#29063#29202#0" expanded="false" />
<element signature="e#29236#29313#0" expanded="false" />
<element signature="e#29345#29385#0" expanded="false" />
<element signature="e#29409#34250#0" expanded="false" />
<element signature="e#29450#29506#0" expanded="false" />
<element signature="e#29539#29729#0" expanded="false" />
<element signature="e#29763#29949#0" expanded="false" />
<element signature="e#29997#30300#0" expanded="false" />
<element signature="e#30359#30759#0" expanded="false" />
<element signature="e#30820#31322#0" expanded="false" />
<element signature="e#31356#31869#0" expanded="false" />
<element signature="e#31915#32072#0" expanded="false" />
<element signature="e#32110#32137#0" expanded="false" />
<element signature="e#32177#32204#0" expanded="false" />
<element signature="e#32245#32387#0" expanded="false" />
<element signature="e#32418#32540#0" expanded="false" />
<element signature="e#32574#34178#0" expanded="false" />
<element signature="e#34210#34250#0" expanded="false" />
<element signature="e#34276#38829#0" expanded="false" />
<element signature="e#34304#34308#0" expanded="false" />
<element signature="e#34357#34414#0" expanded="false" />
<element signature="e#34474#34535#0" expanded="false" />
<element signature="e#34576#35949#0" expanded="false" />
<element signature="e#35992#36209#0" expanded="false" />
<element signature="e#36248#36432#0" expanded="false" />
<element signature="e#36468#36676#0" expanded="false" />
<element signature="e#36739#37392#0" expanded="false" />
<element signature="e#37453#37986#0" expanded="false" />
<element signature="e#38032#38646#0" expanded="false" />
<element signature="e#38686#38829#0" expanded="false" />
<element signature="e#38880#41203#0" expanded="false" />
<element signature="e#39652#39656#0" expanded="false" />
<element signature="e#39692#40560#0" expanded="false" />
<element signature="e#41251#41350#0" expanded="false" />
<element signature="e#41377#45518#0" expanded="false" />
<element signature="e#41405#41409#0" expanded="false" />
<element signature="e#41476#44185#0" expanded="false" />
<element signature="e#44234#44291#0" expanded="false" />
<element signature="e#44351#44412#0" expanded="false" />
<element signature="e#44442#44732#0" expanded="false" />
<element signature="e#44761#44872#0" expanded="false" />
<element signature="e#44911#45116#0" expanded="false" />
<element signature="e#45155#45341#0" expanded="false" />
<element signature="e#45377#45518#0" expanded="false" />
<element signature="e#45550#46221#0" expanded="false" />
<element signature="e#46262#46862#0" expanded="false" />
<element signature="e#46896#47012#0" expanded="false" />
<element signature="e#47046#47196#0" expanded="false" />
<element signature="e#47233#47343#0" expanded="false" />
<element signature="e#47386#47767#0" expanded="false" />
<element signature="e#47811#48386#0" expanded="false" />
<element signature="e#48440#49952#0" expanded="false" />
<element signature="e#49977#55835#0" expanded="false" />
<element signature="e#50019#50076#0" expanded="false" />
<element signature="e#50109#50372#0" expanded="false" />
<element signature="e#50408#50694#0" expanded="false" />
<element signature="e#50742#51037#0" expanded="false" />
<element signature="e#51076#51890#0" expanded="false" />
<element signature="e#51933#52127#0" expanded="false" />
<element signature="e#52212#52751#0" expanded="false" />
<element signature="e#52799#53152#0" expanded="false" />
<element signature="e#53208#53379#0" expanded="false" />
<element signature="e#53420#53566#0" expanded="false" />
<element signature="e#53597#53706#0" expanded="false" />
<element signature="e#53740#55763#0" expanded="false" />
<element signature="e#55795#55835#0" expanded="false" />
<element signature="e#55872#56029#0" expanded="false" />
<element signature="e#56067#56205#0" expanded="false" />
<element signature="e#56240#56919#0" expanded="false" />
<element signature="e#56958#57655#0" expanded="false" />
<element signature="e#57697#58391#0" expanded="false" />
<element signature="e#58418#59445#0" expanded="false" />
<element signature="e#59476#60022#0" expanded="false" />
<element signature="e#60049#60228#0" expanded="false" />
<element signature="e#60253#60422#0" expanded="false" />
<element signature="e#60451#60708#0" expanded="false" />
<element signature="e#60736#60975#0" expanded="false" />
<element signature="e#61004#61333#0" expanded="false" />
<element signature="e#61365#62896#0" expanded="false" />
<element signature="e#62940#65977#0" expanded="false" />
<element signature="e#66007#66518#0" expanded="false" />
<element signature="e#66550#66807#0" expanded="false" />
</folding>
</state>
</provider>
</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.30470017"> <state vertical-scroll-proportion="0.2771475">
<caret line="206" column="43" selection-start-line="206" selection-start-column="43" selection-end-line="206" selection-end-column="43" /> <caret line="289" column="30" selection-start-line="289" selection-start-column="30" selection-end-line="289" selection-end-column="30" />
<folding> <folding>
<element signature="e#24#785#1" expanded="false" /> <element signature="e#24#785#1" expanded="false" />
<element signature="e#2078#2121#0" expanded="false" /> <element signature="e#788#802#0" expanded="true" />
<element signature="e#3310#3420#0" expanded="false" /> <element signature="e#2088#2131#0" expanded="false" />
<element signature="e#3458#4762#0" expanded="false" /> <element signature="e#3124#3234#0" expanded="false" />
<element signature="e#4804#4899#0" expanded="false" /> <element signature="e#3272#4576#0" expanded="false" />
<element signature="e#4939#5580#0" expanded="false" /> <element signature="e#4618#4713#0" expanded="false" />
<element signature="e#8060#8239#0" expanded="false" /> <element signature="e#4753#5394#0" expanded="false" />
<element signature="e#11550#11660#0" expanded="false" /> <element signature="e#7650#7829#0" expanded="false" />
<element signature="e#18113#18657#0" expanded="false" /> <element signature="e#10916#11026#0" expanded="false" />
<element signature="e#22819#22950#0" expanded="false" /> <element signature="e#17331#17875#0" expanded="false" />
<element signature="e#22993#23076#0" expanded="false" /> <element signature="e#22037#22168#0" expanded="false" />
<element signature="e#23118#23248#0" expanded="false" /> <element signature="e#22211#22294#0" expanded="false" />
<element signature="e#23291#23422#0" expanded="false" /> <element signature="e#22336#22466#0" expanded="false" />
<element signature="e#23493#23626#0" expanded="false" /> <element signature="e#22509#22640#0" expanded="false" />
<element signature="e#23675#24093#0" expanded="false" /> <element signature="e#22711#22844#0" expanded="false" />
<element signature="e#24135#24230#0" expanded="false" /> <element signature="e#22893#23311#0" expanded="false" />
<element signature="e#24280#25134#0" expanded="false" /> <element signature="e#23353#23448#0" expanded="false" />
<element signature="e#25175#25364#0" expanded="false" /> <element signature="e#23498#24352#0" expanded="false" />
<element signature="e#25397#25612#0" expanded="false" /> <element signature="e#24393#24582#0" expanded="false" />
<element signature="e#25645#27361#0" expanded="false" /> <element signature="e#24615#24830#0" expanded="false" />
<element signature="e#25696#26351#0" expanded="false" /> <element signature="e#24863#26579#0" expanded="false" />
<element signature="e#26381#26559#0" expanded="false" /> <element signature="e#24914#25569#0" expanded="false" />
<element signature="e#26589#26767#0" expanded="false" /> <element signature="e#25599#25777#0" expanded="false" />
<element signature="e#26798#26809#0" expanded="false" /> <element signature="e#25807#25985#0" expanded="false" />
<element signature="e#26853#26870#0" expanded="false" /> <element signature="e#26016#26027#0" expanded="false" />
<element signature="e#26923#27015#0" expanded="false" /> <element signature="e#26071#26088#0" expanded="false" />
<element signature="e#27090#27361#0" expanded="false" /> <element signature="e#26141#26233#0" expanded="false" />
<element signature="e#26308#26579#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>

View File

@ -28,7 +28,7 @@ import xbmc
import xbmcgui import xbmcgui
import xbmcvfs import xbmcvfs
import Localization import Localization
from functions import file_encode, isSubtitle, DownloadDB, log, debug, is_writable, unquote from functions import file_encode, isSubtitle, DownloadDB, log, debug, is_writable, unquote, file_url
import os import os
@ -102,12 +102,10 @@ class AnteoLoader:
sys.exit(1) sys.exit(1)
#pre settings #pre settings
if os.path.exists(torrentFile) and xbmc.getCondVisibility("system.platform.windows") and not re.match("^file\:.+$", torrentFile): if os.path.exists(torrentFile):
self.torrentFile = "file:///"+torrentFile.replace('\\','//').replace('////','//') self.torrentFile = file_url(torrentFile)
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__')
@ -204,10 +202,8 @@ class AnteoLoader:
if not xbmcvfs.exists(self.torrentFilesPath): xbmcvfs.mkdirs(self.torrentFilesPath) if not xbmcvfs.exists(self.torrentFilesPath): xbmcvfs.mkdirs(self.torrentFilesPath)
torrentFile = os.path.join(self.torrentFilesPath, self.md5(torrentUrl) + '.torrent') torrentFile = os.path.join(self.torrentFilesPath, self.md5(torrentUrl) + '.torrent')
xbmcvfs.copy(torrentUrl, torrentFile) xbmcvfs.copy(torrentUrl, torrentFile)
if xbmcvfs.exists(torrentFile) and xbmc.getCondVisibility("system.platform.windows") and not re.match("^file\:.+$", torrentFile): if xbmcvfs.exists(torrentFile):
self.torrentFile = "file:///"+torrentFile.replace('\\','//').replace('////','//') self.torrentFile = file_url(torrentFile)
elif xbmcvfs.exists(torrentFile):
self.torrentFile = torrentFile
return self.torrentFile return self.torrentFile
def md5(self, string): def md5(self, string):
@ -222,10 +218,7 @@ class AnteoLoader:
from Libtorrent import Libtorrent from Libtorrent import Libtorrent
torrent = Libtorrent(self.storageDirectory, self.magnetLink) torrent = Libtorrent(self.storageDirectory, self.magnetLink)
torrent.magnetToTorrent(self.magnetLink) torrent.magnetToTorrent(self.magnetLink)
if xbmc.getCondVisibility("system.platform.windows") and not re.match("^file\:.+$", torrent.torrentFile): self.torrentFile = file_url(torrent.torrentFile)
self.torrentFile = "file:///"+torrent.torrentFile.replace('\\','//').replace('////','//')
else:
self.torrentFile = torrent.torrentFile
class AnteoPlayer(xbmc.Player): class AnteoPlayer(xbmc.Player):
__plugin__ = sys.modules["__main__"].__plugin__ __plugin__ = sys.modules["__main__"].__plugin__
@ -301,8 +294,8 @@ class AnteoPlayer(xbmc.Player):
self.on_playback_resumed = [] self.on_playback_resumed = []
self.on_playback_paused = [] self.on_playback_paused = []
self.on_playback_stopped = [] self.on_playback_stopped = []
if xbmcvfs.exists(self.torrentUrl) and xbmc.getCondVisibility("system.platform.windows") and not re.match("^file\:.+$", self.torrentUrl): if os.path.exists(self.torrentUrl):
self.torrentUrl = "file:///"+str(self.torrentUrl).replace('\\','//').replace('////','//') self.torrentUrl = file_url(self.torrentUrl)
def setup_engine(self): def setup_engine(self):
#uri=None, binaries_path=None, platform=None, download_path=".", #uri=None, binaries_path=None, platform=None, download_path=".",

View File

@ -1841,3 +1841,17 @@ def check_download_dir():
dialog.ok(Localization.localize('Torrenter'), dialog.ok(Localization.localize('Torrenter'),
Localization.localize('Please specify storage folder in Settings!')) Localization.localize('Please specify storage folder in Settings!'))
__settings__.openSettings() __settings__.openSettings()
def ensure_str(string, encoding='utf-8'):
if isinstance(string, unicode):
string = string.encode(encoding)
if not isinstance(string, str):
string = str(string)
return string
def file_url(torrentFile):
import urlparse
if not re.match("^file\:.+$", torrentFile):
torrentFile = urlparse.urljoin('file:', urllib.pathname2url(ensure_str(torrentFile)))
return torrentFile