Merge pull request #14 from DiMartinoXBMC/master

merge from origin
pull/16/merge
Роман 2016-06-19 00:31:52 +04:00 committed by GitHub
commit 3479f200af
12 changed files with 244 additions and 130 deletions

View File

@ -2,9 +2,11 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment=""> <list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/utorrent/net.py" afterPath="$PROJECT_DIR$/resources/utorrent/net.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Content.py" afterPath="$PROJECT_DIR$/Content.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/CXZ.py" afterPath="$PROJECT_DIR$/resources/contenters/CXZ.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/KinoPoisk.py" afterPath="$PROJECT_DIR$/resources/contenters/KinoPoisk.py" />
</list> </list>
<ignored path="plugin.video.torrenter.iws" /> <ignored path="plugin.video.torrenter.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
@ -34,11 +36,11 @@
<splitter split-orientation="horizontal" split-proportion="0.51215065"> <splitter split-orientation="horizontal" split-proportion="0.51215065">
<split-first> <split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="functions.py" pinned="false" current-in-tab="true"> <file leaf-file-name="functions.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/functions.py"> <entry file="file://$PROJECT_DIR$/functions.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361"> <state relative-caret-position="89">
<caret line="1197" column="70" selection-start-line="1198" selection-start-column="33" selection-end-line="1198" selection-end-column="47" /> <caret line="1181" column="67" selection-start-line="1181" selection-start-column="67" selection-end-line="1181" selection-end-column="67" />
<folding> <folding>
<element signature="e#853#867#0" expanded="true" /> <element signature="e#853#867#0" expanded="true" />
<element signature="e#4062#4301#0" expanded="false" /> <element signature="e#4062#4301#0" expanded="false" />
@ -129,7 +131,7 @@
<file leaf-file-name="Inposloader.py" pinned="false" current-in-tab="false"> <file leaf-file-name="Inposloader.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Inposloader.py"> <entry file="file://$PROJECT_DIR$/Inposloader.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3655"> <state relative-caret-position="837">
<caret line="235" column="68" selection-start-line="235" selection-start-column="68" selection-end-line="235" selection-end-column="68" /> <caret line="235" column="68" selection-start-line="235" selection-start-column="68" selection-end-line="235" selection-end-column="68" />
<folding> <folding>
<element signature="e#28187#29903#0" expanded="false" /> <element signature="e#28187#29903#0" expanded="false" />
@ -139,6 +141,52 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="KinoPoisk.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/contenters/KinoPoisk.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="73" column="19" selection-start-line="73" selection-start-column="19" selection-end-line="73" selection-end-column="36" />
<folding>
<element signature="e#783#792#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="CXZ.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/contenters/CXZ.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="74" column="36" selection-start-line="74" selection-start-column="36" selection-end-line="74" selection-end-column="36" />
<folding>
<element signature="e#783#792#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="IMDB.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/contenters/IMDB.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="58" column="45" selection-start-line="58" selection-start-column="45" selection-end-line="58" selection-end-column="45" />
<folding>
<element signature="e#783#792#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Content.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Content.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="changelog.txt" pinned="false" current-in-tab="false"> <file leaf-file-name="changelog.txt" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/changelog.txt"> <entry file="file://$PROJECT_DIR$/changelog.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -190,7 +238,7 @@
<file leaf-file-name="Core.py" pinned="false" current-in-tab="false"> <file leaf-file-name="Core.py" pinned="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 relative-caret-position="96"> <state relative-caret-position="1836">
<caret line="1100" column="0" selection-start-line="1100" selection-start-column="0" selection-end-line="1100" selection-end-column="0" /> <caret line="1100" column="0" selection-start-line="1100" selection-start-column="0" selection-end-line="1100" selection-end-column="0" />
<folding> <folding>
<element signature="e#24#856#1" expanded="false" /> <element signature="e#24#856#1" expanded="false" />
@ -600,8 +648,8 @@
<file leaf-file-name="SkorbaLoader.py" pinned="false" current-in-tab="false"> <file leaf-file-name="SkorbaLoader.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/SkorbaLoader.py"> <entry file="file://$PROJECT_DIR$/SkorbaLoader.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="697"> <state relative-caret-position="680">
<caret line="55" column="47" selection-start-line="55" selection-start-column="47" selection-end-line="55" selection-end-column="47" /> <caret line="54" column="47" selection-start-line="54" selection-start-column="47" selection-end-line="54" selection-end-column="47" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -712,10 +760,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/controlcenter.py" />
<option value="$PROJECT_DIR$/default.py" />
<option value="$PROJECT_DIR$/resources/scrapers/tmdbs.py" />
<option value="$PROJECT_DIR$/../torrenter.searcher.RiperAM/changelog.txt" />
<option value="$PROJECT_DIR$/../torrenter.searcher.RiperAM/resources/settings.xml" /> <option value="$PROJECT_DIR$/../torrenter.searcher.RiperAM/resources/settings.xml" />
<option value="$PROJECT_DIR$/resources/scrapers/kinopoisk/LOGGER.py" /> <option value="$PROJECT_DIR$/resources/scrapers/kinopoisk/LOGGER.py" />
<option value="$PROJECT_DIR$/resources/contenters/RiperAM.py" /> <option value="$PROJECT_DIR$/resources/contenters/RiperAM.py" />
@ -763,6 +807,10 @@
<option value="$PROJECT_DIR$/Core.py" /> <option value="$PROJECT_DIR$/Core.py" />
<option value="$PROJECT_DIR$/functions.py" /> <option value="$PROJECT_DIR$/functions.py" />
<option value="$PROJECT_DIR$/resources/utorrent/net.py" /> <option value="$PROJECT_DIR$/resources/utorrent/net.py" />
<option value="$PROJECT_DIR$/Content.py" />
<option value="$PROJECT_DIR$/resources/contenters/KinoPoisk.py" />
<option value="$PROJECT_DIR$/resources/contenters/CXZ.py" />
<option value="$PROJECT_DIR$/resources/contenters/IMDB.py" />
</list> </list>
</option> </option>
</component> </component>
@ -797,8 +845,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
@ -849,8 +895,28 @@
<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_ELEMENT>
<option name="myItemId" value="contenters" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" />
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -1047,13 +1113,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1420801533300</updated> <updated>1420801533300</updated>
</task> </task>
<task id="LOCAL-00173" summary="fix errors">
<created>1452026375245</created>
<option name="number" value="00173" />
<option name="presentableId" value="LOCAL-00173" />
<option name="project" value="LOCAL" />
<updated>1452026375245</updated>
</task>
<task id="LOCAL-00174" summary="qbittorent"> <task id="LOCAL-00174" summary="qbittorent">
<created>1452632992196</created> <created>1452632992196</created>
<option name="number" value="00174" /> <option name="number" value="00174" />
@ -1390,7 +1449,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1459948765761</updated> <updated>1459948765761</updated>
</task> </task>
<option name="localTasksCounter" value="222" /> <task id="LOCAL-00222" summary="qbit fix">
<created>1462112732358</created>
<option name="number" value="00222" />
<option name="presentableId" value="LOCAL-00222" />
<option name="project" value="LOCAL" />
<updated>1462112732359</updated>
</task>
<option name="localTasksCounter" value="223" />
<servers /> <servers />
</component> </component>
<component name="TodoView"> <component name="TodoView">
@ -1410,7 +1476,7 @@
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32850778" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32850778" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27505568" sideWeight="0.5021075" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27505568" sideWeight="0.5021075" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32739422" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32739422" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27505568" sideWeight="0.49789253" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27474973" sideWeight="0.49789253" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32703003" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32703003" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1319149" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1319149" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@ -1440,7 +1506,6 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="tmdb fix" />
<MESSAGE value="history update" /> <MESSAGE value="history update" />
<MESSAGE value="API update" /> <MESSAGE value="API update" />
<MESSAGE value="API update and skin" /> <MESSAGE value="API update and skin" />
@ -1465,7 +1530,8 @@
<MESSAGE value="slowfix" /> <MESSAGE value="slowfix" />
<MESSAGE value="fixes" /> <MESSAGE value="fixes" />
<MESSAGE value="# fix" /> <MESSAGE value="# fix" />
<option name="LAST_COMMIT_MESSAGE" value="# fix" /> <MESSAGE value="qbit fix" />
<option name="LAST_COMMIT_MESSAGE" value="qbit fix" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
@ -1474,34 +1540,6 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://D:/Python27/Lib/shelve.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="213" column="6" selection-start-line="213" selection-start-column="6" selection-end-line="213" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../script.module.libtorrent/python_libtorrent/platform_pulsar.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="57" column="18" selection-start-line="57" selection-start-column="18" selection-end-line="57" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.RuTorOrg/addon.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="8" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.KinoZalTV/addon.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="1" column="55" selection-start-line="1" selection-start-column="55" selection-end-line="1" selection-end-column="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.KinoZalTV/changelog.txt"> <entry file="file://$PROJECT_DIR$/../torrenter.searcher.KinoZalTV/changelog.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
@ -1667,6 +1705,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="7" column="68" selection-start-line="7" selection-start-column="63" selection-end-line="7" selection-end-column="68" /> <caret line="7" column="68" selection-start-line="7" selection-start-column="63" selection-end-line="7" selection-end-column="68" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1767,17 +1806,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Inposloader.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3655">
<caret line="235" column="68" selection-start-line="235" selection-start-column="68" selection-end-line="235" selection-end-column="68" />
<folding>
<element signature="e#28187#29903#0" expanded="false" />
<element signature="e#29632#29903#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/changelog.txt"> <entry file="file://$PROJECT_DIR$/changelog.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187"> <state relative-caret-position="187">
@ -1820,8 +1848,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/SkorbaLoader.py"> <entry file="file://$PROJECT_DIR$/SkorbaLoader.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="697"> <state relative-caret-position="680">
<caret line="55" column="47" selection-start-line="55" selection-start-column="47" selection-end-line="55" selection-end-column="47" /> <caret line="54" column="47" selection-start-line="54" selection-start-column="47" selection-end-line="54" selection-end-column="47" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -1897,54 +1925,9 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/functions.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361">
<caret line="1197" column="70" selection-start-line="1198" selection-start-column="33" selection-end-line="1198" selection-end-column="47" />
<folding>
<element signature="e#853#867#0" expanded="true" />
<element signature="e#4062#4301#0" expanded="false" />
<element signature="e#4325#4577#0" expanded="false" />
<element signature="e#4944#5340#0" expanded="false" />
<element signature="e#5661#5743#0" expanded="false" />
<element signature="e#5780#6299#0" expanded="false" />
<element signature="e#6323#6589#0" expanded="false" />
<element signature="e#6614#7160#0" expanded="false" />
<element signature="e#7536#7632#0" expanded="false" />
<element signature="e#7679#7810#0" expanded="false" />
<element signature="e#8094#8133#0" expanded="false" />
<element signature="e#8166#9130#0" expanded="false" />
<element signature="e#9175#9405#0" expanded="false" />
<element signature="e#9438#10023#0" expanded="false" />
<element signature="e#10052#10129#0" expanded="false" />
<element signature="e#10167#10224#0" expanded="false" />
<element signature="e#10252#10614#0" expanded="false" />
<element signature="e#10654#11204#0" expanded="false" />
<element signature="e#11232#12674#0" expanded="false" />
<element signature="e#12696#12792#0" expanded="false" />
<element signature="e#12822#13366#0" expanded="false" />
<element signature="e#61961#62706#0" expanded="false" />
<element signature="e#62748#63442#0" expanded="false" />
<element signature="e#63469#64496#0" expanded="false" />
<element signature="e#65570#66860#0" expanded="false" />
<element signature="e#66891#67437#0" expanded="false" />
<element signature="e#67464#67643#0" expanded="false" />
<element signature="e#67668#67837#0" expanded="false" />
<element signature="e#67866#68123#0" expanded="false" />
<element signature="e#68151#68390#0" expanded="false" />
<element signature="e#68419#68748#0" expanded="false" />
<element signature="e#68780#70311#0" expanded="false" />
<element signature="e#70355#73390#0" expanded="false" />
<element signature="e#73420#73860#0" expanded="false" />
<element signature="e#73892#74149#0" expanded="false" />
<element signature="e#74616#74742#0" expanded="false" />
</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 relative-caret-position="96"> <state relative-caret-position="1836">
<caret line="1100" column="0" selection-start-line="1100" selection-start-column="0" selection-end-line="1100" selection-end-column="0" /> <caret line="1100" column="0" selection-start-line="1100" selection-start-column="0" selection-end-line="1100" selection-end-column="0" />
<folding> <folding>
<element signature="e#24#856#1" expanded="false" /> <element signature="e#24#856#1" expanded="false" />
@ -2348,5 +2331,99 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/functions.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="89">
<caret line="1181" column="67" selection-start-line="1181" selection-start-column="67" selection-end-line="1181" selection-end-column="67" />
<folding>
<element signature="e#853#867#0" expanded="true" />
<element signature="e#4062#4301#0" expanded="false" />
<element signature="e#4325#4577#0" expanded="false" />
<element signature="e#4944#5340#0" expanded="false" />
<element signature="e#5661#5743#0" expanded="false" />
<element signature="e#5780#6299#0" expanded="false" />
<element signature="e#6323#6589#0" expanded="false" />
<element signature="e#6614#7160#0" expanded="false" />
<element signature="e#7536#7632#0" expanded="false" />
<element signature="e#7679#7810#0" expanded="false" />
<element signature="e#8094#8133#0" expanded="false" />
<element signature="e#8166#9130#0" expanded="false" />
<element signature="e#9175#9405#0" expanded="false" />
<element signature="e#9438#10023#0" expanded="false" />
<element signature="e#10052#10129#0" expanded="false" />
<element signature="e#10167#10224#0" expanded="false" />
<element signature="e#10252#10614#0" expanded="false" />
<element signature="e#10654#11204#0" expanded="false" />
<element signature="e#11232#12674#0" expanded="false" />
<element signature="e#12696#12792#0" expanded="false" />
<element signature="e#12822#13366#0" expanded="false" />
<element signature="e#61961#62706#0" expanded="false" />
<element signature="e#62748#63442#0" expanded="false" />
<element signature="e#63469#64496#0" expanded="false" />
<element signature="e#65570#66860#0" expanded="false" />
<element signature="e#66891#67437#0" expanded="false" />
<element signature="e#67464#67643#0" expanded="false" />
<element signature="e#67668#67837#0" expanded="false" />
<element signature="e#67866#68123#0" expanded="false" />
<element signature="e#68151#68390#0" expanded="false" />
<element signature="e#68419#68748#0" expanded="false" />
<element signature="e#68780#70311#0" expanded="false" />
<element signature="e#70355#73390#0" expanded="false" />
<element signature="e#73420#73860#0" expanded="false" />
<element signature="e#73892#74149#0" expanded="false" />
<element signature="e#74616#74742#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Inposloader.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="837">
<caret line="235" column="68" selection-start-line="235" selection-start-column="68" selection-end-line="235" selection-end-column="68" />
<folding>
<element signature="e#28187#29903#0" expanded="false" />
<element signature="e#29632#29903#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Content.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/contenters/KinoPoisk.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="73" column="19" selection-start-line="73" selection-start-column="19" selection-end-line="73" selection-end-column="36" />
<folding>
<element signature="e#783#792#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/contenters/CXZ.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="74" column="36" selection-start-line="74" selection-start-column="36" selection-end-line="74" selection-end-column="36" />
<folding>
<element signature="e#783#792#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/contenters/IMDB.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="58" column="45" selection-start-line="58" selection-start-column="45" selection-end-line="58" selection-end-column="45" />
<folding>
<element signature="e#783#792#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
</project> </project>

