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

fixes and fr

pull/1/head
DiMartinoXBMC 2015-01-18 01:32:32 +03:00
parent bd0f492b3e
commit c3e7c7b953
7 changed files with 468 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

703
.idea/workspace.xml
View File

@ -2,8 +2,12 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/resources/searchers/T411FR.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Core.py" afterPath="$PROJECT_DIR$/Core.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/language/English/strings.xml" afterPath="$PROJECT_DIR$/resources/language/English/strings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Player.py" afterPath="$PROJECT_DIR$/Player.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$/resources/settings.xml" afterPath="$PROJECT_DIR$/resources/settings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="plugin.video.torrenter.iws" />
@ -35,11 +39,11 @@
<splitter split-orientation="horizontal" split-proportion="0.5">
<split-first>
<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">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.74752474" vertical-offset="4377" max-vertical-offset="5321">
<caret line="1632" column="19" selection-start-line="1632" selection-start-column="19" selection-end-line="1632" selection-end-column="19" />
<state vertical-scroll-proportion="-9.428572" vertical-offset="2524" max-vertical-offset="6086">
<caret line="1473" column="24" selection-start-line="1473" selection-start-column="24" selection-end-line="1473" selection-end-column="24" />
<folding>
<element signature="e#24#781#1" expanded="false" />
<element signature="e#2318#2615#0" expanded="false" />
@ -47,79 +51,57 @@
<element signature="e#7325#19290#0" expanded="false" />
<element signature="e#19331#20097#0" expanded="false" />
<element signature="e#20148#27163#0" expanded="false" />
<element signature="e#27207#30566#0" expanded="false" />
<element signature="e#30607#31834#0" expanded="false" />
<element signature="e#31934#36288#0" expanded="false" />
<element signature="e#36336#38400#0" expanded="false" />
<element signature="e#38442#39430#0" expanded="false" />
<element signature="e#39480#44094#0" expanded="false" />
<element signature="e#50560#51295#0" expanded="false" />
<element signature="e#51359#53370#0" expanded="false" />
<element signature="e#53419#55378#0" expanded="false" />
<element signature="e#55535#56787#0" expanded="false" />
<element signature="e#56843#57260#0" expanded="false" />
<element signature="e#57302#57411#0" expanded="false" />
<element signature="e#57454#57574#0" expanded="false" />
<element signature="e#57624#57775#0" expanded="false" />
<element signature="e#57828#64866#0" expanded="false" />
<element signature="e#64915#64954#0" expanded="false" />
<element signature="e#65003#65793#0" expanded="false" />
<element signature="e#65843#68643#0" expanded="false" />
<element signature="e#68688#69437#0" expanded="false" />
<element signature="e#69485#70981#0" expanded="false" />
<element signature="e#71026#71899#0" expanded="false" />
<element signature="e#71947#77531#0" expanded="false" />
<element signature="e#77579#79363#0" expanded="false" />
<element signature="e#79413#79509#0" expanded="false" />
<element signature="e#79572#80099#0" expanded="false" />
<element signature="e#80170#85458#0" expanded="false" />
<element signature="e#85502#85559#0" expanded="false" />
<element signature="e#89017#90948#0" expanded="false" />
<element signature="e#91014#91634#0" expanded="false" />
<element signature="e#91677#92575#0" expanded="false" />
<element signature="e#92611#93400#0" expanded="false" />
<element signature="e#93442#93537#0" expanded="false" />
<element signature="e#93587#93735#0" expanded="false" />
<element signature="e#30677#31904#0" expanded="false" />
<element signature="e#32004#36358#0" expanded="false" />
<element signature="e#36406#38470#0" expanded="false" />
<element signature="e#38512#39500#0" expanded="false" />
<element signature="e#39550#44164#0" expanded="false" />
<element signature="e#44229#50582#0" expanded="false" />
<element signature="e#50630#51365#0" expanded="false" />
<element signature="e#51429#53440#0" expanded="false" />
<element signature="e#53489#55448#0" expanded="false" />
<element signature="e#55605#56857#0" expanded="false" />
<element signature="e#56913#57330#0" expanded="false" />
<element signature="e#57372#57481#0" expanded="false" />
<element signature="e#57524#57644#0" expanded="false" />
<element signature="e#57694#57845#0" expanded="false" />
<element signature="e#57898#64936#0" expanded="false" />
<element signature="e#64985#65024#0" expanded="false" />
<element signature="e#65073#65863#0" expanded="false" />
<element signature="e#65913#68713#0" expanded="false" />
<element signature="e#68758#69507#0" expanded="false" />
<element signature="e#69555#71051#0" expanded="false" />
<element signature="e#71096#71969#0" expanded="false" />
<element signature="e#72017#77601#0" expanded="false" />
<element signature="e#77649#79433#0" expanded="false" />
<element signature="e#79483#79579#0" expanded="false" />
<element signature="e#79642#80169#0" expanded="false" />
<element signature="e#85572#85629#0" expanded="false" />
<element signature="e#89087#91018#0" expanded="false" />
<element signature="e#91084#91704#0" expanded="false" />
<element signature="e#91747#92645#0" expanded="false" />
<element signature="e#93512#93607#0" expanded="false" />
<element signature="e#93657#93805#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="cal.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cal.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510">
<caret line="0" column="3" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="settings.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/settings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2190" max-vertical-offset="2822">
<caret line="137" column="58" selection-start-line="137" selection-start-column="58" selection-end-line="137" selection-end-column="58" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="addon.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/addon.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="85" max-vertical-offset="510">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510">
<caret line="5" column="50" selection-start-line="5" selection-start-column="50" selection-end-line="5" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="changelog.txt" pinned="false" current="false" current-in-tab="false">
<file leaf-file-name="changelog.txt" pinned="false" current="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/changelog.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="459" max-vertical-offset="1105">
<caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
<state vertical-scroll-proportion="0.039580908" 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>
@ -128,53 +110,42 @@
<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="256" max-vertical-offset="1105">
<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 />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Libtorrent.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Libtorrent.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1819" max-vertical-offset="7531">
<caret line="107" column="27" selection-start-line="107" selection-start-column="27" selection-end-line="107" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</split-first>
<split-second>
<leaf>
<file leaf-file-name="Localization.py" pinned="false" current="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Localization.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.375" vertical-offset="2587" max-vertical-offset="4012">
<caret line="170" column="9" selection-start-line="170" selection-start-column="9" selection-end-line="170" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="net.py" pinned="false" current="false" current-in-tab="false">
<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="17595" max-vertical-offset="22797">
<caret line="1035" column="20" selection-start-line="1035" selection-start-column="20" selection-end-line="1035" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SearcherABC.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/SearcherABC.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1190" max-vertical-offset="3757">
<caret line="70" column="0" selection-start-line="70" selection-start-column="0" selection-end-line="80" selection-end-column="19" />
<folding />
<state vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="1547">
<caret line="93" column="52" selection-start-line="93" selection-start-column="52" selection-end-line="93" selection-end-column="52" />
<folding>
<element signature="e#24#785#1" expanded="false" />
<element signature="e#1381#1638#0" expanded="false" />
<element signature="e#1381#1623#1" expanded="false" />
<element signature="e#1708#1738#0" expanded="false" />
<element signature="e#1783#1793#0" expanded="false" />
<element signature="e#1841#2227#0" expanded="false" />
<element signature="e#2279#2290#0" expanded="false" />
<element signature="e#2321#2332#0" expanded="false" />
<element signature="e#2369#2553#0" expanded="false" />
<element signature="e#3280#4043#0" expanded="false" />
<element signature="e#4471#4580#0" expanded="false" />
<element signature="e#4623#4743#0" expanded="false" />
<element signature="e#4780#4866#0" expanded="false" />
<element signature="e#4899#5158#0" expanded="false" />
<element signature="e#5201#5944#0" expanded="false" />
<element signature="e#5992#6095#0" expanded="false" />
<element signature="e#6134#6460#0" expanded="false" />
<element signature="e#6515#6818#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@ -182,18 +153,18 @@
<file leaf-file-name="Player.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Player.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="6103" max-vertical-offset="6800">
<caret line="359" column="40" selection-start-line="359" selection-start-column="40" selection-end-line="359" selection-end-column="40" />
<state vertical-scroll-proportion="-6.571429" vertical-offset="5443" max-vertical-offset="6562">
<caret line="344" column="32" selection-start-line="344" selection-start-column="32" selection-end-line="344" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="functions.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/functions.py">
<file leaf-file-name="T411FR.py" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/searchers/T411FR.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="18955" max-vertical-offset="26401">
<caret line="1115" column="38" selection-start-line="1115" selection-start-column="38" selection-end-line="1115" selection-end-column="38" />
<state vertical-scroll-proportion="1.8206979" vertical-offset="0" max-vertical-offset="2261">
<caret line="95" column="18" selection-start-line="95" selection-start-column="18" selection-end-line="95" selection-end-column="18" />
<folding />
</state>
</provider>
@ -209,26 +180,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="KickAssSo.py" pinned="false" current="false" current-in-tab="false">
<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" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Content.py" pinned="false" current="false" current-in-tab="false">
<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" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</split-second>
</splitter>
@ -251,20 +202,21 @@
<option value="$PROJECT_DIR$/resources/searchers/NNMClubRu.py" />
<option value="$PROJECT_DIR$/Downloader.py" />
<option value="$PROJECT_DIR$/resources/searchers/KickAssSo.py" />
<option value="$PROJECT_DIR$/functions.py" />
<option value="$PROJECT_DIR$/Libtorrent.py" />
<option value="$PROJECT_DIR$/cal.py" />
<option value="$PROJECT_DIR$/resources/utorrent/net.py" />
<option value="$PROJECT_DIR$/resources/settings.xml" />
<option value="$PROJECT_DIR$/Player.py" />
<option value="$PROJECT_DIR$/Localization.py" />
<option value="$PROJECT_DIR$/resources/language/Russian/strings.xml" />
<option value="$PROJECT_DIR$/addon.xml" />
<option value="$PROJECT_DIR$/changelog.txt" />
<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/settings.xml" />
<option value="$PROJECT_DIR$/Core.py" />
<option value="$PROJECT_DIR$/functions.py" />
<option value="$PROJECT_DIR$/Player.py" />
<option value="$PROJECT_DIR$/resources/searchers/T411FR.py" />
<option value="$PROJECT_DIR$/changelog.txt" />
</list>
</option>
</component>
@ -300,6 +252,7 @@
<sortByType />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@ -364,57 +317,12 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="language" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Russian" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="plugin.video.torrenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="plugin.video.torrenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="language" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="English" />
<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="contenters" />
<option name="myItemId" value="searchers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@ -431,6 +339,11 @@
<console-settings />
</option>
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\searchers" />
</key>
</component>
<component name="RunManager" selected="Python.cal">
<configuration default="false" name="cal" type="PythonConfigurationType" factoryName="Python" temporary="true">
<option name="INTERPRETER_OPTIONS" value="" />
@ -666,7 +579,11 @@
<created>1421359002092</created>
<updated>1421359002092</updated>
</task>
<option name="localTasksCounter" value="20" />
<task id="LOCAL-00020" summary="fixes">
<created>1421420336815</created>
<updated>1421420336815</updated>
</task>
<option name="localTasksCounter" value="21" />
<servers />
</component>
<component name="TodoView" selected-index="0">
@ -743,7 +660,8 @@
<MESSAGE value="keep seeding" />
<MESSAGE value="deluge" />
<MESSAGE value="context fix" />
<option name="LAST_COMMIT_MESSAGE" value="context fix" />
<MESSAGE value="fixes" />
<option name="LAST_COMMIT_MESSAGE" value="fixes" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@ -751,14 +669,6 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/addon.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="510">
<caret line="6" column="15" selection-start-line="6" selection-start-column="15" selection-end-line="6" selection-end-column="15" />
<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">
@ -816,39 +726,37 @@
<element signature="e#7325#19290#0" expanded="false" />
<element signature="e#19331#20097#0" expanded="false" />
<element signature="e#20148#27163#0" expanded="false" />
<element signature="e#27207#30566#0" expanded="false" />
<element signature="e#30607#31834#0" expanded="false" />
<element signature="e#31934#36288#0" expanded="false" />
<element signature="e#36336#38400#0" expanded="false" />
<element signature="e#38442#39430#0" expanded="false" />
<element signature="e#39480#44094#0" expanded="false" />
<element signature="e#50560#51295#0" expanded="false" />
<element signature="e#51359#53370#0" expanded="false" />
<element signature="e#53419#55378#0" expanded="false" />
<element signature="e#55535#56787#0" expanded="false" />
<element signature="e#56843#57260#0" expanded="false" />
<element signature="e#57302#57411#0" expanded="false" />
<element signature="e#57454#57574#0" expanded="false" />
<element signature="e#57624#57775#0" expanded="false" />
<element signature="e#57828#64866#0" expanded="false" />
<element signature="e#64915#64954#0" expanded="false" />
<element signature="e#65003#65793#0" expanded="false" />
<element signature="e#65843#68643#0" expanded="false" />
<element signature="e#68688#69437#0" expanded="false" />
<element signature="e#69485#70981#0" expanded="false" />
<element signature="e#71026#71899#0" expanded="false" />
<element signature="e#71947#77531#0" expanded="false" />
<element signature="e#77579#79363#0" expanded="false" />
<element signature="e#79413#79509#0" expanded="false" />
<element signature="e#79572#80099#0" expanded="false" />
<element signature="e#80170#85458#0" expanded="false" />
<element signature="e#85502#85559#0" expanded="false" />
<element signature="e#89017#90948#0" expanded="false" />
<element signature="e#91014#91634#0" expanded="false" />
<element signature="e#91677#92575#0" expanded="false" />
<element signature="e#92611#93400#0" expanded="false" />
<element signature="e#93442#93537#0" expanded="false" />
<element signature="e#93587#93735#0" expanded="false" />
<element signature="e#30677#31904#0" expanded="false" />
<element signature="e#32004#36358#0" expanded="false" />
<element signature="e#36406#38470#0" expanded="false" />
<element signature="e#38512#39500#0" expanded="false" />
<element signature="e#39550#44164#0" expanded="false" />
<element signature="e#44229#50582#0" expanded="false" />
<element signature="e#50630#51365#0" expanded="false" />
<element signature="e#51429#53440#0" expanded="false" />
<element signature="e#53489#55448#0" expanded="false" />
<element signature="e#55605#56857#0" expanded="false" />
<element signature="e#56913#57330#0" expanded="false" />
<element signature="e#57372#57481#0" expanded="false" />
<element signature="e#57524#57644#0" expanded="false" />
<element signature="e#57694#57845#0" expanded="false" />
<element signature="e#57898#64936#0" expanded="false" />
<element signature="e#64985#65024#0" expanded="false" />
<element signature="e#65073#65863#0" expanded="false" />
<element signature="e#65913#68713#0" expanded="false" />
<element signature="e#68758#69507#0" expanded="false" />
<element signature="e#69555#71051#0" expanded="false" />
<element signature="e#71096#71969#0" expanded="false" />
<element signature="e#72017#77601#0" expanded="false" />
<element signature="e#77649#79433#0" expanded="false" />
<element signature="e#79483#79579#0" expanded="false" />
<element signature="e#79642#80169#0" expanded="false" />
<element signature="e#85572#85629#0" expanded="false" />
<element signature="e#89087#91018#0" expanded="false" />
<element signature="e#91084#91704#0" expanded="false" />
<element signature="e#91747#92645#0" expanded="false" />
<element signature="e#93512#93607#0" expanded="false" />
<element signature="e#93657#93805#0" expanded="false" />
</folding>
</state>
</provider>
@ -903,39 +811,37 @@
<element signature="e#7325#19290#0" expanded="false" />
<element signature="e#19331#20097#0" expanded="false" />
<element signature="e#20148#27163#0" expanded="false" />
<element signature="e#27207#30566#0" expanded="false" />
<element signature="e#30607#31834#0" expanded="false" />
<element signature="e#31934#36288#0" expanded="false" />
<element signature="e#36336#38400#0" expanded="false" />
<element signature="e#38442#39430#0" expanded="false" />
<element signature="e#39480#44094#0" expanded="false" />
<element signature="e#50560#51295#0" expanded="false" />
<element signature="e#51359#53370#0" expanded="false" />
<element signature="e#53419#55378#0" expanded="false" />
<element signature="e#55535#56787#0" expanded="false" />
<element signature="e#56843#57260#0" expanded="false" />
<element signature="e#57302#57411#0" expanded="false" />
<element signature="e#57454#57574#0" expanded="false" />
<element signature="e#57624#57775#0" expanded="false" />
<element signature="e#57828#64866#0" expanded="false" />
<element signature="e#64915#64954#0" expanded="false" />
<element signature="e#65003#65793#0" expanded="false" />
<element signature="e#65843#68643#0" expanded="false" />
<element signature="e#68688#69437#0" expanded="false" />
<element signature="e#69485#70981#0" expanded="false" />
<element signature="e#71026#71899#0" expanded="false" />
<element signature="e#71947#77531#0" expanded="false" />
<element signature="e#77579#79363#0" expanded="false" />
<element signature="e#79413#79509#0" expanded="false" />
<element signature="e#79572#80099#0" expanded="false" />
<element signature="e#80170#85458#0" expanded="false" />
<element signature="e#85502#85559#0" expanded="false" />
<element signature="e#89017#90948#0" expanded="false" />
<element signature="e#91014#91634#0" expanded="false" />
<element signature="e#91677#92575#0" expanded="false" />
<element signature="e#92611#93400#0" expanded="false" />
<element signature="e#93442#93537#0" expanded="false" />
<element signature="e#93587#93735#0" expanded="false" />
<element signature="e#30677#31904#0" expanded="false" />
<element signature="e#32004#36358#0" expanded="false" />
<element signature="e#36406#38470#0" expanded="false" />
<element signature="e#38512#39500#0" expanded="false" />
<element signature="e#39550#44164#0" expanded="false" />
<element signature="e#44229#50582#0" expanded="false" />
<element signature="e#50630#51365#0" expanded="false" />
<element signature="e#51429#53440#0" expanded="false" />
<element signature="e#53489#55448#0" expanded="false" />
<element signature="e#55605#56857#0" expanded="false" />
<element signature="e#56913#57330#0" expanded="false" />
<element signature="e#57372#57481#0" expanded="false" />
<element signature="e#57524#57644#0" expanded="false" />
<element signature="e#57694#57845#0" expanded="false" />
<element signature="e#57898#64936#0" expanded="false" />
<element signature="e#64985#65024#0" expanded="false" />
<element signature="e#65073#65863#0" expanded="false" />
<element signature="e#65913#68713#0" expanded="false" />
<element signature="e#68758#69507#0" expanded="false" />
<element signature="e#69555#71051#0" expanded="false" />
<element signature="e#71096#71969#0" expanded="false" />
<element signature="e#72017#77601#0" expanded="false" />
<element signature="e#77649#79433#0" expanded="false" />
<element signature="e#79483#79579#0" expanded="false" />
<element signature="e#79642#80169#0" expanded="false" />
<element signature="e#85572#85629#0" expanded="false" />
<element signature="e#89087#91018#0" expanded="false" />
<element signature="e#91084#91704#0" expanded="false" />
<element signature="e#91747#92645#0" expanded="false" />
<element signature="e#93512#93607#0" expanded="false" />
<element signature="e#93657#93805#0" expanded="false" />
</folding>
</state>
</provider>
@ -990,39 +896,37 @@
<element signature="e#7325#19290#0" expanded="false" />
<element signature="e#19331#20097#0" expanded="false" />
<element signature="e#20148#27163#0" expanded="false" />
<element signature="e#27207#30566#0" expanded="false" />
<element signature="e#30607#31834#0" expanded="false" />
<element signature="e#31934#36288#0" expanded="false" />
<element signature="e#36336#38400#0" expanded="false" />
<element signature="e#38442#39430#0" expanded="false" />
<element signature="e#39480#44094#0" expanded="false" />
<element signature="e#50560#51295#0" expanded="false" />
<element signature="e#51359#53370#0" expanded="false" />
<element signature="e#53419#55378#0" expanded="false" />
<element signature="e#55535#56787#0" expanded="false" />
<element signature="e#56843#57260#0" expanded="false" />
<element signature="e#57302#57411#0" expanded="false" />
<element signature="e#57454#57574#0" expanded="false" />
<element signature="e#57624#57775#0" expanded="false" />
<element signature="e#57828#64866#0" expanded="false" />
<element signature="e#64915#64954#0" expanded="false" />
<element signature="e#65003#65793#0" expanded="false" />
<element signature="e#65843#68643#0" expanded="false" />
<element signature="e#68688#69437#0" expanded="false" />
<element signature="e#69485#70981#0" expanded="false" />
<element signature="e#71026#71899#0" expanded="false" />
<element signature="e#71947#77531#0" expanded="false" />
<element signature="e#77579#79363#0" expanded="false" />
<element signature="e#79413#79509#0" expanded="false" />
<element signature="e#79572#80099#0" expanded="false" />
<element signature="e#80170#85458#0" expanded="false" />
<element signature="e#85502#85559#0" expanded="false" />
<element signature="e#89017#90948#0" expanded="false" />
<element signature="e#91014#91634#0" expanded="false" />
<element signature="e#91677#92575#0" expanded="false" />
<element signature="e#92611#93400#0" expanded="false" />
<element signature="e#93442#93537#0" expanded="false" />
<element signature="e#93587#93735#0" expanded="false" />
<element signature="e#30677#31904#0" expanded="false" />
<element signature="e#32004#36358#0" expanded="false" />
<element signature="e#36406#38470#0" expanded="false" />
<element signature="e#38512#39500#0" expanded="false" />
<element signature="e#39550#44164#0" expanded="false" />
<element signature="e#44229#50582#0" expanded="false" />
<element signature="e#50630#51365#0" expanded="false" />
<element signature="e#51429#53440#0" expanded="false" />
<element signature="e#53489#55448#0" expanded="false" />
<element signature="e#55605#56857#0" expanded="false" />
<element signature="e#56913#57330#0" expanded="false" />
<element signature="e#57372#57481#0" expanded="false" />
<element signature="e#57524#57644#0" expanded="false" />
<element signature="e#57694#57845#0" expanded="false" />
<element signature="e#57898#64936#0" expanded="false" />
<element signature="e#64985#65024#0" expanded="false" />
<element signature="e#65073#65863#0" expanded="false" />
<element signature="e#65913#68713#0" expanded="false" />
<element signature="e#68758#69507#0" expanded="false" />
<element signature="e#69555#71051#0" expanded="false" />
<element signature="e#71096#71969#0" expanded="false" />
<element signature="e#72017#77601#0" expanded="false" />
<element signature="e#77649#79433#0" expanded="false" />
<element signature="e#79483#79579#0" expanded="false" />
<element signature="e#79642#80169#0" expanded="false" />
<element signature="e#85572#85629#0" expanded="false" />
<element signature="e#89087#91018#0" expanded="false" />
<element signature="e#91084#91704#0" expanded="false" />
<element signature="e#91747#92645#0" expanded="false" />
<element signature="e#93512#93607#0" expanded="false" />
<element signature="e#93657#93805#0" expanded="false" />
</folding>
</state>
</provider>
@ -1063,13 +967,6 @@
</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.58426964" vertical-offset="1456" max-vertical-offset="5287">
<caret line="108" column="0" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.419295" vertical-offset="0" max-vertical-offset="1003">
@ -1091,13 +988,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/searchers/NNMClubRu.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-3.651852" vertical-offset="2040" max-vertical-offset="2669">
<caret line="4" column="7" selection-start-line="4" selection-start-column="7" selection-end-line="4" selection-end-column="7" />
</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.5277778" vertical-offset="854" max-vertical-offset="1649">
@ -1134,14 +1024,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/SearcherABC.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="714" max-vertical-offset="3485">
<caret line="70" column="0" selection-start-line="70" selection-start-column="0" selection-end-line="80" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Downloader.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="2.0941916" vertical-offset="417" max-vertical-offset="2278">
@ -1157,14 +1039,6 @@
</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="0" max-vertical-offset="510">
<caret line="0" column="3" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
<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="0.0" vertical-offset="17595" max-vertical-offset="22797">
@ -1173,46 +1047,6 @@
</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="18955" max-vertical-offset="26401">
<caret line="1115" column="38" selection-start-line="1115" selection-start-column="38" selection-end-line="1115" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Player.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="6103" max-vertical-offset="6800">
<caret line="359" column="40" selection-start-line="359" selection-start-column="40" selection-end-line="359" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/settings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2190" max-vertical-offset="2822">
<caret line="137" column="58" selection-start-line="137" selection-start-column="58" selection-end-line="137" selection-end-column="58" />
<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="0" max-vertical-offset="1105">
<caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
<folding />
</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="0" max-vertical-offset="510">
<caret line="5" column="50" selection-start-line="5" selection-start-column="50" selection-end-line="5" selection-end-column="50" />
<folding />
</state>
</provider>
</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">
@ -1247,16 +1081,72 @@
</entry>
<entry file="file://$PROJECT_DIR$/Localization.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.375" vertical-offset="2587" max-vertical-offset="4012">
<state vertical-scroll-proportion="0.0" vertical-offset="2587" max-vertical-offset="4012">
<caret line="170" column="9" selection-start-line="170" selection-start-column="9" selection-end-line="170" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/searchers/TFileME.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.45095694" vertical-offset="1238" max-vertical-offset="2176">
<caret line="101" column="69" selection-start-line="101" selection-start-column="69" selection-end-line="101" selection-end-column="69" />
<folding />
</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="0" max-vertical-offset="510">
<caret line="5" column="50" selection-start-line="5" selection-start-column="50" selection-end-line="5" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/settings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0645933" vertical-offset="1697" max-vertical-offset="2839">
<caret line="103" column="16" selection-start-line="103" selection-start-column="16" selection-end-line="103" selection-end-column="16" />
<folding />
</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="0" max-vertical-offset="510">
<caret line="0" column="3" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/functions.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3237064" vertical-offset="15371" max-vertical-offset="26112">
<caret line="937" column="42" selection-start-line="937" selection-start-column="42" selection-end-line="937" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Player.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-6.571429" vertical-offset="5443" max-vertical-offset="6562">
<caret line="344" column="32" selection-start-line="344" selection-start-column="32" selection-end-line="344" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/searchers/NNMClubRu.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.61350405" vertical-offset="1632" max-vertical-offset="2618">
<caret line="130" column="0" selection-start-line="130" selection-start-column="0" selection-end-line="131" selection-end-column="59" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Core.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.74752474" vertical-offset="4377" max-vertical-offset="5321">
<caret line="1632" column="19" selection-start-line="1632" selection-start-column="19" selection-end-line="1632" selection-end-column="19" />
<state vertical-scroll-proportion="-9.428572" vertical-offset="2524" max-vertical-offset="6086">
<caret line="1473" column="24" selection-start-line="1473" selection-start-column="24" selection-end-line="1473" selection-end-column="24" />
<folding>
<element signature="e#24#781#1" expanded="false" />
<element signature="e#2318#2615#0" expanded="false" />
@ -1264,43 +1154,84 @@
<element signature="e#7325#19290#0" expanded="false" />
<element signature="e#19331#20097#0" expanded="false" />
<element signature="e#20148#27163#0" expanded="false" />
<element signature="e#27207#30566#0" expanded="false" />
<element signature="e#30607#31834#0" expanded="false" />
<element signature="e#31934#36288#0" expanded="false" />
<element signature="e#36336#38400#0" expanded="false" />
<element signature="e#38442#39430#0" expanded="false" />
<element signature="e#39480#44094#0" expanded="false" />
<element signature="e#50560#51295#0" expanded="false" />
<element signature="e#51359#53370#0" expanded="false" />
<element signature="e#53419#55378#0" expanded="false" />
<element signature="e#55535#56787#0" expanded="false" />
<element signature="e#56843#57260#0" expanded="false" />
<element signature="e#57302#57411#0" expanded="false" />
<element signature="e#57454#57574#0" expanded="false" />
<element signature="e#57624#57775#0" expanded="false" />
<element signature="e#57828#64866#0" expanded="false" />
<element signature="e#64915#64954#0" expanded="false" />
<element signature="e#65003#65793#0" expanded="false" />
<element signature="e#65843#68643#0" expanded="false" />
<element signature="e#68688#69437#0" expanded="false" />
<element signature="e#69485#70981#0" expanded="false" />
<element signature="e#71026#71899#0" expanded="false" />
<element signature="e#71947#77531#0" expanded="false" />
<element signature="e#77579#79363#0" expanded="false" />
<element signature="e#79413#79509#0" expanded="false" />
<element signature="e#79572#80099#0" expanded="false" />
<element signature="e#80170#85458#0" expanded="false" />
<element signature="e#85502#85559#0" expanded="false" />
<element signature="e#89017#90948#0" expanded="false" />
<element signature="e#91014#91634#0" expanded="false" />
<element signature="e#91677#92575#0" expanded="false" />
<element signature="e#92611#93400#0" expanded="false" />
<element signature="e#93442#93537#0" expanded="false" />
<element signature="e#93587#93735#0" expanded="false" />
<element signature="e#30677#31904#0" expanded="false" />
<element signature="e#32004#36358#0" expanded="false" />
<element signature="e#36406#38470#0" expanded="false" />
<element signature="e#38512#39500#0" expanded="false" />
<element signature="e#39550#44164#0" expanded="false" />
<element signature="e#44229#50582#0" expanded="false" />
<element signature="e#50630#51365#0" expanded="false" />
<element signature="e#51429#53440#0" expanded="false" />
<element signature="e#53489#55448#0" expanded="false" />
<element signature="e#55605#56857#0" expanded="false" />
<element signature="e#56913#57330#0" expanded="false" />
<element signature="e#57372#57481#0" expanded="false" />
<element signature="e#57524#57644#0" expanded="false" />
<element signature="e#57694#57845#0" expanded="false" />
<element signature="e#57898#64936#0" expanded="false" />
<element signature="e#64985#65024#0" expanded="false" />
<element signature="e#65073#65863#0" expanded="false" />
<element signature="e#65913#68713#0" expanded="false" />
<element signature="e#68758#69507#0" expanded="false" />
<element signature="e#69555#71051#0" expanded="false" />
<element signature="e#71096#71969#0" expanded="false" />
<element signature="e#72017#77601#0" expanded="false" />
<element signature="e#77649#79433#0" expanded="false" />
<element signature="e#79483#79579#0" expanded="false" />
<element signature="e#79642#80169#0" expanded="false" />
<element signature="e#85572#85629#0" expanded="false" />
<element signature="e#89087#91018#0" expanded="false" />
<element signature="e#91084#91704#0" expanded="false" />
<element signature="e#91747#92645#0" expanded="false" />
<element signature="e#93512#93607#0" expanded="false" />
<element signature="e#93657#93805#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/SearcherABC.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="1547">
<caret line="93" column="52" selection-start-line="93" selection-start-column="52" selection-end-line="93" selection-end-column="52" />
<folding>
<element signature="e#24#785#1" expanded="false" />
<element signature="e#1381#1638#0" expanded="false" />
<element signature="e#1381#1623#1" expanded="false" />
<element signature="e#1708#1738#0" expanded="false" />
<element signature="e#1783#1793#0" expanded="false" />
<element signature="e#1841#2227#0" expanded="false" />
<element signature="e#2279#2290#0" expanded="false" />
<element signature="e#2321#2332#0" expanded="false" />
<element signature="e#2369#2553#0" expanded="false" />
<element signature="e#3280#4043#0" expanded="false" />
<element signature="e#4471#4580#0" expanded="false" />
<element signature="e#4623#4743#0" expanded="false" />
<element signature="e#4780#4866#0" expanded="false" />
<element signature="e#4899#5158#0" expanded="false" />
<element signature="e#5201#5944#0" expanded="false" />
<element signature="e#5992#6095#0" expanded="false" />
<element signature="e#6134#6460#0" expanded="false" />
<element signature="e#6515#6818#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/changelog.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.039580908" 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/searchers/T411FR.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.8206979" vertical-offset="0" max-vertical-offset="2261">
<caret line="95" column="18" selection-start-line="95" selection-start-column="18" selection-end-line="95" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
</component>
</project>

