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

lang fix

pull/1/head
DiMartinoXBMC 2015-06-27 11:16:44 +03:00
parent 9e71e88867
commit 1fd59990e7
6 changed files with 284 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

335
.idea/workspace.xml
View File

@ -1,39 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment="update"> <list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/platform_pulsar.py" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/resources/skins/DialogReviews.py" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\platform.py" afterPath="" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/resources/skins/Default/720p/reviews.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/AceStream.py" afterPath="$PROJECT_DIR$/AceStream.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Core.py" afterPath="$PROJECT_DIR$/Core.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/BeautifulSoup.py" afterPath="$PROJECT_DIR$/BeautifulSoup.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/addon.xml" afterPath="$PROJECT_DIR$/addon.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/skins/DialogXml.py" afterPath="$PROJECT_DIR$/resources/skins/DialogXml.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/changelog.txt" afterPath="$PROJECT_DIR$/changelog.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Downloader.py" afterPath="$PROJECT_DIR$/Downloader.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/EZTV.py" afterPath="$PROJECT_DIR$/resources/contenters/EZTV.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/KickAssSo.py" afterPath="$PROJECT_DIR$/resources/contenters/KickAssSo.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/searchers/unused/KinoZalTV.py" afterPath="$PROJECT_DIR$/resources/searchers/unused/KinoZalTV.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Libtorrent.py" afterPath="$PROJECT_DIR$/Libtorrent.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Player.py" afterPath="$PROJECT_DIR$/Player.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/searchers/RuTrackerOrg.py" afterPath="$PROJECT_DIR$/resources/searchers/RuTrackerOrg.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/SWESUB.py" afterPath="$PROJECT_DIR$/resources/contenters/SWESUB.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/searchers/T411FR.py" afterPath="$PROJECT_DIR$/resources/searchers/T411FR.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/searchers/TFileME.py" afterPath="$PROJECT_DIR$/resources/searchers/TFileME.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/ThePirateBaySe.py" afterPath="$PROJECT_DIR$/resources/contenters/ThePirateBaySe.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/searchers/ThePirateBaySe.py" afterPath="$PROJECT_DIR$/resources/searchers/ThePirateBaySe.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/pyxbmct/addonwindow.py" afterPath="$PROJECT_DIR$/resources/pyxbmct/addonwindow.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/scrapers/cache.py" afterPath="$PROJECT_DIR$/resources/scrapers/cache.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cal.py" afterPath="$PROJECT_DIR$/cal.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/scrapers/kinopoisk/common.py" afterPath="$PROJECT_DIR$/resources/scrapers/kinopoisk/common.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/controlcenter.py" afterPath="$PROJECT_DIR$/controlcenter.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/utorrent/dopal/core.py" afterPath="$PROJECT_DIR$/resources/utorrent/dopal/core.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/functions.py" afterPath="$PROJECT_DIR$/functions.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/scrapers/kinopoisks.py" afterPath="$PROJECT_DIR$/resources/scrapers/kinopoisks.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/scrapers/net.py" afterPath="$PROJECT_DIR$/resources/scrapers/net.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/utorrent/net.py" afterPath="$PROJECT_DIR$/resources/utorrent/net.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/utorrent/dopal/objects.py" afterPath="$PROJECT_DIR$/resources/utorrent/dopal/objects.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/scrapers/kinopoisk/pageparser.py" afterPath="$PROJECT_DIR$/resources/scrapers/kinopoisk/pageparser.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/scrapers/scrapers.py" afterPath="$PROJECT_DIR$/resources/scrapers/scrapers.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/scrapers/kinopoisk/translit.py" afterPath="$PROJECT_DIR$/resources/scrapers/kinopoisk/translit.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/scrapers/requests/utils.py" afterPath="$PROJECT_DIR$/resources/scrapers/requests/utils.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list> </list>
<ignored path="plugin.video.torrenter.iws" /> <ignored path="plugin.video.torrenter.iws" />
@ -63,87 +36,14 @@
<splitter split-orientation="horizontal" split-proportion="0.5"> <splitter split-orientation="horizontal" split-proportion="0.5">
<split-first> <split-first>
<leaf> <leaf>
<file leaf-file-name="Core.py" pinned="false" current-in-tab="false"> <file leaf-file-name="Core.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Core.py"> <entry file="file://$PROJECT_DIR$/Core.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.30144405">
<caret line="1706" column="15" selection-start-line="1706" selection-start-column="15" selection-end-line="1706" selection-end-column="15" /> <caret line="674" column="38" selection-start-line="674" selection-start-column="38" selection-end-line="674" selection-end-column="38" />
<folding> <folding>
<element signature="e#24#781#1" expanded="false" /> <element signature="e#24#781#1" expanded="false" />
<element signature="e#2316#2613#0" expanded="false" /> <element signature="e#2325#2622#0" expanded="false" />
<element signature="e#2650#7284#0" expanded="false" />
<element signature="e#7323#19288#0" expanded="false" />
<element signature="e#19329#20381#0" expanded="false" />
<element signature="e#20432#27447#0" expanded="false" />
<element signature="e#27491#30920#0" expanded="false" />
<element signature="e#30961#32188#0" expanded="false" />
<element signature="e#32288#36642#0" expanded="false" />
<element signature="e#36690#38754#0" expanded="false" />
<element signature="e#38796#40526#0" expanded="false" />
<element signature="e#40576#45315#0" expanded="false" />
<element signature="e#45380#51737#0" expanded="false" />
<element signature="e#51801#54442#0" expanded="false" />
<element signature="e#54489#55300#0" expanded="false" />
<element signature="e#55349#57538#0" expanded="false" />
<element signature="e#57695#58947#0" expanded="false" />
<element signature="e#59003#59420#0" expanded="false" />
<element signature="e#59462#59571#0" expanded="false" />
<element signature="e#59614#59734#0" expanded="false" />
<element signature="e#59784#59935#0" expanded="false" />
<element signature="e#59988#67742#0" expanded="false" />
<element signature="e#67791#67830#0" expanded="false" />
<element signature="e#67879#68669#0" expanded="false" />
<element signature="e#68719#71385#0" expanded="false" />
<element signature="e#71430#72179#0" expanded="false" />
<element signature="e#72227#73723#0" expanded="false" />
<element signature="e#73768#74641#0" expanded="false" />
<element signature="e#74686#75950#0" expanded="false" />
<element signature="e#75998#81770#0" expanded="false" />
<element signature="e#81818#83957#0" expanded="false" />
<element signature="e#84007#84103#0" expanded="false" />
<element signature="e#84166#84693#0" expanded="false" />
<element signature="e#84754#89966#0" expanded="false" />
<element signature="e#90010#90067#0" expanded="false" />
<element signature="e#93942#95873#0" expanded="false" />
<element signature="e#95939#96559#0" expanded="false" />
<element signature="e#96602#97273#0" expanded="false" />
<element signature="e#97309#98098#0" expanded="false" />
<element signature="e#98140#98235#0" expanded="false" />
<element signature="e#98285#98433#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Libtorrent.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Libtorrent.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.9070568">
<caret line="107" column="53" selection-start-line="107" selection-start-column="53" selection-end-line="107" selection-end-column="53" />
<folding>
<element signature="e#24#785#1" expanded="false" />
<element signature="e#801#814#0" expanded="true" />
<element signature="e#1453#3521#1" expanded="false" />
<element signature="e#10280#10412#0" expanded="false" />
<element signature="e#10453#10587#0" expanded="false" />
<element signature="e#10621#10743#0" expanded="false" />
<element signature="e#10777#10899#0" expanded="false" />
<element signature="e#10949#10996#0" expanded="false" />
<element signature="e#11046#11150#0" expanded="false" />
<element signature="e#11872#12042#0" expanded="false" />
<element signature="e#12098#12153#0" expanded="false" />
<element signature="e#12211#12268#0" expanded="false" />
<element signature="e#12305#12484#0" expanded="false" />
<element signature="e#12536#13830#0" expanded="false" />
<element signature="e#13875#14803#0" expanded="false" />
<element signature="e#14840#15334#0" expanded="false" />
<element signature="e#15372#16022#0" expanded="false" />
<element signature="e#16059#16161#0" expanded="false" />
<element signature="e#16253#17426#0" expanded="false" />
<element signature="e#17462#17879#0" expanded="false" />
<element signature="e#17916#18067#0" expanded="false" />
<element signature="e#18098#19239#0" expanded="false" />
<element signature="e#19274#19417#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -153,7 +53,7 @@
<entry file="file://$PROJECT_DIR$/Localization.py"> <entry file="file://$PROJECT_DIR$/Localization.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="244" column="25" selection-start-line="244" selection-start-column="25" selection-end-line="244" selection-end-column="25" /> <caret line="464" column="25" selection-start-line="464" selection-start-column="25" selection-end-line="464" selection-end-column="25" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -173,7 +73,7 @@
<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 vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" /> <caret line="6" column="42" selection-start-line="6" selection-start-column="42" selection-end-line="6" selection-end-column="42" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -328,7 +228,7 @@
<file leaf-file-name="utils.py" pinned="false" current-in-tab="true"> <file leaf-file-name="utils.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/scrapers/requests/utils.py"> <entry file="file://$PROJECT_DIR$/resources/scrapers/requests/utils.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.7607573"> <state vertical-scroll-proportion="0.0">
<caret line="32" column="0" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" /> <caret line="32" column="0" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
<folding> <folding>
<element signature="e#182#192#0" expanded="true" /> <element signature="e#182#192#0" expanded="true" />
@ -396,13 +296,13 @@
<option value="$PROJECT_DIR$/platform_pulsar.py" /> <option value="$PROJECT_DIR$/platform_pulsar.py" />
<option value="$PROJECT_DIR$/platformpulsar.py" /> <option value="$PROJECT_DIR$/platformpulsar.py" />
<option value="$PROJECT_DIR$/platform2.py" /> <option value="$PROJECT_DIR$/platform2.py" />
<option value="$PROJECT_DIR$/changelog.txt" />
<option value="$PROJECT_DIR$/addon.xml" />
<option value="$PROJECT_DIR$/Core.py" />
<option value="$PROJECT_DIR$/Localization.py" /> <option value="$PROJECT_DIR$/Localization.py" />
<option value="$PROJECT_DIR$/platform.py" /> <option value="$PROJECT_DIR$/platform.py" />
<option value="$PROJECT_DIR$/resources/scrapers/requests/utils.py" /> <option value="$PROJECT_DIR$/resources/scrapers/requests/utils.py" />
<option value="$PROJECT_DIR$/Libtorrent.py" /> <option value="$PROJECT_DIR$/Libtorrent.py" />
<option value="$PROJECT_DIR$/changelog.txt" />
<option value="$PROJECT_DIR$/addon.xml" />
<option value="$PROJECT_DIR$/Core.py" />
</list> </list>
</option> </option>
</component> </component>
@ -424,9 +324,6 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectReloadState">
<option name="STATE" value="0" />
</component>
<component name="ProjectView"> <component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1"> <navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages /> <flattenPackages />
@ -440,6 +337,7 @@
<sortByType /> <sortByType />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
@ -472,50 +370,9 @@
<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="scrapers" />
<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_ELEMENT>
<option name="myItemId" value="requests" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" /> <pane id="Scope" />
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -695,12 +552,6 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<updated>1420801533300</updated> <updated>1420801533300</updated>
</task> </task>
<task id="LOCAL-00015" summary="icons">
<created>1421173168540</created>
<option name="number" value="00015" />
<option name="project" value="LOCAL" />
<updated>1421173168540</updated>
</task>
<task id="LOCAL-00016" summary="version bump"> <task id="LOCAL-00016" summary="version bump">
<created>1421173435595</created> <created>1421173435595</created>
<option name="number" value="00016" /> <option name="number" value="00016" />
@ -989,7 +840,13 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1434145575570</updated> <updated>1434145575570</updated>
</task> </task>
<option name="localTasksCounter" value="64" /> <task id="LOCAL-00064" summary="platform fix">
<created>1435089627617</created>
<option name="number" value="00064" />
<option name="project" value="LOCAL" />
<updated>1435089627618</updated>
</task>
<option name="localTasksCounter" value="65" />
<servers /> <servers />
</component> </component>
<component name="TodoView" selected-index="0"> <component name="TodoView" selected-index="0">
@ -1018,24 +875,24 @@
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1319149" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1319149" 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" weight="0.32925472" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32925472" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" 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" weight="0.33" 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" weight="0.3295583" 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="true" weight="0.31030577" 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" weight="0.30804077" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.21493213" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32879817" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32842582" 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" 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" weight="0.1319149" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25226244" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25226244" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.21493213" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2497309" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2497309" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32539684" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32539684" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout> </layout>
</component> </component>
<component name="Vcs.Log.UiProperties"> <component name="Vcs.Log.UiProperties">
@ -1050,7 +907,6 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="sort" />
<MESSAGE value="information kickass update" /> <MESSAGE value="information kickass update" />
<MESSAGE value="skin support update" /> <MESSAGE value="skin support update" />
<MESSAGE value="kickass &amp; piratebay" /> <MESSAGE value="kickass &amp; piratebay" />
@ -1075,7 +931,8 @@
<MESSAGE value="little piece mp4 fix" /> <MESSAGE value="little piece mp4 fix" />
<MESSAGE value="update" /> <MESSAGE value="update" />
<MESSAGE value="magnet, platform" /> <MESSAGE value="magnet, platform" />
<option name="LAST_COMMIT_MESSAGE" value="magnet, platform" /> <MESSAGE value="platform fix" />
<option name="LAST_COMMIT_MESSAGE" value="platform fix" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
@ -1084,6 +941,14 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/resources/searchers/T411FR.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="75" column="0" selection-start-line="75" selection-start-column="0" selection-end-line="77" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/searchers/T411FR.py"> <entry file="file://$PROJECT_DIR$/resources/searchers/T411FR.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
@ -1455,72 +1320,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/addon.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="1" column="66" selection-start-line="1" selection-start-column="66" selection-end-line="1" selection-end-column="66" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/changelog.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding />
</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="1706" column="15" selection-start-line="1706" selection-start-column="15" selection-end-line="1706" selection-end-column="15" />
<folding>
<element signature="e#24#781#1" expanded="false" />
<element signature="e#2316#2613#0" expanded="false" />
<element signature="e#2650#7284#0" expanded="false" />
<element signature="e#7323#19288#0" expanded="false" />
<element signature="e#19329#20381#0" expanded="false" />
<element signature="e#20432#27447#0" expanded="false" />
<element signature="e#27491#30920#0" expanded="false" />
<element signature="e#30961#32188#0" expanded="false" />
<element signature="e#32288#36642#0" expanded="false" />
<element signature="e#36690#38754#0" expanded="false" />
<element signature="e#38796#40526#0" expanded="false" />
<element signature="e#40576#45315#0" expanded="false" />
<element signature="e#45380#51737#0" expanded="false" />
<element signature="e#51801#54442#0" expanded="false" />
<element signature="e#54489#55300#0" expanded="false" />
<element signature="e#55349#57538#0" expanded="false" />
<element signature="e#57695#58947#0" expanded="false" />
<element signature="e#59003#59420#0" expanded="false" />
<element signature="e#59462#59571#0" expanded="false" />
<element signature="e#59614#59734#0" expanded="false" />
<element signature="e#59784#59935#0" expanded="false" />
<element signature="e#59988#67742#0" expanded="false" />
<element signature="e#67791#67830#0" expanded="false" />
<element signature="e#67879#68669#0" expanded="false" />
<element signature="e#68719#71385#0" expanded="false" />
<element signature="e#71430#72179#0" expanded="false" />
<element signature="e#72227#73723#0" expanded="false" />
<element signature="e#73768#74641#0" expanded="false" />
<element signature="e#74686#75950#0" expanded="false" />
<element signature="e#75998#81770#0" expanded="false" />
<element signature="e#81818#83957#0" expanded="false" />
<element signature="e#84007#84103#0" expanded="false" />
<element signature="e#84166#84693#0" expanded="false" />
<element signature="e#84754#89966#0" expanded="false" />
<element signature="e#90010#90067#0" expanded="false" />
<element signature="e#93942#95873#0" expanded="false" />
<element signature="e#95939#96559#0" expanded="false" />
<element signature="e#96602#97273#0" expanded="false" />
<element signature="e#97309#98098#0" expanded="false" />
<element signature="e#98140#98235#0" expanded="false" />
<element signature="e#98285#98433#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/searchers/T411FR.py"> <entry file="file://$PROJECT_DIR$/resources/searchers/T411FR.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
@ -1532,7 +1331,7 @@
<entry file="file://$PROJECT_DIR$/Localization.py"> <entry file="file://$PROJECT_DIR$/Localization.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="244" column="25" selection-start-line="244" selection-start-column="25" selection-end-line="244" selection-end-column="25" /> <caret line="464" column="25" selection-start-line="464" selection-start-column="25" selection-end-line="464" selection-end-column="25" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -1549,7 +1348,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/scrapers/requests/utils.py"> <entry file="file://$PROJECT_DIR$/resources/scrapers/requests/utils.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.7607573"> <state vertical-scroll-proportion="0.0">
<caret line="32" column="0" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" /> <caret line="32" column="0" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
<folding> <folding>
<element signature="e#182#192#0" expanded="true" /> <element signature="e#182#192#0" expanded="true" />
@ -1557,13 +1356,30 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/platform_pulsar.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>
<element signature="e#0#10#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/skins/Default/720p/reviews.xml">
<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$/Libtorrent.py"> <entry file="file://$PROJECT_DIR$/Libtorrent.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.9070568"> <state vertical-scroll-proportion="0.37907377">
<caret line="107" column="53" selection-start-line="107" selection-start-column="53" selection-end-line="107" selection-end-column="53" /> <caret line="30" column="11" selection-start-line="30" selection-start-column="11" selection-end-line="30" selection-end-column="11" />
<folding> <folding>
<element signature="e#24#785#1" expanded="false" /> <element signature="e#24#785#1" expanded="false" />
<element signature="e#801#814#0" expanded="true" />
<element signature="e#1453#3521#1" expanded="false" /> <element signature="e#1453#3521#1" expanded="false" />
<element signature="e#10280#10412#0" expanded="false" /> <element signature="e#10280#10412#0" expanded="false" />
<element signature="e#10453#10587#0" expanded="false" /> <element signature="e#10453#10587#0" expanded="false" />
@ -1589,5 +1405,32 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/addon.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="1" column="66" selection-start-line="1" selection-start-column="66" selection-end-line="1" selection-end-column="66" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/changelog.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="6" column="42" selection-start-line="6" selection-start-column="42" selection-end-line="6" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Core.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.30144405">
<caret line="674" column="38" selection-start-line="674" selection-start-column="38" selection-end-line="674" selection-end-column="38" />
<folding>
<element signature="e#24#781#1" expanded="false" />
<element signature="e#2325#2622#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component> </component>
</project> </project>