View File

@ -370,6 +370,7 @@ class AnteoPlayer(xbmc.Player):
keep_files = True keep_files = True
resume_file=os.path.join(self.userStorageDirectory, 'torrents', os.path.basename(self.torrentUrl)+'.resume_data') resume_file=os.path.join(self.userStorageDirectory, 'torrents', os.path.basename(self.torrentUrl)+'.resume_data')
enable_dht = self.__settings__.getSetting("enable_dht") == 'true'
dht_routers = ["router.bittorrent.com:6881","router.utorrent.com:6881"] dht_routers = ["router.bittorrent.com:6881","router.utorrent.com:6881"]
user_agent = 'uTorrent/2200(24683)' user_agent = 'uTorrent/2200(24683)'
self.pre_buffer_bytes = int(self.__settings__.getSetting("pre_buffer_bytes"))*1024*1024 self.pre_buffer_bytes = int(self.__settings__.getSetting("pre_buffer_bytes"))*1024*1024
@ -378,7 +379,7 @@ class AnteoPlayer(xbmc.Player):
connections_limit=connections_limit, download_kbps=download_limit, upload_kbps=upload_limit, connections_limit=connections_limit, download_kbps=download_limit, upload_kbps=upload_limit,
encryption=encryption, keep_complete=keep_complete, keep_incomplete=keep_incomplete, encryption=encryption, keep_complete=keep_complete, keep_incomplete=keep_incomplete,
dht_routers=dht_routers, use_random_port=use_random_port, listen_port=listen_port, dht_routers=dht_routers, use_random_port=use_random_port, listen_port=listen_port,
keep_files=keep_files, user_agent=user_agent, resume_file=resume_file) keep_files=keep_files, user_agent=user_agent, resume_file=resume_file, enable_dht=enable_dht)
def buffer(self): def buffer(self):
#self.pre_buffer_bytes = 30*1024*1024 #30 MB #self.pre_buffer_bytes = 30*1024*1024 #30 MB

