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

sort

pull/1/head
DiMartinoXBMC 2015-01-28 22:53:45 +03:00
parent a0dc695015
commit 720d945133
13 changed files with 590 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

762
.idea/workspace.xml
View File

@ -1,7 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment="myshows fix"> <list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/CXZ.py" afterPath="$PROJECT_DIR$/resources/contenters/CXZ.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Content.py" afterPath="$PROJECT_DIR$/Content.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Core.py" afterPath="$PROJECT_DIR$/Core.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/EZTV.py" afterPath="$PROJECT_DIR$/resources/contenters/EZTV.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/FastTorrent.py" afterPath="$PROJECT_DIR$/resources/contenters/FastTorrent.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/IMDB.py" afterPath="$PROJECT_DIR$/resources/contenters/IMDB.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/KickAssSo.py" afterPath="$PROJECT_DIR$/resources/contenters/KickAssSo.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/KinoPoisk.py" afterPath="$PROJECT_DIR$/resources/contenters/KinoPoisk.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Localization.py" afterPath="$PROJECT_DIR$/Localization.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/RiperAM.py" afterPath="$PROJECT_DIR$/resources/contenters/RiperAM.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/changelog.txt" afterPath="$PROJECT_DIR$/changelog.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/functions.py" afterPath="$PROJECT_DIR$/functions.py" />
<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" />
</list> </list>
<ignored path="plugin.video.torrenter.iws" /> <ignored path="plugin.video.torrenter.iws" />
@ -33,11 +45,11 @@
<splitter split-orientation="horizontal" split-proportion="0.5"> <splitter split-orientation="horizontal" split-proportion="0.5">
<split-first> <split-first>
<leaf> <leaf>
<file leaf-file-name="Core.py" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="Core.py" pinned="false" current="false" current-in-tab="false">
<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.4180328" vertical-offset="2193" max-vertical-offset="3502"> <state vertical-scroll-proportion="-15.428572" vertical-offset="1064" max-vertical-offset="4658">
<caret line="1535" column="68" selection-start-line="1535" selection-start-column="68" selection-end-line="1535" selection-end-column="68" /> <caret line="665" column="11" selection-start-line="665" selection-start-column="11" selection-end-line="665" selection-end-column="23" />
<folding> <folding>
<element signature="e#24#781#1" expanded="false" /> <element signature="e#24#781#1" expanded="false" />
<element signature="e#2318#2615#0" expanded="false" /> <element signature="e#2318#2615#0" expanded="false" />
@ -49,76 +61,65 @@
<element signature="e#30677#31904#0" expanded="false" /> <element signature="e#30677#31904#0" expanded="false" />
<element signature="e#32004#36358#0" expanded="false" /> <element signature="e#32004#36358#0" expanded="false" />
<element signature="e#36406#38470#0" expanded="false" /> <element signature="e#36406#38470#0" expanded="false" />
<element signature="e#38512#39500#0" expanded="false" /> <element signature="e#45082#51439#0" expanded="false" />
<element signature="e#39550#44164#0" expanded="false" /> <element signature="e#53607#55566#0" expanded="false" />
<element signature="e#44229#50582#0" expanded="false" /> <element signature="e#55723#56975#0" expanded="false" />
<element signature="e#50630#51365#0" expanded="false" /> <element signature="e#57031#57448#0" expanded="false" />
<element signature="e#51429#53484#0" expanded="false" /> <element signature="e#57490#57599#0" expanded="false" />
<element signature="e#53533#55492#0" expanded="false" /> <element signature="e#57642#57762#0" expanded="false" />
<element signature="e#55649#56901#0" expanded="false" /> <element signature="e#57812#57963#0" expanded="false" />
<element signature="e#56957#57374#0" expanded="false" /> <element signature="e#58016#65770#0" expanded="false" />
<element signature="e#57416#57525#0" expanded="false" /> <element signature="e#65819#65858#0" expanded="false" />
<element signature="e#57568#57688#0" expanded="false" /> <element signature="e#65907#66697#0" expanded="false" />
<element signature="e#57738#57889#0" expanded="false" /> <element signature="e#66747#69547#0" expanded="false" />
<element signature="e#57942#65696#0" expanded="false" /> <element signature="e#69592#70341#0" expanded="false" />
<element signature="e#65745#65784#0" expanded="false" /> <element signature="e#70389#71885#0" expanded="false" />
<element signature="e#65833#66623#0" expanded="false" /> <element signature="e#71930#72803#0" expanded="false" />
<element signature="e#66673#69473#0" expanded="false" /> <element signature="e#72851#78920#0" expanded="false" />
<element signature="e#69518#70267#0" expanded="false" /> <element signature="e#78968#80752#0" expanded="false" />
<element signature="e#70315#71811#0" expanded="false" /> <element signature="e#80802#80898#0" expanded="false" />
<element signature="e#71856#72729#0" expanded="false" /> <element signature="e#80961#81488#0" expanded="false" />
<element signature="e#72777#78846#0" expanded="false" /> <element signature="e#81549#86761#0" expanded="false" />
<element signature="e#78894#80678#0" expanded="false" /> <element signature="e#86805#86862#0" expanded="false" />
<element signature="e#80728#80824#0" expanded="false" /> <element signature="e#86916#90265#0" expanded="false" />
<element signature="e#80887#81414#0" expanded="false" /> <element signature="e#90320#92251#0" expanded="false" />
<element signature="e#86731#86788#0" expanded="false" /> <element signature="e#92317#92937#0" expanded="false" />
<element signature="e#86842#90191#0" expanded="false" /> <element signature="e#92980#93651#0" expanded="false" />
<element signature="e#90246#92177#0" expanded="false" /> <element signature="e#93687#94476#0" expanded="false" />
<element signature="e#92243#92863#0" expanded="false" /> <element signature="e#94518#94613#0" expanded="false" />
<element signature="e#92906#93577#0" expanded="false" /> <element signature="e#94663#94811#0" expanded="false" />
<element signature="e#93613#94402#0" expanded="false" />
<element signature="e#94444#94539#0" expanded="false" />
<element signature="e#94589#94737#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Player.py" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="Content.py" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Player.py"> <entry file="file://$PROJECT_DIR$/Content.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="6545" max-vertical-offset="7089"> <state vertical-scroll-proportion="0.34931508" vertical-offset="1751" max-vertical-offset="4335">
<caret line="385" column="0" selection-start-line="385" selection-start-column="0" selection-end-line="385" selection-end-column="0" /> <caret line="124" column="0" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="addon.xml" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="KickAssSo.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/addon.xml"> <entry file="file://$PROJECT_DIR$/resources/contenters/KickAssSo.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510"> <state vertical-scroll-proportion="-2.877193" vertical-offset="1077" max-vertical-offset="1921">
<caret line="10" column="43" selection-start-line="10" selection-start-column="43" selection-end-line="10" selection-end-column="43" /> <caret line="73" column="0" selection-start-line="73" selection-start-column="0" selection-end-line="73" selection-end-column="0" />
<folding /> <folding>
<element signature="e#782#791#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="changelog.txt" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="Localization.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/changelog.txt"> <entry file="file://$PROJECT_DIR$/Localization.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1173"> <state vertical-scroll-proportion="-9.928572" vertical-offset="3581" max-vertical-offset="4148">
<caret line="2" column="27" selection-start-line="2" selection-start-column="27" selection-end-line="2" selection-end-column="27" /> <caret line="227" column="13" selection-start-line="227" selection-start-column="9" selection-end-line="227" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="strings.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/language/Russian/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="629" max-vertical-offset="1105">
<caret line="37" column="48" selection-start-line="37" selection-start-column="48" selection-end-line="37" selection-end-column="48" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -138,7 +139,7 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Libtorrent.py" pinned="false" current="false" current-in-tab="true"> <file leaf-file-name="Libtorrent.py" pinned="false" current="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" vertical-offset="4471" max-vertical-offset="6732"> <state vertical-scroll-proportion="0.0" vertical-offset="4471" max-vertical-offset="6732">
@ -148,12 +149,118 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="net.py" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="functions.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/functions.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="25825" max-vertical-offset="26503">
<caret line="1548" column="0" selection-start-line="1548" selection-start-column="0" selection-end-line="1548" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="net.py" pinned="false" current="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/utorrent/net.py"> <entry file="file://$PROJECT_DIR$/resources/utorrent/net.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="15487" max-vertical-offset="22848"> <state vertical-scroll-proportion="1.0112" vertical-offset="116" max-vertical-offset="969">
<caret line="911" column="20" selection-start-line="911" selection-start-column="20" selection-end-line="911" selection-end-column="20" /> <caret line="853" column="13" selection-start-line="853" selection-start-column="13" selection-end-line="853" selection-end-column="13" />
<folding /> <folding>
<element signature="e#1035#8981#0" expanded="false" />
<element signature="e#1063#1400#0" expanded="false" />
<element signature="e#1451#2546#0" expanded="false" />
<element signature="e#2581#3672#0" expanded="false" />
<element signature="e#3705#5438#0" expanded="false" />
<element signature="e#5474#6446#0" expanded="false" />
<element signature="e#6496#7776#0" expanded="false" />
<element signature="e#7816#8114#0" expanded="false" />
<element signature="e#8168#8506#0" expanded="false" />
<element signature="e#8544#8981#0" expanded="false" />
<element signature="e#9007#10161#0" expanded="false" />
<element signature="e#9351#10026#0" expanded="false" />
<element signature="e#10060#10161#0" expanded="false" />
<element signature="e#10188#10687#0" expanded="false" />
<element signature="e#10225#10410#0" expanded="false" />
<element signature="e#10444#10687#0" expanded="false" />
<element signature="e#10710#18412#0" expanded="false" />
<element signature="e#10775#11132#0" expanded="false" />
<element signature="e#11166#11736#0" expanded="false" />
<element signature="e#11766#12548#0" expanded="false" />
<element signature="e#12587#13184#0" expanded="false" />
<element signature="e#13224#13571#0" expanded="false" />
<element signature="e#13618#13922#0" expanded="false" />
<element signature="e#13973#14140#0" expanded="false" />
<element signature="e#14182#14503#0" expanded="false" />
<element signature="e#14558#14727#0" expanded="false" />
<element signature="e#14779#14860#0" expanded="false" />
<element signature="e#14896#14900#0" expanded="false" />
<element signature="e#14950#15522#0" expanded="false" />
<element signature="e#15573#15663#0" expanded="false" />
<element signature="e#15698#16224#0" expanded="false" />
<element signature="e#16278#16860#0" expanded="false" />
<element signature="e#16918#18412#0" expanded="false" />
<element signature="e#16918#17225#1" expanded="false" />
<element signature="e#18439#28666#0" expanded="false" />
<element signature="e#18499#18828#0" expanded="false" />
<element signature="e#18858#21531#0" expanded="false" />
<element signature="e#21565#21797#0" expanded="false" />
<element signature="e#21836#23117#0" expanded="false" />
<element signature="e#23164#23361#0" expanded="false" />
<element signature="e#23412#23567#0" expanded="false" />
<element signature="e#23603#23607#0" expanded="false" />
<element signature="e#23649#24386#0" expanded="false" />
<element signature="e#24441#24935#0" expanded="false" />
<element signature="e#24987#25522#0" expanded="false" />
<element signature="e#25563#27337#0" expanded="false" />
<element signature="e#27388#27914#0" expanded="false" />
<element signature="e#27948#28178#0" expanded="false" />
<element signature="e#28220#28368#0" expanded="false" />
<element signature="e#28410#28666#0" expanded="false" />
<element signature="e#28687#36366#0" expanded="false" />
<element signature="e#28747#28943#0" expanded="false" />
<element signature="e#28977#29093#0" expanded="false" />
<element signature="e#29123#30370#0" expanded="false" />
<element signature="e#30404#30655#0" expanded="false" />
<element signature="e#30694#31685#0" expanded="false" />
<element signature="e#31723#31872#0" expanded="false" />
<element signature="e#31919#32220#0" expanded="false" />
<element signature="e#32271#32671#0" expanded="false" />
<element signature="e#32707#32711#0" expanded="false" />
<element signature="e#32753#33139#0" expanded="false" />
<element signature="e#33194#33566#0" expanded="false" />
<element signature="e#33618#34013#0" expanded="false" />
<element signature="e#34054#34785#0" expanded="false" />
<element signature="e#34836#35261#0" expanded="false" />
<element signature="e#35295#36022#0" expanded="false" />
<element signature="e#36064#36366#0" expanded="false" />
<element signature="e#36385#41888#0" expanded="false" />
<element signature="e#36445#36813#0" expanded="false" />
<element signature="e#36844#38407#0" expanded="false" />
<element signature="e#38441#38473#0" expanded="false" />
<element signature="e#38512#39399#0" expanded="false" />
<element signature="e#39446#39630#0" expanded="false" />
<element signature="e#39682#39781#0" expanded="false" />
<element signature="e#39817#39821#0" expanded="false" />
<element signature="e#39863#40299#0" expanded="false" />
<element signature="e#40354#40608#0" expanded="false" />
<element signature="e#40684#41073#0" expanded="false" />
<element signature="e#41125#41206#0" expanded="false" />
<element signature="e#41257#41629#0" expanded="false" />
<element signature="e#41673#41888#0" expanded="false" />
<element signature="e#41913#45363#0" expanded="false" />
<element signature="e#41941#41954#0" expanded="false" />
<element signature="e#41986#42550#0" expanded="false" />
<element signature="e#42594#44487#0" expanded="false" />
<element signature="e#44534#44574#0" expanded="false" />
<element signature="e#44625#44669#0" expanded="false" />
<element signature="e#44699#44724#0" expanded="false" />
<element signature="e#44758#44787#0" expanded="false" />
<element signature="e#44826#44858#0" expanded="false" />
<element signature="e#44894#44923#0" expanded="false" />
<element signature="e#44965#45000#0" expanded="false" />
<element signature="e#45055#45161#0" expanded="false" />
<element signature="e#45218#45268#0" expanded="false" />
<element signature="e#45319#45363#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -185,29 +292,33 @@
<list> <list>
<option value="$PROJECT_DIR$/resources/searchers/ExtraTorrent.py" /> <option value="$PROJECT_DIR$/resources/searchers/ExtraTorrent.py" />
<option value="$PROJECT_DIR$/README.txt" /> <option value="$PROJECT_DIR$/README.txt" />
<option value="$PROJECT_DIR$/resources/contenters/KinoPoisk.py" />
<option value="$PROJECT_DIR$/controlcenter.py" /> <option value="$PROJECT_DIR$/controlcenter.py" />
<option value="$PROJECT_DIR$/resources/searchers/NNMClubRu.py" /> <option value="$PROJECT_DIR$/resources/searchers/NNMClubRu.py" />
<option value="$PROJECT_DIR$/Downloader.py" /> <option value="$PROJECT_DIR$/Downloader.py" />
<option value="$PROJECT_DIR$/resources/searchers/KickAssSo.py" /> <option value="$PROJECT_DIR$/resources/searchers/KickAssSo.py" />
<option value="$PROJECT_DIR$/resources/language/Russian/strings.xml" /> <option value="$PROJECT_DIR$/resources/language/Russian/strings.xml" />
<option value="$PROJECT_DIR$/Content.py" />
<option value="$PROJECT_DIR$/resources/contenters/KickAssSo.py" />
<option value="$PROJECT_DIR$/resources/language/English/strings.xml" /> <option value="$PROJECT_DIR$/resources/language/English/strings.xml" />
<option value="$PROJECT_DIR$/resources/settings.xml" /> <option value="$PROJECT_DIR$/resources/settings.xml" />
<option value="$PROJECT_DIR$/resources/searchers/T411FR.py" /> <option value="$PROJECT_DIR$/resources/searchers/T411FR.py" />
<option value="$PROJECT_DIR$/changelog.txt" />
<option value="$PROJECT_DIR$/resources/contenters/EZTV.py" />
<option value="$PROJECT_DIR$/resources/searchers/EZTV.py" /> <option value="$PROJECT_DIR$/resources/searchers/EZTV.py" />
<option value="$PROJECT_DIR$/cal.py" /> <option value="$PROJECT_DIR$/cal.py" />
<option value="$PROJECT_DIR$/functions.py" />
<option value="$PROJECT_DIR$/Localization.py" />
<option value="$PROJECT_DIR$/AceStream.py" /> <option value="$PROJECT_DIR$/AceStream.py" />
<option value="$PROJECT_DIR$/addon.xml" /> <option value="$PROJECT_DIR$/addon.xml" />
<option value="$PROJECT_DIR$/resources/utorrent/net.py" /> <option value="$PROJECT_DIR$/resources/utorrent/net.py" />
<option value="$PROJECT_DIR$/Libtorrent.py" /> <option value="$PROJECT_DIR$/Libtorrent.py" />
<option value="$PROJECT_DIR$/Player.py" /> <option value="$PROJECT_DIR$/Player.py" />
<option value="$PROJECT_DIR$/changelog.txt" />
<option value="$PROJECT_DIR$/functions.py" />
<option value="$PROJECT_DIR$/Localization.py" />
<option value="$PROJECT_DIR$/resources/contenters/CXZ.py" />
<option value="$PROJECT_DIR$/resources/contenters/KickAssSo.py" />
<option value="$PROJECT_DIR$/resources/contenters/IMDB.py" />
<option value="$PROJECT_DIR$/resources/contenters/FastTorrent.py" />
<option value="$PROJECT_DIR$/resources/contenters/EZTV.py" />
<option value="$PROJECT_DIR$/resources/contenters/KinoPoisk.py" />
<option value="$PROJECT_DIR$/resources/contenters/RiperAM.py" />
<option value="$PROJECT_DIR$/Core.py" /> <option value="$PROJECT_DIR$/Core.py" />
<option value="$PROJECT_DIR$/Content.py" />
</list> </list>
</option> </option>
</component> </component>
@ -261,38 +372,6 @@
<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> </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>
<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="utorrent" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" /> <pane id="Scope" />
@ -604,7 +683,11 @@
<created>1422468121503</created> <created>1422468121503</created>
<updated>1422468121503</updated> <updated>1422468121503</updated>
</task> </task>
<option name="localTasksCounter" value="33" /> <task id="LOCAL-00033" summary="myshows fix">
<created>1422468152950</created>
<updated>1422468152950</updated>
</task>
<option name="localTasksCounter" value="34" />
<servers /> <servers />
</component> </component>
<component name="TodoView" selected-index="0"> <component name="TodoView" selected-index="0">
@ -631,24 +714,24 @@
<frame x="1" y="1" width="1918" height="1038" extended-state="0" /> <frame x="1" y="1" width="1918" height="1038" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2587968" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26106697" 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" weight="0.3288889" 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" weight="0.3288889" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3291714" 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" weight="0.4" sideWeight="0.5" order="3" 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" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32925472" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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" weight="0.32925472" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13085106" 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" weight="0.13240042" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2497309" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" 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" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.21366595" 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" weight="0.21366595" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32925472" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" 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" 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" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
</layout> </layout>
</component> </component>
<component name="Vcs.Log.UiProperties"> <component name="Vcs.Log.UiProperties">
@ -699,36 +782,6 @@
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Player.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2176" max-vertical-offset="6375">
<caret line="128" column="38" selection-start-line="128" selection-start-column="38" selection-end-line="128" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cal.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="187" max-vertical-offset="289">
<caret line="11" column="93" selection-start-line="11" selection-start-column="93" selection-end-line="11" selection-end-column="93" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/addon.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="17" max-vertical-offset="510">
<caret line="1" column="66" selection-start-line="1" selection-start-column="66" selection-end-line="1" selection-end-column="66" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/changelog.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="204" max-vertical-offset="833">
<caret line="12" column="12" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Localization.py"> <entry file="file://$PROJECT_DIR$/Localization.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2779" max-vertical-offset="3638"> <state vertical-scroll-proportion="0.0" vertical-offset="2779" max-vertical-offset="3638">
@ -751,36 +804,33 @@
<element signature="e#30677#31904#0" expanded="false" /> <element signature="e#30677#31904#0" expanded="false" />
<element signature="e#32004#36358#0" expanded="false" /> <element signature="e#32004#36358#0" expanded="false" />
<element signature="e#36406#38470#0" expanded="false" /> <element signature="e#36406#38470#0" expanded="false" />
<element signature="e#38512#39500#0" expanded="false" /> <element signature="e#45082#51439#0" expanded="false" />
<element signature="e#39550#44164#0" expanded="false" /> <element signature="e#53607#55566#0" expanded="false" />
<element signature="e#44229#50582#0" expanded="false" /> <element signature="e#55723#56975#0" expanded="false" />
<element signature="e#50630#51365#0" expanded="false" /> <element signature="e#57031#57448#0" expanded="false" />
<element signature="e#51429#53484#0" expanded="false" /> <element signature="e#57490#57599#0" expanded="false" />
<element signature="e#53533#55492#0" expanded="false" /> <element signature="e#57642#57762#0" expanded="false" />
<element signature="e#55649#56901#0" expanded="false" /> <element signature="e#57812#57963#0" expanded="false" />
<element signature="e#56957#57374#0" expanded="false" /> <element signature="e#58016#65770#0" expanded="false" />
<element signature="e#57416#57525#0" expanded="false" /> <element signature="e#65819#65858#0" expanded="false" />
<element signature="e#57568#57688#0" expanded="false" /> <element signature="e#65907#66697#0" expanded="false" />
<element signature="e#57738#57889#0" expanded="false" /> <element signature="e#66747#69547#0" expanded="false" />
<element signature="e#57942#65696#0" expanded="false" /> <element signature="e#69592#70341#0" expanded="false" />
<element signature="e#65745#65784#0" expanded="false" /> <element signature="e#70389#71885#0" expanded="false" />
<element signature="e#65833#66623#0" expanded="false" /> <element signature="e#71930#72803#0" expanded="false" />
<element signature="e#66673#69473#0" expanded="false" /> <element signature="e#72851#78920#0" expanded="false" />
<element signature="e#69518#70267#0" expanded="false" /> <element signature="e#78968#80752#0" expanded="false" />
<element signature="e#70315#71811#0" expanded="false" /> <element signature="e#80802#80898#0" expanded="false" />
<element signature="e#71856#72729#0" expanded="false" /> <element signature="e#80961#81488#0" expanded="false" />
<element signature="e#72777#78846#0" expanded="false" /> <element signature="e#81549#86761#0" expanded="false" />
<element signature="e#78894#80678#0" expanded="false" /> <element signature="e#86805#86862#0" expanded="false" />
<element signature="e#80728#80824#0" expanded="false" /> <element signature="e#86916#90265#0" expanded="false" />
<element signature="e#80887#81414#0" expanded="false" /> <element signature="e#90320#92251#0" expanded="false" />
<element signature="e#86731#86788#0" expanded="false" /> <element signature="e#92317#92937#0" expanded="false" />
<element signature="e#86842#90191#0" expanded="false" /> <element signature="e#92980#93651#0" expanded="false" />
<element signature="e#90246#92177#0" expanded="false" /> <element signature="e#93687#94476#0" expanded="false" />
<element signature="e#92243#92863#0" expanded="false" /> <element signature="e#94518#94613#0" expanded="false" />
<element signature="e#92906#93577#0" expanded="false" /> <element signature="e#94663#94811#0" expanded="false" />
<element signature="e#93613#94402#0" expanded="false" />
<element signature="e#94444#94539#0" expanded="false" />
<element signature="e#94589#94737#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -837,36 +887,33 @@
<element signature="e#30677#31904#0" expanded="false" /> <element signature="e#30677#31904#0" expanded="false" />
<element signature="e#32004#36358#0" expanded="false" /> <element signature="e#32004#36358#0" expanded="false" />
<element signature="e#36406#38470#0" expanded="false" /> <element signature="e#36406#38470#0" expanded="false" />
<element signature="e#38512#39500#0" expanded="false" /> <element signature="e#45082#51439#0" expanded="false" />
<element signature="e#39550#44164#0" expanded="false" /> <element signature="e#53607#55566#0" expanded="false" />
<element signature="e#44229#50582#0" expanded="false" /> <element signature="e#55723#56975#0" expanded="false" />
<element signature="e#50630#51365#0" expanded="false" /> <element signature="e#57031#57448#0" expanded="false" />
<element signature="e#51429#53484#0" expanded="false" /> <element signature="e#57490#57599#0" expanded="false" />
<element signature="e#53533#55492#0" expanded="false" /> <element signature="e#57642#57762#0" expanded="false" />
<element signature="e#55649#56901#0" expanded="false" /> <element signature="e#57812#57963#0" expanded="false" />
<element signature="e#56957#57374#0" expanded="false" /> <element signature="e#58016#65770#0" expanded="false" />
<element signature="e#57416#57525#0" expanded="false" /> <element signature="e#65819#65858#0" expanded="false" />
<element signature="e#57568#57688#0" expanded="false" /> <element signature="e#65907#66697#0" expanded="false" />
<element signature="e#57738#57889#0" expanded="false" /> <element signature="e#66747#69547#0" expanded="false" />
<element signature="e#57942#65696#0" expanded="false" /> <element signature="e#69592#70341#0" expanded="false" />
<element signature="e#65745#65784#0" expanded="false" /> <element signature="e#70389#71885#0" expanded="false" />
<element signature="e#65833#66623#0" expanded="false" /> <element signature="e#71930#72803#0" expanded="false" />
<element signature="e#66673#69473#0" expanded="false" /> <element signature="e#72851#78920#0" expanded="false" />
<element signature="e#69518#70267#0" expanded="false" /> <element signature="e#78968#80752#0" expanded="false" />
<element signature="e#70315#71811#0" expanded="false" /> <element signature="e#80802#80898#0" expanded="false" />
<element signature="e#71856#72729#0" expanded="false" /> <element signature="e#80961#81488#0" expanded="false" />
<element signature="e#72777#78846#0" expanded="false" /> <element signature="e#81549#86761#0" expanded="false" />
<element signature="e#78894#80678#0" expanded="false" /> <element signature="e#86805#86862#0" expanded="false" />
<element signature="e#80728#80824#0" expanded="false" /> <element signature="e#86916#90265#0" expanded="false" />
<element signature="e#80887#81414#0" expanded="false" /> <element signature="e#90320#92251#0" expanded="false" />
<element signature="e#86731#86788#0" expanded="false" /> <element signature="e#92317#92937#0" expanded="false" />
<element signature="e#86842#90191#0" expanded="false" /> <element signature="e#92980#93651#0" expanded="false" />
<element signature="e#90246#92177#0" expanded="false" /> <element signature="e#93687#94476#0" expanded="false" />
<element signature="e#92243#92863#0" expanded="false" /> <element signature="e#94518#94613#0" expanded="false" />
<element signature="e#92906#93577#0" expanded="false" /> <element signature="e#94663#94811#0" expanded="false" />
<element signature="e#93613#94402#0" expanded="false" />
<element signature="e#94444#94539#0" expanded="false" />
<element signature="e#94589#94737#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -949,20 +996,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Content.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2697" max-vertical-offset="4063">
<caret line="202" column="22" selection-start-line="202" selection-start-column="22" selection-end-line="202" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/contenters/KickAssSo.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="847" max-vertical-offset="1717">
<caret line="87" column="0" selection-start-line="87" selection-start-column="0" selection-end-line="87" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/language/English/strings.xml"> <entry file="file://$PROJECT_DIR$/resources/language/English/strings.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="239" max-vertical-offset="1088"> <state vertical-scroll-proportion="0.0" vertical-offset="239" max-vertical-offset="1088">
@ -992,21 +1025,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/changelog.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1173">
<caret line="2" column="27" selection-start-line="2" selection-start-column="27" selection-end-line="2" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/contenters/RiperAM.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="459" max-vertical-offset="1972">
<caret line="27" column="27" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/searchers/T411FR.py"> <entry file="file://$PROJECT_DIR$/resources/searchers/T411FR.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.1583236" vertical-offset="382" max-vertical-offset="2261"> <state vertical-scroll-proportion="1.1583236" vertical-offset="382" max-vertical-offset="2261">
@ -1042,13 +1060,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/contenters/EZTV.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="814" max-vertical-offset="1649">
<caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cal.py"> <entry file="file://$PROJECT_DIR$/cal.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="459" max-vertical-offset="561"> <state vertical-scroll-proportion="0.0" vertical-offset="459" max-vertical-offset="561">
@ -1070,13 +1081,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" vertical-offset="1224" max-vertical-offset="4097">
<caret line="290" column="26" selection-start-line="290" selection-start-column="26" selection-end-line="290" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/language/Russian/strings.xml"> <entry file="file://$PROJECT_DIR$/resources/language/Russian/strings.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="256" max-vertical-offset="1105"> <state vertical-scroll-proportion="0.0" vertical-offset="256" max-vertical-offset="1105">
@ -1085,13 +1089,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Localization.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="3234" max-vertical-offset="4046">
<caret line="88" column="23" selection-start-line="88" selection-start-column="23" selection-end-line="88" selection-end-column="23" />
</state>
</provider>
</entry>
<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="0.0" vertical-offset="187" max-vertical-offset="2278"> <state vertical-scroll-proportion="0.0" vertical-offset="187" max-vertical-offset="2278">
@ -1114,14 +1111,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/utorrent/net.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="15028" max-vertical-offset="22576">
<caret line="911" column="20" selection-start-line="911" selection-start-column="20" selection-end-line="911" selection-end-column="20" />
<folding />
</state>
</provider>
</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.0" vertical-offset="5610" max-vertical-offset="6885"> <state vertical-scroll-proportion="0.0" vertical-offset="5610" max-vertical-offset="6885">
@ -1146,10 +1135,196 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/changelog.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1292">
<caret line="1" column="28" selection-start-line="1" selection-start-column="28" selection-end-line="1" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/functions.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="25825" max-vertical-offset="26503">
<caret line="1548" column="0" selection-start-line="1548" selection-start-column="0" selection-end-line="1548" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/utorrent/net.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.0112" vertical-offset="116" max-vertical-offset="969">
<caret line="853" column="13" selection-start-line="853" selection-start-column="13" selection-end-line="853" selection-end-column="13" />
<folding>
<element signature="e#1035#8981#0" expanded="false" />
<element signature="e#1063#1400#0" expanded="false" />
<element signature="e#1451#2546#0" expanded="false" />
<element signature="e#2581#3672#0" expanded="false" />
<element signature="e#3705#5438#0" expanded="false" />
<element signature="e#5474#6446#0" expanded="false" />
<element signature="e#6496#7776#0" expanded="false" />
<element signature="e#7816#8114#0" expanded="false" />
<element signature="e#8168#8506#0" expanded="false" />
<element signature="e#8544#8981#0" expanded="false" />
<element signature="e#9007#10161#0" expanded="false" />
<element signature="e#9351#10026#0" expanded="false" />
<element signature="e#10060#10161#0" expanded="false" />
<element signature="e#10188#10687#0" expanded="false" />
<element signature="e#10225#10410#0" expanded="false" />
<element signature="e#10444#10687#0" expanded="false" />
<element signature="e#10710#18412#0" expanded="false" />
<element signature="e#10775#11132#0" expanded="false" />
<element signature="e#11166#11736#0" expanded="false" />
<element signature="e#11766#12548#0" expanded="false" />
<element signature="e#12587#13184#0" expanded="false" />
<element signature="e#13224#13571#0" expanded="false" />
<element signature="e#13618#13922#0" expanded="false" />
<element signature="e#13973#14140#0" expanded="false" />
<element signature="e#14182#14503#0" expanded="false" />
<element signature="e#14558#14727#0" expanded="false" />
<element signature="e#14779#14860#0" expanded="false" />
<element signature="e#14896#14900#0" expanded="false" />
<element signature="e#14950#15522#0" expanded="false" />
<element signature="e#15573#15663#0" expanded="false" />
<element signature="e#15698#16224#0" expanded="false" />
<element signature="e#16278#16860#0" expanded="false" />
<element signature="e#16918#18412#0" expanded="false" />
<element signature="e#16918#17225#1" expanded="false" />
<element signature="e#18439#28666#0" expanded="false" />
<element signature="e#18499#18828#0" expanded="false" />
<element signature="e#18858#21531#0" expanded="false" />
<element signature="e#21565#21797#0" expanded="false" />
<element signature="e#21836#23117#0" expanded="false" />
<element signature="e#23164#23361#0" expanded="false" />
<element signature="e#23412#23567#0" expanded="false" />
<element signature="e#23603#23607#0" expanded="false" />
<element signature="e#23649#24386#0" expanded="false" />
<element signature="e#24441#24935#0" expanded="false" />
<element signature="e#24987#25522#0" expanded="false" />
<element signature="e#25563#27337#0" expanded="false" />
<element signature="e#27388#27914#0" expanded="false" />
<element signature="e#27948#28178#0" expanded="false" />
<element signature="e#28220#28368#0" expanded="false" />
<element signature="e#28410#28666#0" expanded="false" />
<element signature="e#28687#36366#0" expanded="false" />
<element signature="e#28747#28943#0" expanded="false" />
<element signature="e#28977#29093#0" expanded="false" />
<element signature="e#29123#30370#0" expanded="false" />
<element signature="e#30404#30655#0" expanded="false" />
<element signature="e#30694#31685#0" expanded="false" />
<element signature="e#31723#31872#0" expanded="false" />
<element signature="e#31919#32220#0" expanded="false" />
<element signature="e#32271#32671#0" expanded="false" />
<element signature="e#32707#32711#0" expanded="false" />
<element signature="e#32753#33139#0" expanded="false" />
<element signature="e#33194#33566#0" expanded="false" />
<element signature="e#33618#34013#0" expanded="false" />
<element signature="e#34054#34785#0" expanded="false" />
<element signature="e#34836#35261#0" expanded="false" />
<element signature="e#35295#36022#0" expanded="false" />
<element signature="e#36064#36366#0" expanded="false" />
<element signature="e#36385#41888#0" expanded="false" />
<element signature="e#36445#36813#0" expanded="false" />
<element signature="e#36844#38407#0" expanded="false" />
<element signature="e#38441#38473#0" expanded="false" />
<element signature="e#38512#39399#0" expanded="false" />
<element signature="e#39446#39630#0" expanded="false" />
<element signature="e#39682#39781#0" expanded="false" />
<element signature="e#39817#39821#0" expanded="false" />
<element signature="e#39863#40299#0" expanded="false" />
<element signature="e#40354#40608#0" expanded="false" />
<element signature="e#40684#41073#0" expanded="false" />
<element signature="e#41125#41206#0" expanded="false" />
<element signature="e#41257#41629#0" expanded="false" />
<element signature="e#41673#41888#0" expanded="false" />
<element signature="e#41913#45363#0" expanded="false" />
<element signature="e#41941#41954#0" expanded="false" />
<element signature="e#41986#42550#0" expanded="false" />
<element signature="e#42594#44487#0" expanded="false" />
<element signature="e#44534#44574#0" expanded="false" />
<element signature="e#44625#44669#0" expanded="false" />
<element signature="e#44699#44724#0" expanded="false" />
<element signature="e#44758#44787#0" expanded="false" />
<element signature="e#44826#44858#0" expanded="false" />
<element signature="e#44894#44923#0" expanded="false" />
<element signature="e#44965#45000#0" expanded="false" />
<element signature="e#45055#45161#0" expanded="false" />
<element signature="e#45218#45268#0" expanded="false" />
<element signature="e#45319#45363#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/contenters/CXZ.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1619" max-vertical-offset="3281">
<caret line="114" column="63" selection-start-line="114" selection-start-column="63" selection-end-line="114" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/contenters/IMDB.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1270" max-vertical-offset="4233">
<caret line="97" column="63" selection-start-line="97" selection-start-column="63" selection-end-line="97" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/contenters/FastTorrent.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="862" max-vertical-offset="2346">
<caret line="70" column="63" selection-start-line="70" selection-start-column="63" selection-end-line="70" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Localization.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-9.928572" vertical-offset="3581" max-vertical-offset="4148">
<caret line="227" column="13" selection-start-line="227" selection-start-column="9" selection-end-line="227" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/contenters/EZTV.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="641" max-vertical-offset="1649">
<caret line="56" column="63" selection-start-line="56" selection-start-column="63" selection-end-line="56" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/contenters/KinoPoisk.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1372" max-vertical-offset="5287">
<caret line="104" column="63" selection-start-line="104" selection-start-column="63" selection-end-line="104" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/contenters/RiperAM.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="828" max-vertical-offset="1955">
<caret line="64" column="63" selection-start-line="64" selection-start-column="63" selection-end-line="64" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/contenters/KickAssSo.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-2.877193" vertical-offset="1077" max-vertical-offset="1921">
<caret line="73" column="0" selection-start-line="73" selection-start-column="0" selection-end-line="73" selection-end-column="0" />
<folding>
<element signature="e#782#791#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<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.4180328" vertical-offset="2193" max-vertical-offset="3502"> <state vertical-scroll-proportion="-15.428572" vertical-offset="1064" max-vertical-offset="4658">
<caret line="1535" column="68" selection-start-line="1535" selection-start-column="68" selection-end-line="1535" selection-end-column="68" /> <caret line="665" column="11" selection-start-line="665" selection-start-column="11" selection-end-line="665" selection-end-column="23" />
<folding> <folding>
<element signature="e#24#781#1" expanded="false" /> <element signature="e#24#781#1" expanded="false" />
<element signature="e#2318#2615#0" expanded="false" /> <element signature="e#2318#2615#0" expanded="false" />
@ -1161,40 +1336,45 @@
<element signature="e#30677#31904#0" expanded="false" /> <element signature="e#30677#31904#0" expanded="false" />
<element signature="e#32004#36358#0" expanded="false" /> <element signature="e#32004#36358#0" expanded="false" />
<element signature="e#36406#38470#0" expanded="false" /> <element signature="e#36406#38470#0" expanded="false" />
<element signature="e#38512#39500#0" expanded="false" /> <element signature="e#45082#51439#0" expanded="false" />
<element signature="e#39550#44164#0" expanded="false" /> <element signature="e#53607#55566#0" expanded="false" />
<element signature="e#44229#50582#0" expanded="false" /> <element signature="e#55723#56975#0" expanded="false" />
<element signature="e#50630#51365#0" expanded="false" /> <element signature="e#57031#57448#0" expanded="false" />
<element signature="e#51429#53484#0" expanded="false" /> <element signature="e#57490#57599#0" expanded="false" />
<element signature="e#53533#55492#0" expanded="false" /> <element signature="e#57642#57762#0" expanded="false" />
<element signature="e#55649#56901#0" expanded="false" /> <element signature="e#57812#57963#0" expanded="false" />
<element signature="e#56957#57374#0" expanded="false" /> <element signature="e#58016#65770#0" expanded="false" />
<element signature="e#57416#57525#0" expanded="false" /> <element signature="e#65819#65858#0" expanded="false" />
<element signature="e#57568#57688#0" expanded="false" /> <element signature="e#65907#66697#0" expanded="false" />
<element signature="e#57738#57889#0" expanded="false" /> <element signature="e#66747#69547#0" expanded="false" />
<element signature="e#57942#65696#0" expanded="false" /> <element signature="e#69592#70341#0" expanded="false" />
<element signature="e#65745#65784#0" expanded="false" /> <element signature="e#70389#71885#0" expanded="false" />
<element signature="e#65833#66623#0" expanded="false" /> <element signature="e#71930#72803#0" expanded="false" />
<element signature="e#66673#69473#0" expanded="false" /> <element signature="e#72851#78920#0" expanded="false" />
<element signature="e#69518#70267#0" expanded="false" /> <element signature="e#78968#80752#0" expanded="false" />
<element signature="e#70315#71811#0" expanded="false" /> <element signature="e#80802#80898#0" expanded="false" />
<element signature="e#71856#72729#0" expanded="false" /> <element signature="e#80961#81488#0" expanded="false" />
<element signature="e#72777#78846#0" expanded="false" /> <element signature="e#81549#86761#0" expanded="false" />
<element signature="e#78894#80678#0" expanded="false" /> <element signature="e#86805#86862#0" expanded="false" />
<element signature="e#80728#80824#0" expanded="false" /> <element signature="e#86916#90265#0" expanded="false" />
<element signature="e#80887#81414#0" expanded="false" /> <element signature="e#90320#92251#0" expanded="false" />
<element signature="e#86731#86788#0" expanded="false" /> <element signature="e#92317#92937#0" expanded="false" />
<element signature="e#86842#90191#0" expanded="false" /> <element signature="e#92980#93651#0" expanded="false" />
<element signature="e#90246#92177#0" expanded="false" /> <element signature="e#93687#94476#0" expanded="false" />
<element signature="e#92243#92863#0" expanded="false" /> <element signature="e#94518#94613#0" expanded="false" />
<element signature="e#92906#93577#0" expanded="false" /> <element signature="e#94663#94811#0" expanded="false" />
<element signature="e#93613#94402#0" expanded="false" />
<element signature="e#94444#94539#0" expanded="false" />
<element signature="e#94589#94737#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Content.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.34931508" vertical-offset="1751" max-vertical-offset="4335">
<caret line="124" column="0" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>