2
Core.py
View File

@ -45,7 +45,7 @@ class Core:
torrent_player=__settings__.getSetting("torrent_player") torrent_player=__settings__.getSetting("torrent_player")
history_bool = __settings__.getSetting('history') == 'true' history_bool = __settings__.getSetting('history') == 'true'
open_option = int(__settings__.getSetting('open_option')) open_option = int(__settings__.getSetting('open_option'))
language = {0: 'en', 1: 'ru'}.get(int(__settings__.getSetting("language"))) language = {0: 'en', 1: 'ru', 2: 'ru'}.get(int(__settings__.getSetting("language")))
htmlCodes = ( htmlCodes = (
('&', '&amp;'), ('&', '&amp;'),
('<', '&lt;'), ('<', '&lt;'),

2
addon.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.torrenter" name="Torrenter" version="2.2.8" provider-name="vadim.skorba, DiMartino"> <addon id="plugin.video.torrenter" name="Torrenter" version="2.2.9" provider-name="vadim.skorba, DiMartino">
<requires> <requires>
<import addon="xbmc.python" version="2.1.0"/> <import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.libtorrent"/> <import addon="script.module.libtorrent"/>

6
changelog.txt
View File

@ -1,4 +1,8 @@
[B]Version 2.2.7[/B] [B]Version 2.2.8[/B]
[+] Добавлен Украинский язык (by kharts)
[+] Торрент-клиент: Добавлены иконки торрент-клиентов (by kharts)
[B]Version 2.2.7[/B]
[+] Проигрыватель: User-friendly объяснение причины невозможности стриминга [+] Проигрыватель: User-friendly объяснение причины невозможности стриминга
[+] Торрент-клиент: Исправлено добавление magnet [+] Торрент-клиент: Исправлено добавление magnet

127
resources/skins/Default/720p/reviews.xml 100644
View File

@ -0,0 +1,127 @@
<window>
<coordinates>
<system>1</system>
<posx>240</posx>
<posy>20</posy>
</coordinates>
<include>dialogeffect</include>
<controls>
<control type="group">
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="250">WindowClose</animation>
<control type="image">
<description>background image</description>
<posx>0</posx>
<posy>0</posy>
<width>800</width>
<height>680</height>
<texture border="40">DialogBack.png</texture>
</control>
<control type="image">
<description>Dialog Header image</description>
<posx>40</posx>
<posy>16</posy>
<width>720</width>
<height>40</height>
<texture>dialogheader.png</texture>
</control>
<control type="label" id="1">
<description>header label</description>
<posx>40</posx>
<posy>20</posy>
<width>720</width>
<height>30</height>
<font>font13_title</font>
<label>Отзывы о фильме</label>
<align>center</align>
<aligny>center</aligny>
<textcolor>selected</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="button" id="2">
<description>Close Window button</description>
<posx>710</posx>
<posy>15</posy>
<width>64</width>
<height>32</height>
<label>-</label>
<font>-</font>
<onclick>PreviousMenu</onclick>
<texturefocus>DialogCloseButton-focus.png</texturefocus>
<texturenofocus>DialogCloseButton.png</texturenofocus>
<onleft>10</onleft>
<onright>10</onright>
<onup>10</onup>
<ondown>10</ondown>
<visible>system.getbool(input.enablemouse)</visible>
</control>
<control type="scrollbar" id="60">
<posx>760</posx>
<posy>100</posy>
<width>25</width>
<height>495</height>
<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
<textureslidernib>ScrollBarNib.png</textureslidernib>
<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
<onleft>22</onleft>
<onright>22</onright>
<showonepage>true</showonepage>
<visible>IntegerGreaterThan(Container(32).NumPages,1)</visible>
<orientation>vertical</orientation>
</control>
<control type="image" id="31">
<description>Dialog Header image</description>
<posx>33</posx>
<posy>85</posy>
<width>104</width>
<height>149</height>
<texture></texture>
</control>
<control type="textbox" id="32">
<description>filepath</description>
<posx>60</posx>
<posy>70</posy>
<width>690</width>
<pagecontrol>60</pagecontrol>
<height max="530">530</height>
<align>left</align>
<aligny>top</aligny>
<font>font12</font>
<text>Нет отзывов</text>
<align>center</align>
<aligny>center</aligny>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<wrapmultiline>true</wrapmultiline>
</control>
<control type="group" id="9001">
<posy>615</posy>
<posx>50</posx>
<control type="button" id="22">
<description>close</description>
<posx>20</posx>
<posy>0</posy>
<width>650</width>
<height>40</height>
<align>center</align>
<aligny>center</aligny>
<font>font12_title</font>
<label>Закрыть окно</label>
<onleft>60</onleft>
<onright>60</onright>
<onup>60</onup>
<ondown>60</ondown>
</control>
</control>
</control>
</controls>
</window>

61
resources/skins/DialogReviews.py 100644
View File

@ -0,0 +1,61 @@
# -*- coding: utf-8 -*-
import sys, urllib, urllib2, re, os, cookielib, traceback, datetime, htmlentitydefs
import xbmc, xbmcgui, xbmcaddon
pattern = re.compile("&(\w+?);")
def html_entity_decode_char(m, defs=htmlentitydefs.entitydefs):
try:
return defs[m.group(1)]
except KeyError:
return m.group(0)
def html_entity_decode(string):
return pattern.sub(html_entity_decode_char, string)
KEY_BUTTON_BACK = 275
KEY_KEYBOARD_ESC = 61467
ACTION_PREVIOUS_MENU = 10
ACTION_NAV_BACK = 92
class DialogReviews(xbmcgui.WindowXMLDialog):
def onInit(self):
print "DialogReviews(): Window Initialized"
self.reviews_box = self.getControl(32)
self.reviews_box.setText(self.get_reviews())
self.setFocus(self.getControl(22))
def onAction(self, action):
buttonCode = action.getButtonCode()
if (action == ACTION_NAV_BACK or action == ACTION_PREVIOUS_MENU):
self.close()
if (buttonCode == KEY_BUTTON_BACK or buttonCode == KEY_KEYBOARD_ESC):
self.close()
def onClick(self, controlID):
if (controlID == 2 or controlID == 22):
self.close()
def onFocus(self, controlID):
#print "onFocus(): control %i" % controlID
pass
def doModal(self, movieHtml):
self.movieHtml = movieHtml
xbmcgui.WindowXMLDialog.doModal(self)
def get_reviews(self):
reviews_texts = re.compile('<div class="comment" id="[^"]+">([^<]+)</div>',re.S).findall(self.movieHtml)
reviews_autors = re.compile('<div class="member"><a href="[^"]+"><strong>([^<]+)</strong></a></div>',re.S).findall(self.movieHtml)
reviews_dates = re.compile('<div class="date">([^<]+)</div>',re.S).findall(self.movieHtml)
texts = ''
i = 0
for text in reviews_texts:
texts = texts+"\n[B][COLOR purple]"+reviews_autors[i]+"[/COLOR][/B] [I]"+reviews_dates[i]+"[/I]\n"
texts = texts+html_entity_decode(text)+"\n"
i = i + 1
return texts