View File

@ -26,6 +26,7 @@ import re
from StringIO import StringIO from StringIO import StringIO
import gzip import gzip
import HTMLParser import HTMLParser
from datetime import date
import Localization import Localization
from functions import log, debug from functions import log, debug
@ -89,7 +90,7 @@ class Content:
} }
} }
for y in range(2015, 1970, -1): for y in range(date.today().year, 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, apps_property=None): def get_contentList(self, category, subcategory=None, apps_property=None):

34
Core.py
View File

@ -909,7 +909,7 @@ class Core:
kinometa = self.Scraper.scraper(scraper, {'label': title, 'search': search, kinometa = self.Scraper.scraper(scraper, {'label': title, 'search': search,
'year': year}, self.language) 'year': year}, self.language)
#print 'kinometa:'+str(kinometa) log('kinometa:'+str(kinometa))
for section in kinometa.keys(): for section in kinometa.keys():
if isinstance(kinometa[section], dict): if isinstance(kinometa[section], dict):
@ -935,7 +935,13 @@ class Core:
else: else:
title = meta.get('info').get('title') title = meta.get('info').get('title')
listitem = xbmcgui.ListItem(title, iconImage=img, thumbnailImage=img) listitem = xbmcgui.ListItem(title)
images = {'thumb': img, #'icon': img,
'poster': img,# 'banner': img,
#'fanart': img, 'landscape': img,
# 'clearart': image, 'clearlogo': image,
}
listitem.setArt(images)
listitem.setInfo(type='Video', infoLabels=info) listitem.setInfo(type='Video', infoLabels=info)
if meta: if meta:
listitem=itemScrap(listitem, meta) listitem=itemScrap(listitem, meta)
@ -1102,7 +1108,29 @@ class Core:
def drawItem(self, title, action, link='', image='', isFolder=True, contextMenu=None, replaceMenu=True, action2='', fileSize=0L, def drawItem(self, title, action, link='', image='', isFolder=True, contextMenu=None, replaceMenu=True, action2='', fileSize=0L,
info={}): info={}):
#log('[drawItem]:'+str((title, action, image, isFolder, contextMenu, replaceMenu, action2, info))) #log('[drawItem]:'+str((title, action, image, isFolder, contextMenu, replaceMenu, action2, info)))
listitem = xbmcgui.ListItem(title, iconImage=image, thumbnailImage=image) listitem = xbmcgui.ListItem(title)
images = {'icon':image, 'thumb':image}
images = {'icon': image, 'thumb': image,
'poster': image, 'banner': image,
'fanart': image, 'landscape': image,
#'clearart': image, 'clearlogo': image,
}
listitem.setArt(images)
"""
setArt(values) -- Sets the listitem's art
values : dictionary - pairs of { label: value }.
- Some default art values (any string possible):
- thumb : string - image filename
- poster : string - image filename
- banner : string - image filename
- fanart : string - image filename
- clearart : string - image filename
- clearlogo : string - image filename
- landscape : string - image filename
- icon : string - image filename
example:
- self.list.getSelectedItem().setArt({ 'poster': 'poster.png', 'banner' : 'banner.png' })
"""
if not info: info = {"Title": title, "plot": title} if not info: info = {"Title": title, "plot": title}
if not isFolder and fileSize: if not isFolder and fileSize:
info['size'] = fileSize info['size'] = fileSize

