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

fixes

pull/1/head
DiMartinoXBMC 2016-02-24 19:48:46 +03:00
parent 6dd04e5229
commit 16cc3c5aa2
7 changed files with 207 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

443
.idea/workspace.xml
View File

@ -3,8 +3,12 @@
<component name="ChangeListManager">
<list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/changelog.txt" afterPath="$PROJECT_DIR$/changelog.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/scrapers/tmdbs.py" afterPath="$PROJECT_DIR$/resources/scrapers/tmdbs.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Core.py" afterPath="$PROJECT_DIR$/Core.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/RiperAM.py" afterPath="$PROJECT_DIR$/resources/contenters/RiperAM.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/language/English/strings.xml" afterPath="$PROJECT_DIR$/resources/language/English/strings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/language/Russian/strings.xml" afterPath="$PROJECT_DIR$/resources/language/Russian/strings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/scrapers/kinopoisk/LOGGER.py" afterPath="$PROJECT_DIR$/resources/scrapers/kinopoisk/LOGGER.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/settings.xml" afterPath="$PROJECT_DIR$/resources/settings.xml" />
</list>
<ignored path="plugin.video.torrenter.iws" />
<ignored path=".idea/workspace.xml" />
@ -34,11 +38,11 @@
<splitter split-orientation="horizontal" split-proportion="0.5145808">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="functions.py" pinned="false" current-in-tab="false">
<file leaf-file-name="functions.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/functions.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="1424" column="19" selection-start-line="1424" selection-start-column="19" selection-end-line="1424" selection-end-column="19" />
<state vertical-scroll-proportion="0.7111111">
<caret line="850" column="0" selection-start-line="850" selection-start-column="0" selection-end-line="850" selection-end-column="0" />
<folding>
<element signature="e#853#867#0" expanded="true" />
<element signature="e#4115#4354#0" expanded="false" />
@ -79,14 +83,11 @@
<element signature="e#26262#27001#0" expanded="false" />
<element signature="e#27036#27322#0" expanded="false" />
<element signature="e#27355#27553#0" expanded="false" />
<element signature="e#27574#29721#0" expanded="false" />
<element signature="e#27615#28030#0" expanded="false" />
<element signature="e#28064#28621#0" expanded="false" />
<element signature="e#28659#28845#0" expanded="false" />
<element signature="e#28878#29138#0" expanded="false" />
<element signature="e#29172#29358#0" expanded="false" />
<element signature="e#29399#29538#0" expanded="false" />
<element signature="e#29572#29649#0" expanded="false" />
<element signature="e#29681#29721#0" expanded="false" />
<element signature="e#29875#30065#0" expanded="false" />
<element signature="e#30099#30285#0" expanded="false" />
@ -242,10 +243,10 @@
</provider>
</entry>
</file>
<file leaf-file-name="changelog.txt" pinned="false" current-in-tab="true">
<file leaf-file-name="changelog.txt" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/changelog.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.4054054">
<state vertical-scroll-proportion="0.0">
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding />
</state>
@ -255,8 +256,8 @@
<file leaf-file-name="settings.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/settings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="69" column="33" selection-start-line="69" selection-start-column="21" selection-end-line="69" selection-end-column="33" />
<state vertical-scroll-proportion="-19.615385">
<caret line="30" column="15" selection-start-line="30" selection-start-column="15" selection-end-line="30" selection-end-column="15" />
<folding />
</state>
</provider>
@ -265,28 +266,8 @@
<file leaf-file-name="strings.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/language/English/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="59" column="4" selection-start-line="59" selection-start-column="4" selection-end-line="59" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="pageparser.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/scrapers/kinopoisk/pageparser.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="LOGGER.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/scrapers/kinopoisk/LOGGER.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="28" column="11" selection-start-line="28" selection-start-column="11" selection-end-line="28" selection-end-column="11" />
<state vertical-scroll-proportion="-7.0545454">
<caret line="61" column="31" selection-start-line="61" selection-start-column="31" selection-end-line="61" selection-end-column="31" />
<folding />
</state>
</provider>
@ -328,16 +309,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="tmdbs.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/scrapers/tmdbs.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.28333333">
<caret line="21" column="56" selection-start-line="21" selection-start-column="56" selection-end-line="21" selection-end-column="56" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SearcherABC.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/SearcherABC.py">
<provider selected="true" editor-type-id="text-editor">
@ -348,30 +319,20 @@
</provider>
</entry>
</file>
<file leaf-file-name="controlcenter.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/controlcenter.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Core.py" pinned="false" current-in-tab="false">
<file leaf-file-name="Core.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Core.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="1372" column="0" selection-start-line="1372" selection-start-column="0" selection-end-line="1372" selection-end-column="0" />
<state vertical-scroll-proportion="0.5856905">
<caret line="650" column="0" selection-start-line="650" selection-start-column="0" selection-end-line="650" selection-end-column="0" />
<folding>
<element signature="e#24#856#1" expanded="false" />
<element signature="e#1798#2092#0" expanded="false" />
<element signature="e#2129#6152#0" expanded="false" />
<element signature="e#6191#18156#0" expanded="false" />
<element signature="e#18197#22094#0" expanded="false" />
<element signature="e#22145#29228#0" expanded="false" />
<element signature="e#29272#33252#0" expanded="false" />
<element signature="e#33303#37806#0" expanded="false" />
<element signature="e#37847#39074#0" expanded="false" />
<element signature="e#39174#43528#0" expanded="false" />
<element signature="e#43576#45664#0" expanded="false" />
<element signature="e#45706#47436#0" expanded="false" />
@ -386,43 +347,31 @@
<element signature="e#66693#75338#0" expanded="false" />
<element signature="e#75487#76267#0" expanded="false" />
<element signature="e#76317#78803#0" expanded="false" />
<element signature="e#78848#80048#0" expanded="false" />
<element signature="e#80096#81913#0" expanded="false" />
<element signature="e#81958#82830#0" expanded="false" />
<element signature="e#82875#83544#0" expanded="false" />
<element signature="e#83592#87170#0" expanded="false" />
<element signature="e#87218#88461#0" expanded="false" />
<element signature="e#88511#88607#0" expanded="false" />
<element signature="e#88668#93994#0" expanded="false" />
<element signature="e#94038#94095#0" expanded="false" />
<element signature="e#94149#97387#0" expanded="false" />
<element signature="e#97442#99077#0" expanded="false" />
<element signature="e#99143#99763#0" expanded="false" />
<element signature="e#99806#100790#0" expanded="false" />
<element signature="e#100832#101608#0" expanded="false" />
<element signature="e#101650#101745#0" expanded="false" />
<element signature="e#101795#101943#0" expanded="false" />
<element signature="e#101989#102338#0" expanded="false" />
<element signature="e#88778#88874#0" expanded="false" />
<element signature="e#88935#94261#0" expanded="false" />
<element signature="e#94305#94362#0" expanded="false" />
<element signature="e#94416#97654#0" expanded="false" />
<element signature="e#97709#99344#0" expanded="false" />
<element signature="e#99410#100030#0" expanded="false" />
<element signature="e#100073#101057#0" expanded="false" />
<element signature="e#101099#101875#0" expanded="false" />
<element signature="e#101917#102012#0" expanded="false" />
<element signature="e#102062#102210#0" expanded="false" />
<element signature="e#102256#102605#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Downloader.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Downloader.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="strings.xml" pinned="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">
<caret line="60" column="41" selection-start-line="60" selection-start-column="41" selection-end-line="60" selection-end-column="41" />
<state vertical-scroll-proportion="-10.807693">
<caret line="62" column="37" selection-start-line="62" selection-start-column="37" selection-end-line="62" selection-end-column="37" />
<folding />
</state>
</provider>
@ -460,12 +409,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/../torrenter.searcher.ThePirateBay/ThePirateBay.py" />
<option value="$PROJECT_DIR$/../torrenter.searcher.EZTV/changelog.txt" />
<option value="$PROJECT_DIR$/../torrenter.searcher.EZTV/addon.xml" />
<option value="$PROJECT_DIR$/../torrenter.searcher.EZTV/EZTV.py" />
<option value="$PROJECT_DIR$/../torrenter.searcher.Monova/Monova.py" />
<option value="$PROJECT_DIR$/../torrenter.searcher.ExtraTorrent/ExtraTorrent.py" />
<option value="$PROJECT_DIR$/../torrenter.searcher.ExtraTorrent/changelog.txt" />
<option value="$PROJECT_DIR$/../torrenter.searcher.ExtraTorrent/addon.xml" />
<option value="$PROJECT_DIR$/../torrenter.searcher.ExtraTorrent/resources/settings.xml" />
@ -503,14 +446,20 @@
<option value="$PROJECT_DIR$/Libtorrent.py" />
<option value="$PROJECT_DIR$/addon.xml" />
<option value="$PROJECT_DIR$/functions.py" />
<option value="$PROJECT_DIR$/Core.py" />
<option value="$PROJECT_DIR$/resources/language/English/strings.xml" />
<option value="$PROJECT_DIR$/resources/settings.xml" />
<option value="$PROJECT_DIR$/resources/language/Russian/strings.xml" />
<option value="$PROJECT_DIR$/Anteoloader.py" />
<option value="$PROJECT_DIR$/Player.py" />
<option value="$PROJECT_DIR$/changelog.txt" />
<option value="$PROJECT_DIR$/resources/scrapers/tmdbs.py" />
<option value="$PROJECT_DIR$/resources/settings.xml" />
<option value="$PROJECT_DIR$/resources/language/Russian/strings.xml" />
<option value="$PROJECT_DIR$/resources/language/English/strings.xml" />
<option value="$PROJECT_DIR$/../torrenter.searcher.RiperAM/RiperAM.py" />
<option value="$PROJECT_DIR$/../torrenter.searcher.RiperAM/changelog.txt" />
<option value="$PROJECT_DIR$/../torrenter.searcher.RiperAM/addon.xml" />
<option value="$PROJECT_DIR$/Core.py" />
<option value="$PROJECT_DIR$/../torrenter.searcher.RiperAM/resources/settings.xml" />
<option value="$PROJECT_DIR$/resources/scrapers/kinopoisk/LOGGER.py" />
<option value="$PROJECT_DIR$/resources/contenters/RiperAM.py" />
</list>
</option>
</component>
@ -545,6 +494,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@ -577,28 +527,9 @@
<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="scrapers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@ -780,12 +711,6 @@
<option name="number" value="Default" />
<updated>1420801533300</updated>
</task>
<task id="LOCAL-00134" summary="time add">
<created>1440927124367</created>
<option name="number" value="00134" />
<option name="project" value="LOCAL" />
<updated>1440927124367</updated>
</task>
<task id="LOCAL-00135" summary="kickass fix">
<created>1443285528050</created>
<option name="number" value="00135" />
@ -1074,18 +999,24 @@
<option name="project" value="LOCAL" />
<updated>1455384796938</updated>
</task>
<option name="localTasksCounter" value="183" />
<task id="LOCAL-00183" summary="tmdb fix">
<created>1456153123745</created>
<option name="number" value="00183" />
<option name="project" value="LOCAL" />
<updated>1456153123747</updated>
</task>
<option name="localTasksCounter" value="184" />
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13277134" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13277134" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925472" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32739422" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26837417" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26807564" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="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" />
@ -1115,7 +1046,6 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="seeding fix" />
<MESSAGE value="torr client fix" />
<MESSAGE value="icon fix and dl libtorr fix" />
<MESSAGE value="magnet fix" />
@ -1140,7 +1070,8 @@
<MESSAGE value="index" />
<MESSAGE value="fixes" />
<MESSAGE value="new settings" />
<option name="LAST_COMMIT_MESSAGE" value="new settings" />
<MESSAGE value="tmdb fix" />
<option name="LAST_COMMIT_MESSAGE" value="tmdb fix" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@ -1149,41 +1080,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.ExtraTorrent/changelog.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.019517796">
<caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.ExtraTorrent/resources/settings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.12071006">
<caret line="6" column="79" selection-start-line="6" selection-start-column="79" selection-end-line="6" selection-end-column="79" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.ExtraTorrent/addon.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.40236688">
<caret line="20" column="31" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.TFileME/changelog.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.019517796">
<caret line="1" column="8" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.TFileME/addon.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.020118343">
<caret line="1" column="53" selection-start-line="1" selection-start-column="53" selection-end-line="1" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.TFileME/TFileME.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.35591274">
@ -1366,22 +1262,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/scrapers/kinopoisk/pageparser.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/scrapers/kinopoisk/LOGGER.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="28" column="11" selection-start-line="28" selection-start-column="11" selection-end-line="28" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Downloader.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
@ -1477,78 +1357,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Core.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="1372" column="0" selection-start-line="1372" selection-start-column="0" selection-end-line="1372" selection-end-column="0" />
<folding>
<element signature="e#24#856#1" expanded="false" />
<element signature="e#1798#2092#0" expanded="false" />
<element signature="e#2129#6152#0" expanded="false" />
<element signature="e#6191#18156#0" expanded="false" />
<element signature="e#22145#29228#0" expanded="false" />
<element signature="e#29272#33252#0" expanded="false" />
<element signature="e#33303#37806#0" expanded="false" />
<element signature="e#37847#39074#0" expanded="false" />
<element signature="e#39174#43528#0" expanded="false" />
<element signature="e#43576#45664#0" expanded="false" />
<element signature="e#45706#47436#0" expanded="false" />
<element signature="e#47486#52247#0" expanded="false" />
<element signature="e#52312#58726#0" expanded="false" />
<element signature="e#58790#61300#0" expanded="false" />
<element signature="e#61347#62213#0" expanded="false" />
<element signature="e#62262#64451#0" expanded="false" />
<element signature="e#64608#65967#0" expanded="false" />
<element signature="e#66023#66440#0" expanded="false" />
<element signature="e#66490#66641#0" expanded="false" />
<element signature="e#66693#75338#0" expanded="false" />
<element signature="e#75487#76267#0" expanded="false" />
<element signature="e#76317#78803#0" expanded="false" />
<element signature="e#78848#80048#0" expanded="false" />
<element signature="e#80096#81913#0" expanded="false" />
<element signature="e#81958#82830#0" expanded="false" />
<element signature="e#82875#83544#0" expanded="false" />
<element signature="e#83592#87170#0" expanded="false" />
<element signature="e#87218#88461#0" expanded="false" />
<element signature="e#88511#88607#0" expanded="false" />
<element signature="e#88668#93994#0" expanded="false" />
<element signature="e#94038#94095#0" expanded="false" />
<element signature="e#94149#97387#0" expanded="false" />
<element signature="e#97442#99077#0" expanded="false" />
<element signature="e#99143#99763#0" expanded="false" />
<element signature="e#99806#100790#0" expanded="false" />
<element signature="e#100832#101608#0" expanded="false" />
<element signature="e#101650#101745#0" expanded="false" />
<element signature="e#101795#101943#0" expanded="false" />
<element signature="e#101989#102338#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/language/English/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="59" column="4" selection-start-line="59" selection-start-column="4" selection-end-line="59" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/language/Russian/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="60" column="41" selection-start-line="60" selection-start-column="41" selection-end-line="60" selection-end-column="41" />
<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">
<caret line="69" column="33" selection-start-line="69" selection-start-column="21" selection-end-line="69" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Anteoloader.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
@ -1627,16 +1435,104 @@
</entry>
<entry file="file://$PROJECT_DIR$/resources/scrapers/tmdbs.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.28333333">
<state vertical-scroll-proportion="0.0">
<caret line="21" column="56" selection-start-line="21" selection-start-column="56" selection-end-line="21" selection-end-column="56" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/language/Russian/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-10.807693">
<caret line="62" column="37" selection-start-line="62" selection-start-column="37" selection-end-line="62" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.RiperAM/addon.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.028145695">
<caret line="1" column="53" selection-start-line="1" selection-start-column="53" selection-end-line="1" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.RiperAM/changelog.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.026984127">
<caret line="1" column="27" selection-start-line="1" selection-start-column="27" selection-end-line="1" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.RiperAM/RiperAM.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.45873016">
<caret line="45" column="15" selection-start-line="45" selection-start-column="15" selection-end-line="45" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.RiperAM/resources/settings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.16887417">
<caret line="6" column="72" selection-start-line="6" selection-start-column="72" selection-end-line="6" selection-end-column="72" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/settings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-19.615385">
<caret line="30" column="15" selection-start-line="30" selection-start-column="15" selection-end-line="30" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/contenters/RiperAM.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.75714284">
<caret line="36" column="7" selection-start-line="36" selection-start-column="7" selection-end-line="36" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/scrapers/kinopoisk/LOGGER.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.42429283">
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/scrapers/kinopoisk/pageparser.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/language/English/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.0545454">
<caret line="61" column="31" selection-start-line="61" selection-start-column="31" selection-end-line="61" selection-end-column="31" />
<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">
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/functions.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="1424" column="19" selection-start-line="1424" selection-start-column="19" selection-end-line="1424" selection-end-column="19" />
<state vertical-scroll-proportion="0.7111111">
<caret line="850" column="0" selection-start-line="850" selection-start-column="0" selection-end-line="850" selection-end-column="0" />
<folding>
<element signature="e#853#867#0" expanded="true" />
<element signature="e#4115#4354#0" expanded="false" />
@ -1677,14 +1573,11 @@
<element signature="e#26262#27001#0" expanded="false" />
<element signature="e#27036#27322#0" expanded="false" />
<element signature="e#27355#27553#0" expanded="false" />
<element signature="e#27574#29721#0" expanded="false" />
<element signature="e#27615#28030#0" expanded="false" />
<element signature="e#28064#28621#0" expanded="false" />
<element signature="e#28659#28845#0" expanded="false" />
<element signature="e#28878#29138#0" expanded="false" />
<element signature="e#29172#29358#0" expanded="false" />
<element signature="e#29399#29538#0" expanded="false" />
<element signature="e#29572#29649#0" expanded="false" />
<element signature="e#29681#29721#0" expanded="false" />
<element signature="e#29875#30065#0" expanded="false" />
<element signature="e#30099#30285#0" expanded="false" />
@ -1755,11 +1648,49 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/changelog.txt">
<entry file="file://$PROJECT_DIR$/Core.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.4054054">
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding />
<state vertical-scroll-proportion="0.5856905">
<caret line="650" column="0" selection-start-line="650" selection-start-column="0" selection-end-line="650" selection-end-column="0" />
<folding>
<element signature="e#24#856#1" expanded="false" />
<element signature="e#1798#2092#0" expanded="false" />
<element signature="e#2129#6152#0" expanded="false" />
<element signature="e#6191#18156#0" expanded="false" />
<element signature="e#18197#22094#0" expanded="false" />
<element signature="e#22145#29228#0" expanded="false" />
<element signature="e#29272#33252#0" expanded="false" />
<element signature="e#33303#37806#0" expanded="false" />
<element signature="e#39174#43528#0" expanded="false" />
<element signature="e#43576#45664#0" expanded="false" />
<element signature="e#45706#47436#0" expanded="false" />
<element signature="e#47486#52247#0" expanded="false" />
<element signature="e#52312#58726#0" expanded="false" />
<element signature="e#58790#61300#0" expanded="false" />
<element signature="e#61347#62213#0" expanded="false" />
<element signature="e#62262#64451#0" expanded="false" />
<element signature="e#64608#65967#0" expanded="false" />
<element signature="e#66023#66440#0" expanded="false" />
<element signature="e#66490#66641#0" expanded="false" />
<element signature="e#66693#75338#0" expanded="false" />
<element signature="e#75487#76267#0" expanded="false" />
<element signature="e#76317#78803#0" expanded="false" />
<element signature="e#80096#81913#0" expanded="false" />
<element signature="e#81958#82830#0" expanded="false" />
<element signature="e#82875#83544#0" expanded="false" />
<element signature="e#83592#87170#0" expanded="false" />
<element signature="e#88778#88874#0" expanded="false" />
<element signature="e#88935#94261#0" expanded="false" />
<element signature="e#94305#94362#0" expanded="false" />
<element signature="e#94416#97654#0" expanded="false" />
<element signature="e#97709#99344#0" expanded="false" />
<element signature="e#99410#100030#0" expanded="false" />
<element signature="e#100073#101057#0" expanded="false" />
<element signature="e#101099#101875#0" expanded="false" />
<element signature="e#101917#102012#0" expanded="false" />
<element signature="e#102062#102210#0" expanded="false" />
<element signature="e#102256#102605#0" expanded="false" />
</folding>
</state>
</provider>
</entry>