32
Content.py
View File

@ -35,6 +35,7 @@ class Content:
searchIcon = '/icons/video.png' searchIcon = '/icons/video.png'
sourceWeight = 1 sourceWeight = 1
cookieJar = None cookieJar = None
baseurl = ''
def isLabel(self): def isLabel(self):
return 'Should search on ruhunt?' return 'Should search on ruhunt?'
@ -42,6 +43,9 @@ class Content:
def isPages(self): def isPages(self):
return False return False
def isSort(self):
return False
def isScrappable(self): def isScrappable(self):
return True return True
@ -54,11 +58,11 @@ class Content:
category_dict = { category_dict = {
'sites': ('[B]by Site[/B]',), 'sites': ('[B]by Site[/B]',),
'search': ('[B]Search[/B]',), 'search': ('[B]Search[/B]',),
'movies': ('Forieng Movies',), 'movies': ('Movies',),
'rus_movies': ('Russian Movies',), 'rus_movies': ('Russian Movies',),
'tvshows': ('TV Shows',), 'tvshows': ('TV Shows',),
'cartoons': ('Cartoons',), 'cartoons': ('Cartoons',),
'hot': ('Hot & New',), 'hot': ('Most Recent',),
'top': ('Top All Time',), 'top': ('Top All Time',),
'anime': ('Anime',), 'anime': ('Anime',),
'year': {'year': 'by Year', }, 'year': {'year': 'by Year', },
@ -77,7 +81,7 @@ class Content:
for y in range(2015, 1970, -1): for y in range(2015, 1970, -1):
category_dict['year'][str(y)] = (str(y), '/top/y/%s/' % str(y)) category_dict['year'][str(y)] = (str(y), '/top/y/%s/' % str(y))
def get_contentList(self, category, subcategory=None, page=None): def get_contentList(self, category, subcategory=None, property=None):
''' '''
Retrieve keyword from the input and return a list of tuples: Retrieve keyword from the input and return a list of tuples:
filesList.append(( filesList.append((
@ -103,7 +107,13 @@ class Content:
has_category = True has_category = True
return has_category return has_category
def get_url(self, category, subcategory, page, baseurl): def get_url(self, category, subcategory, apps_property):
page=None
sort=None
if apps_property:
page=apps_property.get('page')
sort=apps_property.get('sort')
if not subcategory or subcategory == True or category == 'search': if not subcategory or subcategory == True or category == 'search':
get = self.category_dict[category] get = self.category_dict[category]
else: else:
@ -111,13 +121,19 @@ class Content:
if category == 'search': get = (get[0], get[1] % urllib.quote_plus(subcategory.encode('utf-8'))) if category == 'search': get = (get[0], get[1] % urllib.quote_plus(subcategory.encode('utf-8')))
if not page or page == 1:
url = baseurl + get[1]
else:
property = self.get_property(category, subcategory) property = self.get_property(category, subcategory)
if not page or page == 1:
url = self.baseurl + get[1]
elif property:
page_url = property['page'] % (property['second_page'] + ((page - 2) * property['increase'])) page_url = property['page'] % (property['second_page'] + ((page - 2) * property['increase']))
url = baseurl + str(page_url) url = self.baseurl + str(page_url)
if property and property.get('sort'):
sort_dict=property['sort'][sort]
if sort_dict.get('url_after'):
page_url = sort_dict['url_after']
url = url + page_url
return url return url

45
Core.py
View File

@ -637,13 +637,23 @@ class Core:
subcategory = apps.get('subcategory') subcategory = apps.get('subcategory')
provider = apps.get('provider') provider = apps.get('provider')
page = apps.get('page') if apps.get('page') else 1 page = apps.get('page') if apps.get('page') else 1
sort = apps.get('sort') if apps.get('sort') else 0
apps_property={'page':page, 'sort':sort}
property = self.Content.get_property(category, subcategory) property = self.Content.get_property(category, subcategory)
contentList = self.Content.get_contentList(category, subcategory, page) contentList = self.Content.get_contentList(category, subcategory, apps_property)
if property and property.get('page'): if property and property.get('page'):
apps['page'] = page + 1 apps['page'] = page + 1
#print str(apps) #print str(apps)
self.drawItem('[COLOR FFFFFFFF][B]%s[/B][/COLOR]' % self.localize('Next Page'), 'openContent', self.drawItem('[COLOR FFFFFFFF][B]%s[/B][/COLOR]' % self.localize('Next Page'), 'openContent',
json.dumps(apps), isFolder=True) json.dumps(apps), isFolder=True)
if property and property.get('sort'):
if len(property.get('sort'))>sort+1:
apps['sort'] = int(sort) + 1
else:
apps['sort'] = 0
print str(apps['sort'])
self.drawItem('[COLOR FFFFFFFF][B]%s: %s[/B][/COLOR]' % (self.localize('Sort'), self.localize(property['sort'][apps['sort']]['name'])), 'openContent',
json.dumps(apps), isFolder=True)
if mode == 'tracker': if mode == 'tracker':
self.drawtrackerList(provider, contentList) self.drawtrackerList(provider, contentList)
@ -653,6 +663,12 @@ class Core:
view_style('drawcontentList') view_style('drawcontentList')
#if not self.debug: view_style('drawcontentList') #if not self.debug: view_style('drawcontentList')
if property and property.get('page'):
apps['page'] = page + 1
#print str(apps)
self.drawItem('[COLOR FFFFFFFF][B]%s[/B][/COLOR]' % self.localize('Next Page'), 'openContent',
json.dumps(apps), isFolder=True)
xbmcplugin.endOfDirectory(handle=int(sys.argv[1]), succeeded=True) xbmcplugin.endOfDirectory(handle=int(sys.argv[1]), succeeded=True)
def full_download(self, params={}): def full_download(self, params={}):
@ -709,7 +725,7 @@ class Core:
if self.Content.isPages() and self.Content.get_property(category, if self.Content.isPages() and self.Content.get_property(category,
subcategory): subcategory):
for i in range(1, 5 if category!='year' else 2): for i in range(1, 5 if category!='year' else 2):
contentList = self.Content.get_contentList(category, subcategory, i) contentList = self.Content.get_contentList(category, subcategory, {'page':i})
self.drawcontentList(contentList) self.drawcontentList(contentList)
if self.breakdown: break if self.breakdown: break
else: else:
@ -821,7 +837,7 @@ class Core:
listitem = xbmcgui.ListItem(title, iconImage=img, thumbnailImage=img) listitem = xbmcgui.ListItem(title, iconImage=img, thumbnailImage=img)
listitem.setInfo(type='Video', infoLabels=info) listitem.setInfo(type='Video', infoLabels=info)
if meta: if meta:
self.itemScrap(listitem, meta) listitem=itemScrap(listitem, meta)
if meta.get('icon'): if meta.get('icon'):
search_url['img'] = meta.get('icon') search_url['img'] = meta.get('icon')
if meta.get('info').get('title'): if meta.get('info').get('title'):
@ -856,29 +872,6 @@ class Core:
progressBar.close() progressBar.close()
if self.debug and 1 == debug: lockView('wide') if self.debug and 1 == debug: lockView('wide')
def itemScrap(self, item, kwarg):
# Debug('[itemTVDB]:meta '+str(kwarg))
if 'title' in kwarg and kwarg['title']:
item.setLabel(kwarg['title'])
if 'label' in kwarg and kwarg['label']:
item.setLabel2(kwarg['label'])
if 'icon' in kwarg and kwarg['icon']:
item.setIconImage(kwarg['icon'])
if 'thumbnail' in kwarg and kwarg['thumbnail']:
item.setThumbnailImage(kwarg['thumbnail'])
if 'properties' in kwarg and kwarg['properties']:
for key, value in kwarg['properties'].iteritems():
item.setProperty(key, str(value))
if 'info' in kwarg and kwarg['properties']:
item.setInfo(type='Video', infoLabels=kwarg['info'])
return item
def drawtrackerList(self, provider, contentList): def drawtrackerList(self, provider, contentList):
contentList = sorted(contentList, key=lambda x: x[0], reverse=True) contentList = sorted(contentList, key=lambda x: x[0], reverse=True)
for num, originaltitle, title, year, img, info in contentList: for num, originaltitle, title, year, img, info in contentList:

8
Localization.py
View File

@ -123,7 +123,7 @@ dictionary = {
'TV Shows': 'Сериалы', 'TV Shows': 'Сериалы',
'Cartoons': 'Мультфильмы', 'Cartoons': 'Мультфильмы',
'Anime': 'Аниме', 'Anime': 'Аниме',
'Hot & New': 'Горячие Новинки', 'Most Recent': 'Горячие Новинки',
'Top 250 Movies': 'Лучшие 250 фильмов', 'Top 250 Movies': 'Лучшие 250 фильмов',
'Top All Time': 'Лучшее за ВСЕ ВРЕМЯ', 'Top All Time': 'Лучшее за ВСЕ ВРЕМЯ',
'by Genre': 'по Жанру', 'by Genre': 'по Жанру',
@ -152,7 +152,6 @@ dictionary = {
'War': 'Военные', 'War': 'Военные',
'Western': 'Вестерны', 'Western': 'Вестерны',
'[B]by Site[/B]': '[B]по Сайту[/B]', '[B]by Site[/B]': '[B]по Сайту[/B]',
'Movies': 'Фильмы',
'Cartoons Series': 'Мультсериалы', 'Cartoons Series': 'Мультсериалы',
'Cartoons Short': 'Мультфильмы (короткометражки)', 'Cartoons Short': 'Мультфильмы (короткометражки)',
'Male': 'Мужские', 'Male': 'Мужские',
@ -161,7 +160,7 @@ dictionary = {
'Next Page': 'Следующая Страница', 'Next Page': 'Следующая Страница',
'Previous Page': 'Предыдущая Страница', 'Previous Page': 'Предыдущая Страница',
'Russian Movies': 'Отечественные Фильмы', 'Russian Movies': 'Отечественные Фильмы',
'Forieng Movies': 'Зарубежные Фильмы', 'Movies': 'Зарубежные Фильмы',
'Anime Film': 'Полнометражное Аниме', 'Anime Film': 'Полнометражное Аниме',
'Anime Series': 'Аниме Сериалы', 'Anime Series': 'Аниме Сериалы',
'Can\'t download torrent, probably no seeds available.': 'Не могу скачать торрент, скорее всего нет доступных сидов.', 'Can\'t download torrent, probably no seeds available.': 'Не могу скачать торрент, скорее всего нет доступных сидов.',
@ -224,6 +223,9 @@ dictionary = {
'Add to MyShows.ru':'Добавить в MyShows.ru', 'Add to MyShows.ru':'Добавить в MyShows.ru',
'Return to MyShows.ru':'Вернуться в MyShows.ru', 'Return to MyShows.ru':'Вернуться в MyShows.ru',
'Search results:':'Результаты поиска:', 'Search results:':'Результаты поиска:',
'by Seeders':'по Сидам',
'by Date':'по Дате',
'Sort':'Сортировка',
} }
} }

9
changelog.txt
View File

@ -1,4 +1,11 @@
[B]Version 2.1.2[/B] [B]Version 2.1.4[/B]
[+] Списки Медиа: Сортировка
[B]Version 2.1.4[/B]
[+] Ace Stream: баг-фиксы
[+] Восстановлена работа с MyShows.ru
[B]Version 2.1.3[/B]
[+] Поиск: Добавлен французский t411.me по просьбе Zombi [+] Поиск: Добавлен французский t411.me по просьбе Zombi
[+] Множественные баг-фиксы [+] Множественные баг-фиксы

23
functions.py
View File

@ -1546,3 +1546,26 @@ def unquote(string, ret=None):
return ret return ret
else: else:
return string return string
def itemScrap(item, kwarg):
# Debug('[itemTVDB]:meta '+str(kwarg))
if 'title' in kwarg and kwarg['title']:
item.setLabel(kwarg['title'])
if 'label' in kwarg and kwarg['label']:
item.setLabel2(kwarg['label'])
if 'icon' in kwarg and kwarg['icon']:
item.setIconImage(kwarg['icon'])
if 'thumbnail' in kwarg and kwarg['thumbnail']:
item.setThumbnailImage(kwarg['thumbnail'])
if 'properties' in kwarg and kwarg['properties']:
for key, value in kwarg['properties'].iteritems():
item.setProperty(key, str(value))
if 'info' in kwarg and kwarg['properties']:
item.setInfo(type='Video', infoLabels=kwarg['info'])
return item

8
resources/contenters/CXZ.py
View File

@ -26,12 +26,12 @@ from BeautifulSoup import BeautifulSoup
def make_category_dict(): def make_category_dict():
category_dict = { category_dict = {
'movies': ('Forieng Movies', '/films/fl_foreign_hight/?'), 'movies': ('Movies', '/films/fl_foreign_hight/?'),
'rus_movies': ('Russian Movies', '/films/fl_our_hight/?'), 'rus_movies': ('Russian Movies', '/films/fl_our_hight/?'),
'tvshows': ('TV Shows', '/serials/fl_hight/?'), 'tvshows': ('TV Shows', '/serials/fl_hight/?'),
'cartoons': ('Cartoons', '/cartoons/fl_hight/?'), 'cartoons': ('Cartoons', '/cartoons/fl_hight/?'),
'anime': ('Anime', '/cartoons/cartoon_genre/anime/?'), 'anime': ('Anime', '/cartoons/cartoon_genre/anime/?'),
'hot': ('Hot & New', '/films/fl_hight/?'), 'hot': ('Most Recent', '/films/fl_hight/?'),
'top': ('Top 250 Movies', '/films/fl_hight/?sort=popularity&'), 'top': ('Top 250 Movies', '/films/fl_hight/?sort=popularity&'),
'genre': {'genre': 'by Genre', 'genre': {'genre': 'by Genre',
'action': ('Action', '/films/film_genre/bojevik/?'), 'action': ('Action', '/films/film_genre/bojevik/?'),
@ -110,9 +110,9 @@ class CXZ(Content.Content):
def isScrappable(self): def isScrappable(self):
return True return True
def get_contentList(self, category, subcategory=None, page=None): def get_contentList(self, category, subcategory=None, apps_property=None):
contentList = [] contentList = []
url = self.get_url(category, subcategory, page, self.baseurl) url = self.get_url(category, subcategory, apps_property)
response = self.makeRequest(url, headers=self.headers) response = self.makeRequest(url, headers=self.headers)

6
resources/contenters/EZTV.py
View File

@ -22,7 +22,7 @@ import Content, re
class EZTV(Content.Content): class EZTV(Content.Content):
category_dict = { category_dict = {
'hot': ('Hot & New', '/', {'page': '/page_%d', 'increase': 1, 'second_page': 1}), 'hot': ('Most Recent', '/', {'page': '/page_%d', 'increase': 1, 'second_page': 1}),
} }
baseurl = "https://eztv.ch" baseurl = "https://eztv.ch"
@ -52,9 +52,9 @@ class EZTV(Content.Content):
def isSearchOption(self): def isSearchOption(self):
return False return False
def get_contentList(self, category, subcategory=None, page=None): def get_contentList(self, category, subcategory=None, apps_property=None):
contentList = [] contentList = []
url = self.get_url(category, subcategory, page, self.baseurl) url = self.get_url(category, subcategory, apps_property)
response = self.makeRequest(url, headers=self.headers) response = self.makeRequest(url, headers=self.headers)

17
resources/contenters/FastTorrent.py
View File

@ -32,7 +32,7 @@ class FastTorrent(Content.Content):
'cartoons': ('Cartoons', '/last-multfilm-torrent/', 'cartoons': ('Cartoons', '/last-multfilm-torrent/',
{'page': '/last-multfilm-torrent/%d.html', 'increase': 1, 'second_page': 2}), {'page': '/last-multfilm-torrent/%d.html', 'increase': 1, 'second_page': 2}),
'anime': ('Anime', '/anime/multfilm/', {'page': '/anime/multfilm/%d.html', 'increase': 1, 'second_page': 2}), 'anime': ('Anime', '/anime/multfilm/', {'page': '/anime/multfilm/%d.html', 'increase': 1, 'second_page': 2}),
'hot': ('Hot & New', '/new-films/', {'page': '/new-films/%d.html', 'increase': 1, 'second_page': 2}), 'hot': ('Most Recent', '/new-films/', {'page': '/new-films/%d.html', 'increase': 1, 'second_page': 2}),
'genre': {'genre': 'by Genre', 'genre': {'genre': 'by Genre',
'amime_series': ('Anime Series', '/anime-serialy/multfilm/', 'amime_series': ('Anime Series', '/anime-serialy/multfilm/',
{'page': '/anime-serialy/multfilm/%d.html', 'increase': 1, 'second_page': 2}), {'page': '/anime-serialy/multfilm/%d.html', 'increase': 1, 'second_page': 2}),
@ -66,20 +66,9 @@ class FastTorrent(Content.Content):
def isPages(self): def isPages(self):
return True return True
def get_contentList(self, category, subcategory=None, page=None): def get_contentList(self, category, subcategory=None, apps_property=None):
contentList = [] contentList = []
if not subcategory or subcategory == True: url = self.get_url(category, subcategory, apps_property)
get = self.category_dict[category]
else:
get = self.category_dict[category][subcategory]
if not page or page == 1:
url = self.baseurl + get[1]
else:
property = self.get_property(category, subcategory)
page_url = property['page'] % (property['second_page'] + ((page - 2) * property['increase']))
url = self.baseurl + str(page_url)
response = self.makeRequest(url, headers=self.headers) response = self.makeRequest(url, headers=self.headers)

8
resources/contenters/IMDB.py
View File

@ -27,13 +27,13 @@ from BeautifulSoup import BeautifulSoup
class IMDB(Content.Content): class IMDB(Content.Content):
category_dict = { category_dict = {
'movies': ('Forieng Movies', '/search/title?languages=en|1&title_type=feature&sort=moviemeter,asc'), 'movies': ('Movies', '/search/title?languages=en|1&title_type=feature&sort=moviemeter,asc'),
'rus_movies': ('Russian Movies', '/search/title?languages=ru|1&title_type=feature&sort=moviemeter,asc'), 'rus_movies': ('Russian Movies', '/search/title?languages=ru|1&title_type=feature&sort=moviemeter,asc'),
'tvshows': ('TV Shows', '/search/title?count=100&title_type=tv_series,mini_series&ref_=gnr_tv_mp'), 'tvshows': ('TV Shows', '/search/title?count=100&title_type=tv_series,mini_series&ref_=gnr_tv_mp'),
'cartoons': ('Cartoons', '/search/title?genres=animation&title_type=feature&sort=moviemeter,asc'), 'cartoons': ('Cartoons', '/search/title?genres=animation&title_type=feature&sort=moviemeter,asc'),
'anime': ('Anime', 'anime': ('Anime',
'/search/title?count=100&genres=animation&keywords=anime&num_votes=1000,&explore=title_type&ref_=gnr_kw_an'), '/search/title?count=100&genres=animation&keywords=anime&num_votes=1000,&explore=title_type&ref_=gnr_kw_an'),
'hot': ('Hot & New', '/search/title?count=100&title_type=feature%2Ctv_series%2Ctv_movie&ref_=nv_ch_mm_1'), 'hot': ('Most Recent', '/search/title?count=100&title_type=feature%2Ctv_series%2Ctv_movie&ref_=nv_ch_mm_1'),
'top': ('Top 250 Movies', '/chart/top/'), 'top': ('Top 250 Movies', '/chart/top/'),
'search': ('[B]Search[/B]', '/find?q=%s&s=tt&ttype=ft'), 'search': ('[B]Search[/B]', '/find?q=%s&s=tt&ttype=ft'),
'year': {'year': 'by Year', }, 'year': {'year': 'by Year', },
@ -93,9 +93,9 @@ class IMDB(Content.Content):
def isScrappable(self): def isScrappable(self):
return True return True
def get_contentList(self, category, subcategory=None, page=None): def get_contentList(self, category, subcategory=None, apps_property=None):
contentList = [] contentList = []
url = self.get_url(category, subcategory, page, self.baseurl) url = self.get_url(category, subcategory, apps_property)
response = self.makeRequest(url, headers=self.headers) response = self.makeRequest(url, headers=self.headers)

23
resources/contenters/KickAssSo.py
View File

@ -22,10 +22,18 @@ import Content
class KickAssSo(Content.Content): class KickAssSo(Content.Content):
category_dict = { category_dict = {
'hot': ('Hot & New', '/new/', {'page': '/new/%d/', 'increase': 1, 'second_page': 2}), 'hot': ('Most Recent', '/new/', {'page': '/new/%d/', 'increase': 1, 'second_page': 2,
'anime': ('Anime', '/anime/', {'page': '/anime/%d/', 'increase': 1, 'second_page': 2}), 'sort':[{'name':'by Seeders', 'url_after':'?field=seeders&sorder=desc'},
'tvshows': ('TV Shows', '/tv/', {'page': '/tv/%d/', 'increase': 1, 'second_page': 2}), {'name':'by Date', 'url_after':'?field=time_add&sorder=desc'}]}),
'movies': ('Forieng Movies', '/movies/', {'page': '/movies/%d/', 'increase': 1, 'second_page': 2}), 'anime': ('Anime', '/anime/', {'page': '/anime/%d/', 'increase': 1, 'second_page': 2,
'sort':[{'name':'by Seeders', 'url_after':'?field=seeders&sorder=desc'},
{'name':'by Date', 'url_after':'?field=time_add&sorder=desc'}]}),
'tvshows': ('TV Shows', '/tv/', {'page': '/tv/%d/', 'increase': 1, 'second_page': 2,
'sort':[{'name':'by Seeders', 'url_after':'?field=seeders&sorder=desc'},
{'name':'by Date', 'url_after':'?field=time_add&sorder=desc'}]}),
'movies': ('Movies', '/movies/', {'page': '/movies/%d/', 'increase': 1, 'second_page': 2,
'sort':[{'name':'by Seeders', 'url_after':'?field=seeders&sorder=desc'},
{'name':'by Date', 'url_after':'?field=time_add&sorder=desc'}]}),
} }
baseurl = "http://kickass.so" baseurl = "http://kickass.so"
@ -52,12 +60,15 @@ class KickAssSo(Content.Content):
def isPages(self): def isPages(self):
return True return True
def isSort(self):
return True
def isSearchOption(self): def isSearchOption(self):
return False return False
def get_contentList(self, category, subcategory=None, page=None): def get_contentList(self, category, subcategory=None, apps_property=None):
contentList = [] contentList = []
url = self.get_url(category, subcategory, page, self.baseurl) url = self.get_url(category, subcategory, apps_property)
response = self.makeRequest(url, headers=self.headers) response = self.makeRequest(url, headers=self.headers)

8
resources/contenters/KinoPoisk.py
View File

@ -30,10 +30,10 @@ class KinoPoisk(Content.Content):
'tvshows': ('TV Shows', '/top/serial/list/'), 'tvshows': ('TV Shows', '/top/serial/list/'),
'cartoons': ('Cartoons', '/top/id_genre/14/'), 'cartoons': ('Cartoons', '/top/id_genre/14/'),
'search': ('[B]Search[/B]', '/s/type/film/list/1/find/%s/'), 'search': ('[B]Search[/B]', '/s/type/film/list/1/find/%s/'),
'movies': ('Forieng Movies', '/s/type/film/list/1/m_act[country]/1/m_act[type]/film/'), 'movies': ('Movies', '/s/type/film/list/1/m_act[country]/1/m_act[type]/film/'),
'rus_movies': ('Russian Movies', '/s/type/film/list/1/m_act[country]/2/m_act[type]/film/'), 'rus_movies': ('Russian Movies', '/s/type/film/list/1/m_act[country]/2/m_act[type]/film/'),
'anime': ('Anime', '/s/type/film/list/1/order/rating/m_act[genre][0]/1750/',), 'anime': ('Anime', '/s/type/film/list/1/order/rating/m_act[genre][0]/1750/',),
'hot': ('Hot & New', '/popular/'), 'hot': ('Most Recent', '/popular/'),
'top': ('Top 250 Movies', '/top/'), 'top': ('Top 250 Movies', '/top/'),
'genre': {'genre': 'by Genre', 'genre': {'genre': 'by Genre',
'russia': ('Russia & USSR', '/top/rus/list/'), 'russia': ('Russia & USSR', '/top/rus/list/'),
@ -99,10 +99,10 @@ class KinoPoisk(Content.Content):
def isScrappable(self): def isScrappable(self):
return True return True
def get_contentList(self, category, subcategory=None, page=None): def get_contentList(self, category, subcategory=None, apps_property=None):
socket.setdefaulttimeout(15) socket.setdefaulttimeout(15)
contentList = [] contentList = []
url = self.get_url(category, subcategory, page, self.baseurl) url = self.get_url(category, subcategory, apps_property)
#print url #print url
response = self.makeRequest(url, headers=self.headers) response = self.makeRequest(url, headers=self.headers)

6
resources/contenters/RiperAM.py
View File

@ -28,7 +28,7 @@ class RiperAM(Content.Content):
#'tvshows':('TV Shows', '/top/serial/list/'), #'tvshows':('TV Shows', '/top/serial/list/'),
#'cartoons':('Cartoons', '/top/id_genre/14/'), #'cartoons':('Cartoons', '/top/id_genre/14/'),
#'anime':('Anime', '/search/title?count=100&genres=animation&keywords=anime&num_votes=1000,&explore=title_type&ref_=gnr_kw_an'), #'anime':('Anime', '/search/title?count=100&genres=animation&keywords=anime&num_votes=1000,&explore=title_type&ref_=gnr_kw_an'),
'hot': ('Hot & New', '/', {'page': '/portal.php?tp=%d', 'increase': 30, 'second_page': 30}), 'hot': ('Most Recent', '/', {'page': '/portal.php?tp=%d', 'increase': 30, 'second_page': 30}),
#'top':('Top 250 Movies', '/top/'), #'top':('Top 250 Movies', '/top/'),
} }
@ -60,9 +60,9 @@ class RiperAM(Content.Content):
def isSearchOption(self): def isSearchOption(self):
return False return False
def get_contentList(self, category, subcategory=None, page=None): def get_contentList(self, category, subcategory=None, apps_property=None):
contentList = [] contentList = []
url = self.get_url(category, subcategory, page, self.baseurl) url = self.get_url(category, subcategory, apps_property)
response = self.makeRequest(url, headers=self.headers) response = self.makeRequest(url, headers=self.headers)