View File

@ -137,13 +137,14 @@ class InposLoader:
keep_complete = True keep_complete = True
keep_incomplete = True keep_incomplete = True
enable_dht = self.__settings__.getSetting("enable_dht") == 'true'
dht_routers = ["router.bittorrent.com:6881", "router.utorrent.com:6881"] dht_routers = ["router.bittorrent.com:6881", "router.utorrent.com:6881"]
user_agent = 'uTorrent/2200(24683)' user_agent = 'uTorrent/2200(24683)'
self.engine = Engine(uri=file_url(self.torrentFile), download_path=self.storageDirectory, self.engine = Engine(uri=file_url(self.torrentFile), download_path=self.storageDirectory,
connections_limit=connections_limit, connections_limit=connections_limit,
encryption=encryption, keep_complete=keep_complete, keep_incomplete=keep_incomplete, encryption=encryption, keep_complete=keep_complete, keep_incomplete=keep_incomplete,
dht_routers=dht_routers, use_random_port=use_random_port, listen_port=listen_port, dht_routers=dht_routers, use_random_port=use_random_port, listen_port=listen_port,
user_agent=user_agent) user_agent=user_agent, enable_dht=enable_dht)
def localize(self, string): def localize(self, string):
try: try:

View File

@ -46,6 +46,7 @@ class SkorbaLoader:
lt = None lt = None
save_resume_data = None save_resume_data = None
__settings__ = sys.modules["__main__"].__settings__ __settings__ = sys.modules["__main__"].__settings__
enable_dht = __settings__.getSetting("enable_dht") == 'true'
def __init__(self, storageDirectory='', torrentFile='', torrentFilesDirectory='torrents'): def __init__(self, storageDirectory='', torrentFile='', torrentFilesDirectory='torrents'):
self.storageDirectory = storageDirectory self.storageDirectory = storageDirectory
@ -163,7 +164,7 @@ class SkorbaLoader:
iterator = 0 iterator = 0
while iterator < 100: while iterator < 100:
xbmc.sleep(500) xbmc.sleep(500)
self.torrentHandle.force_dht_announce() if self.enable_dht: self.torrentHandle.force_dht_announce()
progressBar.update(iterator, Localization.localize('Please Wait'), Localization.localize('Magnet-link is converting')+'.' * (iterator % 4), ' ') progressBar.update(iterator, Localization.localize('Please Wait'), Localization.localize('Magnet-link is converting')+'.' * (iterator % 4), ' ')
iterator += 1 iterator += 1
if progressBar.iscanceled(): if progressBar.iscanceled():
@ -188,10 +189,9 @@ class SkorbaLoader:
if torrentInfo: if torrentInfo:
try: try:
torrentFile = self.lt.create_torrent(torrentInfo) torrentFile = self.lt.create_torrent(torrentInfo)
baseName = os.path.basename(self.storageDirectory + os.sep + torrentInfo.files()[0].path)
if not xbmcvfs.exists(self.torrentFilesPath): if not xbmcvfs.exists(self.torrentFilesPath):
xbmcvfs.mkdirs(self.torrentFilesPath) xbmcvfs.mkdirs(self.torrentFilesPath)
self.torrentFile = self.torrentFilesPath + self.md5(baseName) + '.torrent' self.torrentFile = self.torrentFilesPath + self.md5(magnet) + '.torrent'
torentFileHandler = xbmcvfs.File(self.torrentFile, "w+b") torentFileHandler = xbmcvfs.File(self.torrentFile, "w+b")
torentFileHandler.write(self.lt.bencode(torrentFile.generate())) torentFileHandler.write(self.lt.bencode(torrentFile.generate()))
torentFileHandler.close() torentFileHandler.close()
@ -340,9 +340,10 @@ class SkorbaLoader:
self.session = self.lt.session() self.session = self.lt.session()
self.session.set_alert_mask(self.lt.alert.category_t.error_notification | self.lt.alert.category_t.status_notification | self.lt.alert.category_t.storage_notification) self.session.set_alert_mask(self.lt.alert.category_t.error_notification | self.lt.alert.category_t.status_notification | self.lt.alert.category_t.storage_notification)
#self.session.set_alert_mask(self.lt.alert.category_t.all_categories) #self.session.set_alert_mask(self.lt.alert.category_t.all_categories)
self.session.add_dht_router("router.bittorrent.com", 6881) if self.enable_dht:
self.session.add_dht_router("router.utorrent.com", 6881) self.session.add_dht_router("router.bittorrent.com", 6881)
self.session.start_dht() self.session.add_dht_router("router.utorrent.com", 6881)
self.session.start_dht()
self.session.start_lsd() self.session.start_lsd()
self.session.start_upnp() self.session.start_upnp()
self.session.start_natpmp() self.session.start_natpmp()
@ -482,7 +483,7 @@ class SkorbaLoader:
self.session.stop_natpmp() self.session.stop_natpmp()
self.session.stop_upnp() self.session.stop_upnp()
self.session.stop_lsd() self.session.stop_lsd()
self.session.stop_dht() if self.enable_dht: self.session.stop_dht()
def resume_data(self): def resume_data(self):
wasPaused=self.session.is_paused() wasPaused=self.session.is_paused()