4
Core.py
View File

@ -1631,7 +1631,11 @@ class Core:
filesList=search(url, searchersList, get('isApi'))
if self.__settings__.getSetting('sort_search')=='true':
self.__settings__.setSetting('sort_search','1')
if int(self.__settings__.getSetting('sort_search'))==0:
filesList = sorted(filesList, key=lambda x: x[0], reverse=True)
elif int(self.__settings__.getSetting('sort_search'))==2:
filesList = sorted(filesList, key=lambda x: x[4], reverse=False)
self.showFilesList(filesList, params)
def controlCenter(self, params={}):

4
resources/contenters/RiperAM.py
View File

@ -28,11 +28,11 @@ class RiperAM(Content.Content):
'hot': ('Most Recent', '/', {'page': '/portal.php?tp=%d', 'increase': 30, 'second_page': 30}),
}
baseurl = "http://www.riper.am"
baseurl = "http://riperam.org"
headers = [('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://www.riper.am/'), ('Accept-Encoding', 'gzip,deflate,sdch'),
('Referer', baseurl+'/'), ('Accept-Encoding', 'gzip,deflate,sdch'),
('Accept-Language', 'ru,en;q=0.8')]
'''
Weight of source with this searcher provided.

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

@ -58,6 +58,10 @@
<string id="30058">Below average PC/router</string>
<string id="30059">Storage minimum size for auto clear (GB)</string>
<string id="30060">Pause video after start</string>
<string id="30061">Sort search results</string>
<string id="30062">by Seeds</string>
<string id="30063">Do not sort</string>
<string id="30064">by Name</string>
<string id="30101">Interface</string>
<string id="30102">P2P Network</string>
<string id="30103">Advanced</string>

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

@ -58,6 +58,10 @@
<string id="30058">Плохой ПК/роутер</string>
<string id="30059">Минимальный размер хранилища для очистки (ГБ)</string>
<string id="30060">Ставить паузу при старте видео</string>
<string id="30061">Сортировать результат поиска</string>
<string id="30062">по Количеству раздающих</string>
<string id="30063">Не сортировать</string>
<string id="30064">по Имени</string>
<string id="30101">Интерфейс</string>
<string id="30102">P2P Сеть</string>
<string id="30103">Дополнительные</string>

10
resources/scrapers/kinopoisk/LOGGER.py
View File

@ -5,9 +5,9 @@ try:
from functions import log, debug
__settings__ = xbmcaddon.Addon("plugin.video.torrenter")
debug = __settings__.getSetting("debug")
force_debug = __settings__.getSetting("debug")
except:
debug = 'true'
force_debug = 'true'
def Log(msg, force=False):
@ -15,15 +15,15 @@ def Log(msg, force=False):
def Debug(msg, force=False):
if debug == 'true' or force:
if force_debug == 'true' or force:
debug(msg, True)
def Info(msg, force=False):
if debug == 'true' or force:
if force_debug == 'true' or force:
debug(msg, True)
def Warn(msg, force=False):
if debug == 'true' or force:
if force_debug == 'true' or force:
debug(msg, True)

2
resources/settings.xml
View File

@ -3,7 +3,7 @@
<setting id="language" type="enum" label="30001" default="1" values="English|Russian|Ukrainian|Hebrew" />
<setting id="metadata" type="bool" label="30014" default="false"/>
<setting id="history" type="bool" label="30020" default="true"/>
<setting id="sort_search" type="bool" label="30039" default="true"/>
<setting id="sort_search" type="enum" label="30061" default="0" lvalues="30062|30063|30064"/>
<setting id="skin_optimization" type="enum" label="30002" default="1" lvalues="30003|30018|30017|30016|30019"/>
<setting id="open_option" type="enum" label="30034" default="0" lvalues="30035|30036|30037|30038"/>
</category>