2
Core.py
View File

@ -461,7 +461,7 @@ class Core:
contextMenu.append((self.localize('Individual Tracker Options'),
'XBMC.RunScript(%s)' % (os.path.join(ROOT, 'controlcenter.py,') + 'addtime=%s&title=%s' % (str(addtime), title))))
contextMenu.append((self.localize('Keyboard'),
ListString % ('search', '&showKey=true', 'url', urllib.quote_plus(title))))
'XBMC.ActivateWindow(Videos,%s)' % (sys.argv[0] + '?action=%s&action2=%s&%s=%s') % ('search', '&showKey=true', 'url', urllib.quote_plus(title))))
if int(fav) == 1:
contextMenu.append((self.localize('Delete from %s') % self.localize('Favourites SH'),
ListString % ('History', 'unfav', 'addtime', str(addtime))))

21
Player.py
View File

@ -163,8 +163,8 @@ class TorrentPlayer(xbmc.Player):
def init(self):
self.next_dl = True if self.__settings__.getSetting('next_dl') == 'true' else False
self.next_contentId = None
self.next_dl = True if self.__settings__.getSetting('next_dl') == 'true' and self.ids_video else False
self.next_contentId = False
self.display_name = ''
self.downloadedSize = 0
self.dialog = xbmcgui.Dialog()
@ -272,13 +272,6 @@ class TorrentPlayer(xbmc.Player):
if self.subs_dl:
self.setup_subs(label, path)
if self.next_dl and self.ids_video:
next_contentId_index = self.ids_video.index(str(self.contentId)) + 1
if len(self.ids_video) > next_contentId_index:
self.next_contentId = int(self.ids_video[next_contentId_index])
else:
self.next_contentId = False
if not self.ids_video:
seasonId = self.get("seasonId")
episodeId = self.get("episodeId")
@ -349,17 +342,24 @@ class TorrentPlayer(xbmc.Player):
with nested(self.attach(overlay.show, self.on_playback_paused),
self.attach(overlay.hide, self.on_playback_resumed, self.on_playback_stopped)):
while not xbmc.abortRequested and self.isPlaying():
xbmc.sleep(2000)
self.torrent.checkThread()
self.torrent.debug()
status = self.torrent.torrentHandle.status()
overlay.text = "\n".join(self._get_status_lines(status))
#downloadedSize = torrent.torrentHandle.file_progress()[contentId]
self.iterator = int(status.progress * 100)
if self.iterator == 100 and self.next_dl:
next_contentId_index = self.ids_video.index(str(self.contentId)) + 1
if len(self.ids_video) > next_contentId_index:
self.next_contentId = int(self.ids_video[next_contentId_index])
else:
self.next_contentId = False
if not self.seeding_run and self.iterator == 100 and self.seeding:
self.seeding_run=True
xbmc.sleep(1000)
self.seed(self.contentId)
self.seeding_status=True
xbmc.sleep(7000)
if self.iterator == 100 and not self.next_dling and (self.next_contentId or self.next_contentId==0):
showMessage(Localization.localize('Torrent Downloading'),
Localization.localize('Starting download next episode!'), forced=True)
@ -369,7 +369,6 @@ class TorrentPlayer(xbmc.Player):
self.basename=self.display_name = os.path.basename(path)
self.torrent.continueSession(self.next_contentId)
self.next_dling = True
xbmc.sleep(1000)
def _get_status_lines(self, s):
return [

4
changelog.txt
View File

@ -1,4 +1,8 @@
[B]Version 2.1.2[/B]
[+] Поиск: Добавлен французский t411.me по просьбе Zombi
[+] Множественные баг-фиксы
[B]Version 2.1.2[/B]
[+] Торрент-клиент: Поддержка Deluge WebUI (No SSL)
[+] История Поиска: Возможность изменять запрос с помощью клавиатуры
[+] Поиска: Настройка выбора действия вместо Открытия торрента

2
functions.py
View File

@ -935,7 +935,7 @@ class HistoryDB:
self._connect()
providers=self.get_providers(addtime)
keys=Searchers().dic().keys()
if len(providers)>0:
if providers and len(providers)>0:
if searcher in providers:
providers.remove(searcher)
else:

134
resources/searchers/T411FR.py 100644
View File

@ -0,0 +1,134 @@
# -*- coding: utf-8 -*-
'''
Torrenter plugin for XBMC
Copyright (C) 2012 Vadim Skorba
vadim.skorba@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
'''
import re
import os
import urllib
import tempfile
import sys
import SearcherABC
class T411FR(SearcherABC.SearcherABC):
'''
Weight of source with this searcher provided.
Will be multiplied on default weight.
Default weight is seeds number
'''
sourceWeight = 1
'''
Relative (from root directory of plugin) path to image
will shown as source image at result listing
'''
searchIcon = '/resources/searchers/icons/T411FR.png'
'''
Flag indicates is this source - magnet links source or not.
Used for filtration of sources in case of old library (setting selected).
Old libraries won't to convert magnet as torrent file to the storage
'''
@property
def isMagnetLinkSource(self):
return False
'''
Main method should be implemented for search process.
Receives keyword and have to return dictionary of proper tuples:
filesList.append((
int(weight),# Calculated global weight of sources
int(seeds),# Seeds count
str(title),# Title will be shown
str(link),# Link to the torrent/magnet
str(image),# Path/URL to image shown at the list
))'''
headers = {('Origin', 'http://t411.me'),
('User-Agent',
'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 YaBrowser/14.10.2062.12061 Safari/537.36'),
('Referer', 'http://t411.me/'),('X-NewRelic-ID','x='),
('X-Requested-With','XMLHttpRequest'),}
def search(self, keyword):
filesList = []
url='http://www.t411.me/torrents/search/?search=%s' % urllib.quote_plus(keyword.decode('utf-8').encode('cp1251'))
url+='&order=seeders&type=desc'
#headers = {('Origin', 'http://t411.me'),
# ('User-Agent',
# 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 YaBrowser/14.10.2062.12061 Safari/537.36'),
# ('Referer', 'http://t411.me/')}
response = self.makeRequest(url, headers=self.headers)
if None != response and 0 < len(response):
#self.cookieJar.save(ignore_discard=True)
#self.check_login(response)
#print response
regex = '''<a href="//.+?" title="(.+?)">.+?<span class="up">.+?<a href="/torrents/nfo/\?id=(\d+)" class="ajax nfo"></a>.+?</td>.+?<td align="center">.+?</td>.+?<td align="center">.+?</td>.+?<td align="center">(.+?)</td>.+?<td align="center" class="up">(\d+)</td>.+?<td align="center" class="down">(\d+)</td>'''
for (title, link, size, seeds, leechers) in re.compile(regex, re.DOTALL).findall(response):
title=self.clear_title(title)
image = sys.modules["__main__"].__root__ + self.searchIcon
link = 'http://www.t411.me/torrents/download/?id='+link
filesList.append((
int(int(self.sourceWeight) * int(seeds)),
int(seeds), int(leechers), size,
title,
self.__class__.__name__ + '::' + link,
image,
))
return filesList
def clear_title(self, s):
return self.stripHtml(self.unescape(s)).replace(' ',' ').replace(' ',' ').strip()
def check_login(self, response=None):
if None != response and 0 < len(response):
#print response
if re.compile('<input class="userInput"').search(response) or \
re.compile('start cache').search(response):
print 'T411FR Not logged!'
self.login()
return False
return True
def getTorrentFile(self, url):
content = self.makeRequest(url, headers=self.headers)
#print content
if not self.check_login(content):
content = self.makeRequest(url, headers=self.headers)
#return url
return self.saveTorrentFile(url, content)
def login(self):
data = {
'password': 'toraddon20',
'login': 'zombitorrent',
'remember':'1'
}
x=self.makeRequest(
'http://www.t411.me/users/auth/',data=data, headers=self.headers)
if re.search('{"status":"OK"',x):
print 'LOGGED T411FR'
self.cookieJar.save(ignore_discard=True)
for cookie in self.cookieJar:
if cookie.name == 'authKey' and cookie.domain=='.t411.me':
return 'authKey=' + cookie.value
return False

1
resources/settings.xml
View File

@ -127,6 +127,7 @@
type="bool"
label="30030"
default="false"
visible="eq(-9,0)"
enable="eq(-7,true)"
/>
</category>