View File

@ -22,7 +22,7 @@ import re
import Content import Content
from BeautifulSoup import BeautifulSoup from BeautifulSoup import BeautifulSoup
from datetime import date
def make_category_dict(): def make_category_dict():
category_dict = { category_dict = {
@ -72,7 +72,7 @@ def make_category_dict():
x[0], x[1] + 'view=list', {'page': x[1] + 'view=list&page=%d', 'increase': 1, 'second_page': 1}) x[0], x[1] + 'view=list', {'page': x[1] + 'view=list&page=%d', 'increase': 1, 'second_page': 1})
category_dict['year'] = {'year': 'by Year', } category_dict['year'] = {'year': 'by Year', }
for y in range(2015, 1970, -1): for y in range(date.today().year, 1970, -1):
category_dict['year'][str(y)] = (str(y), '/films/year/%s/' % str(y), category_dict['year'][str(y)] = (str(y), '/films/year/%s/' % str(y),
{'page': '/films/year/%s/' % str(y) + '?view=list&page=%d', 'increase': 1, {'page': '/films/year/%s/' % str(y) + '?view=list&page=%d', 'increase': 1,
'second_page': 1}) 'second_page': 1})

View File

@ -23,6 +23,7 @@ import HTMLParser
import Content import Content
from BeautifulSoup import BeautifulSoup from BeautifulSoup import BeautifulSoup
from datetime import date
class IMDB(Content.Content): class IMDB(Content.Content):
@ -65,7 +66,7 @@ class IMDB(Content.Content):
} }
} }
for y in range(2015, 1970, -1): for y in range(date.today().year, 1970, -1):
category_dict['year'][str(y)] = (str(y), '/year/%s/' % str(y)) category_dict['year'][str(y)] = (str(y), '/year/%s/' % str(y))
regex_list = [] regex_list = []

View File

@ -20,6 +20,7 @@
import re import re
import socket import socket
from datetime import date
import Content import Content
from BeautifulSoup import BeautifulSoup from BeautifulSoup import BeautifulSoup
@ -70,7 +71,7 @@ class KinoPoisk(Content.Content):
x[0], x[1] + 'perpage/25/', {'page': x[1] + 'perpage/25/page/%d/', 'increase': 1, 'second_page': 2}) x[0], x[1] + 'perpage/25/', {'page': x[1] + 'perpage/25/page/%d/', 'increase': 1, 'second_page': 2})
category_dict['year'] = {'year': 'by Year', } category_dict['year'] = {'year': 'by Year', }
for y in range(2015, 1970, -1): for y in range(date.today().year, 1970, -1):
category_dict['year'][str(y)] = (str(y), '/s/type/film/list/1/m_act[year]/%s/' % str(y) + 'perpage/25/', category_dict['year'][str(y)] = (str(y), '/s/type/film/list/1/m_act[year]/%s/' % str(y) + 'perpage/25/',
{'page': '/s/type/film/list/1/m_act[year]/%s/' % str(y) + 'perpage/25/page/%d/', {'page': '/s/type/film/list/1/m_act[year]/%s/' % str(y) + 'perpage/25/page/%d/',
'increase': 1, 'second_page': 2}) 'increase': 1, 'second_page': 2})

View File

@ -67,6 +67,7 @@
<string id="30067">Aeon Nox (by joyrider)</string> <string id="30067">Aeon Nox (by joyrider)</string>
<string id="30068">pyrrent2http (python-libtorrent via http)</string> <string id="30068">pyrrent2http (python-libtorrent via http)</string>
<string id="30069">Append size to file name</string> <string id="30069">Append size to file name</string>
<string id="30070">Enable DHT</string>
<string id="30101">Interface</string> <string id="30101">Interface</string>
<string id="30102">P2P Network</string> <string id="30102">P2P Network</string>
<string id="30103">Advanced</string> <string id="30103">Advanced</string>

View File

@ -67,6 +67,7 @@
<string id="30067">Aeon Nox (от joyrider)</string> <string id="30067">Aeon Nox (от joyrider)</string>
<string id="30068">pyrrent2http (python-libtorrent по http)</string> <string id="30068">pyrrent2http (python-libtorrent по http)</string>
<string id="30069">Добавлять размер к имени файла</string> <string id="30069">Добавлять размер к имени файла</string>
<string id="30070">Включить DHT</string>
<string id="30101">Интерфейс</string> <string id="30101">Интерфейс</string>
<string id="30102">P2P Сеть</string> <string id="30102">P2P Сеть</string>
<string id="30103">Дополнительные</string> <string id="30103">Дополнительные</string>

View File

@ -69,6 +69,7 @@
<setting id="min_storage_size" type="slider" label="30059" default="0" visible="!eq(-5,1)" range="0,2,100" option="int"/> <setting id="min_storage_size" type="slider" label="30059" default="0" visible="!eq(-5,1)" range="0,2,100" option="int"/>
<setting id="pause_onplay" type="bool" label="30060" default="false" visible="!eq(-6,1)"/> <setting id="pause_onplay" type="bool" label="30060" default="false" visible="!eq(-6,1)"/>
<setting id="max_history_add" type="slider" label="30065" default="100" visible="!eq(-7,1)" range="0,2,100" option="int"/> <setting id="max_history_add" type="slider" label="30065" default="100" visible="!eq(-7,1)" range="0,2,100" option="int"/>
<setting id="enable_dht" type="bool" label="30070" default="true" visible="!eq(-8,1)"/>
<setting id="append_filesize" type="bool" label="30069" default="true"/> <setting id="append_filesize" type="bool" label="30069" default="true"/>
</category> </category>
</settings> </settings>