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

btclient

pull/1/head
DiMartinoXBMC 2015-08-03 20:49:05 +03:00
parent a4e728ae8a
commit 39783a1c8a
8 changed files with 2650 additions and 485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

622
.idea/workspace.xml
View File

@ -2,97 +2,13 @@
<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="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\__init__.py" afterPath="" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/resources/btclient/argparse.py" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\adapters.py" afterPath="" /> <change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\btclient\_version.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\api.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\auth.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\cacert.pem" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\certs.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\compat.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\cookies.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\exceptions.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\hooks.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\models.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\__init__.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\__init__.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\big5freq.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\big5prober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\chardetect.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\chardistribution.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\charsetgroupprober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\charsetprober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\codingstatemachine.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\compat.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\constants.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\cp949prober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\escprober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\escsm.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\eucjpprober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\euckrfreq.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\euckrprober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\euctwfreq.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\euctwprober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\gb2312freq.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\gb2312prober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\hebrewprober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\jisfreq.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\jpcntx.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\langbulgarianmodel.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\langcyrillicmodel.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\langgreekmodel.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\langhebrewmodel.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\langhungarianmodel.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\langthaimodel.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\latin1prober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\mbcharsetprober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\mbcsgroupprober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\mbcssm.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\sbcharsetprober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\sbcsgroupprober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\sjisprober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\universaldetector.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\chardet\utf8prober.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\__init__.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\_collections.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\connection.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\connectionpool.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\contrib\__init__.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\contrib\ntlmpool.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\contrib\pyopenssl.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\exceptions.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\fields.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\filepost.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\packages\__init__.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\packages\ordered_dict.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\packages\six.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\packages\ssl_match_hostname\__init__.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\packages\ssl_match_hostname\_implementation.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\poolmanager.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\request.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\response.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\util\__init__.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\util\connection.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\util\request.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\util\response.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\util\retry.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\util\ssl_.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\util\timeout.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\packages\urllib3\util\url.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\sessions.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\status_codes.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\structures.py" afterPath="" />
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\scrapers\requests\utils.py" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/BTClientPlayer.py" afterPath="$PROJECT_DIR$/BTClientPlayer.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BTClientPlayer.py" afterPath="$PROJECT_DIR$/BTClientPlayer.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/skins/DialogReviews.py" afterPath="$PROJECT_DIR$/resources/skins/DialogReviews.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Libtorrent.py" afterPath="$PROJECT_DIR$/Libtorrent.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/scrapers/fuzzywuzzy/StringMatcher.py" afterPath="$PROJECT_DIR$/resources/scrapers/fuzzywuzzy/StringMatcher.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/addon.xml" afterPath="$PROJECT_DIR$/addon.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/btclient/btclient.py" afterPath="$PROJECT_DIR$/resources/btclient/btclient.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/btclient/btclient.py" afterPath="$PROJECT_DIR$/resources/btclient/btclient.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/utorrent/dopal/class_defs.py" afterPath="$PROJECT_DIR$/resources/utorrent/dopal/class_defs.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/btclient/common.py" afterPath="$PROJECT_DIR$/resources/btclient/common.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/btclient/common.py" afterPath="$PROJECT_DIR$/resources/btclient/common.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/scrapers/fuzzywuzzy/fuzz.py" afterPath="$PROJECT_DIR$/resources/scrapers/fuzzywuzzy/fuzz.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/btclient/htclient.py" afterPath="$PROJECT_DIR$/resources/btclient/htclient.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/btclient/opensubtitle.py" afterPath="$PROJECT_DIR$/resources/btclient/opensubtitle.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" />
@ -126,7 +42,7 @@
<file leaf-file-name="functions.py" pinned="false" current-in-tab="false"> <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 vertical-scroll-proportion="-6.551724"> <state vertical-scroll-proportion="0.0">
<caret line="613" column="9" selection-start-line="613" selection-start-column="9" selection-end-line="613" selection-end-column="19" /> <caret line="613" column="9" selection-start-line="613" selection-start-column="9" selection-end-line="613" selection-end-column="19" />
<folding> <folding>
<element signature="e#24#832#1" expanded="false" /> <element signature="e#24#832#1" expanded="false" />
@ -267,16 +183,79 @@
<file leaf-file-name="BTClientPlayer.py" pinned="false" current-in-tab="true"> <file leaf-file-name="BTClientPlayer.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/BTClientPlayer.py"> <entry file="file://$PROJECT_DIR$/BTClientPlayer.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.17"> <state vertical-scroll-proportion="0.35664335">
<caret line="20" column="9" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" /> <caret line="29" column="19" selection-start-line="29" selection-start-column="19" selection-end-line="29" selection-end-column="19" />
<folding> <folding>
<element signature="e#11443#12791#0" expanded="false" /> <element signature="e#24#832#1" expanded="false" />
<element signature="e#15411#15494#0" expanded="false" /> <element signature="e#7046#7956#0" expanded="false" />
<element signature="e#15911#16044#0" expanded="false" /> <element signature="e#7995#8337#0" expanded="false" />
<element signature="e#19222#19363#0" expanded="false" /> <element signature="e#8369#10467#0" expanded="false" />
<element signature="e#19404#19740#0" expanded="false" /> <element signature="e#11897#14264#0" expanded="false" />
<element signature="e#19773#20030#0" expanded="false" /> <element signature="e#14307#14438#0" expanded="false" />
<element signature="e#20072#20167#0" expanded="false" /> <element signature="e#14481#14564#0" expanded="false" />
<element signature="e#14606#14736#0" expanded="false" />
<element signature="e#14779#14910#0" expanded="false" />
<element signature="e#14981#15114#0" expanded="false" />
<element signature="e#17677#18125#0" expanded="false" />
<element signature="e#18160#18301#0" expanded="false" />
<element signature="e#18342#18678#0" expanded="false" />
<element signature="e#18711#18968#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="opensubtitle.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/btclient/opensubtitle.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="22" column="26" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="26" />
<folding>
<element signature="e#46#62#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="btclient.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/btclient/btclient.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="29" column="32" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
<folding>
<element signature="e#22#33#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="cachebt.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/btclient/cachebt.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="24" column="33" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="common.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/btclient/common.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="13" column="15" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="htclient.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/btclient/htclient.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="313" column="30" selection-start-line="313" selection-start-column="30" selection-end-line="313" selection-end-column="30" />
<folding>
<element signature="e#47#61#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -286,55 +265,11 @@
</split-first> </split-first>
<split-second> <split-second>
<leaf> <leaf>
<file leaf-file-name="addon.xml" pinned="false" current-in-tab="false"> <file leaf-file-name="Player.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/addon.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="6" column="47" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RiperAM.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/contenters/RiperAM.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
<folding>
<element signature="e#783#792#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="StringMatcher.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/scrapers/fuzzywuzzy/StringMatcher.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.0766667">
<caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
<folding>
<element signature="e#147#172#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="cal.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cal.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="56" column="15" selection-start-line="56" selection-start-column="15" selection-end-line="56" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Player.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Player.py"> <entry file="file://$PROJECT_DIR$/Player.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="207" column="39" selection-start-line="207" selection-start-column="25" selection-end-line="207" selection-end-column="39" /> <caret line="237" column="24" selection-start-line="237" selection-start-column="24" selection-end-line="237" selection-end-column="24" />
<folding> <folding>
<element signature="e#24#832#1" expanded="false" /> <element signature="e#24#832#1" expanded="false" />
<element signature="e#1950#3666#0" expanded="false" /> <element signature="e#1950#3666#0" expanded="false" />
@ -443,9 +378,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/../torrenter.searcher.Monova/resources/settings.xml" />
<option value="$PROJECT_DIR$/../torrenter.searcher.Monova/Monova.py" />
<option value="$PROJECT_DIR$/../torrenter.searcher.Torrentz/Torrentz.py" />
<option value="$PROJECT_DIR$/controlcenter.py" /> <option value="$PROJECT_DIR$/controlcenter.py" />
<option value="$PROJECT_DIR$/resources/scrapers/kinopoisk/pageparser.py" /> <option value="$PROJECT_DIR$/resources/scrapers/kinopoisk/pageparser.py" />
<option value="$PROJECT_DIR$/../torrenter.searcher.KinoZalTV/KinoZalTV.py" /> <option value="$PROJECT_DIR$/../torrenter.searcher.KinoZalTV/KinoZalTV.py" />
@ -489,11 +421,14 @@
<option value="$PROJECT_DIR$/Libtorrent.py" /> <option value="$PROJECT_DIR$/Libtorrent.py" />
<option value="$PROJECT_DIR$/resources/settings.xml" /> <option value="$PROJECT_DIR$/resources/settings.xml" />
<option value="$PROJECT_DIR$/../script.module.btclient/lib/btclient.py" /> <option value="$PROJECT_DIR$/../script.module.btclient/lib/btclient.py" />
<option value="$PROJECT_DIR$/BTClientPlayer.py" />
<option value="$PROJECT_DIR$/addon.xml" /> <option value="$PROJECT_DIR$/addon.xml" />
<option value="$PROJECT_DIR$/resources/btclient/btclient.py" />
<option value="$PROJECT_DIR$/resources/utorrent/dopal/class_defs.py" /> <option value="$PROJECT_DIR$/resources/utorrent/dopal/class_defs.py" />
<option value="$PROJECT_DIR$/resources/scrapers/fuzzywuzzy/fuzz.py" /> <option value="$PROJECT_DIR$/resources/scrapers/fuzzywuzzy/fuzz.py" />
<option value="$PROJECT_DIR$/resources/btclient/htclient.py" />
<option value="$PROJECT_DIR$/resources/btclient/opensubtitle.py" />
<option value="$PROJECT_DIR$/resources/btclient/common.py" />
<option value="$PROJECT_DIR$/resources/btclient/btclient.py" />
<option value="$PROJECT_DIR$/BTClientPlayer.py" />
</list> </list>
</option> </option>
</component> </component>
@ -575,87 +510,7 @@
<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_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="scrapers" /> <option name="myItemId" value="btclient" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="plugin.video.torrenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="plugin.video.torrenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="language" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="plugin.video.torrenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="plugin.video.torrenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="language" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Russian" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="plugin.video.torrenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="plugin.video.torrenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="language" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="English" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="plugin.video.torrenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="plugin.video.torrenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="contenters" />
<option name="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>
@ -845,12 +700,6 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<updated>1420801533300</updated> <updated>1420801533300</updated>
</task> </task>
<task id="LOCAL-00069" summary="false import fix">
<created>1435498101019</created>
<option name="number" value="00069" />
<option name="project" value="LOCAL" />
<updated>1435498101020</updated>
</task>
<task id="LOCAL-00070" summary="major settings tweak and encryption"> <task id="LOCAL-00070" summary="major settings tweak and encryption">
<created>1435503849419</created> <created>1435503849419</created>
<option name="number" value="00070" /> <option name="number" value="00070" />
@ -1139,7 +988,13 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1438544896770</updated> <updated>1438544896770</updated>
</task> </task>
<option name="localTasksCounter" value="118" /> <task id="LOCAL-00118" summary="import optz">
<created>1438545525111</created>
<option name="number" value="00118" />
<option name="project" value="LOCAL" />
<updated>1438545525111</updated>
</task>
<option name="localTasksCounter" value="119" />
<servers /> <servers />
</component> </component>
<component name="TodoView" selected-index="0"> <component name="TodoView" selected-index="0">
@ -1168,24 +1023,24 @@
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13224447" 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.13224447" 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.3295583" 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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30144605" sideWeight="0.5" order="7" 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" weight="0.3011111" 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.33" 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.32777777" 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.32777777" 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.33" 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.24946696" 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.24946696" 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="true" weight="0.32369298" 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.32369298" 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">
@ -1200,7 +1055,6 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="cc fix" />
<MESSAGE value="media list, cc, deluge fixes" /> <MESSAGE value="media list, cc, deluge fixes" />
<MESSAGE value="searcher update" /> <MESSAGE value="searcher update" />
<MESSAGE value="log libtorr 0.15 fix" /> <MESSAGE value="log libtorr 0.15 fix" />
@ -1225,43 +1079,16 @@
<MESSAGE value="btclient" /> <MESSAGE value="btclient" />
<MESSAGE value="speed &amp; encryption" /> <MESSAGE value="speed &amp; encryption" />
<MESSAGE value="include btclient" /> <MESSAGE value="include btclient" />
<option name="LAST_COMMIT_MESSAGE" value="include btclient" /> <MESSAGE value="import optz" />
<option name="LAST_COMMIT_MESSAGE" value="import optz" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
<option name="time" value="18" /> <option name="time" value="19" />
</breakpoint-manager> </breakpoint-manager>
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.Torrentz/Torrentz.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="3.1575456">
<caret line="119" column="40" selection-start-line="119" selection-start-column="40" selection-end-line="119" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.KinoZalTV/KinoZalTV.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.028192371">
<caret line="119" column="50" selection-start-line="119" selection-start-column="50" selection-end-line="119" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.KinoZalTV/changelog.txt">
<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="1" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.KinoZalTV/addon.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.028192371">
<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.NNMClubRu/changelog.txt"> <entry file="file://$PROJECT_DIR$/../torrenter.searcher.NNMClubRu/changelog.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.08457711"> <state vertical-scroll-proportion="0.08457711">
@ -1308,7 +1135,6 @@
<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="268" column="169" selection-start-line="268" selection-start-column="169" selection-end-line="268" selection-end-column="169" /> <caret line="268" column="169" selection-start-line="268" selection-start-column="169" selection-end-line="268" selection-end-column="169" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1410,14 +1236,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/cal.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="56" column="15" selection-start-line="56" selection-start-column="15" selection-end-line="56" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/SearcherABC.py"> <entry file="file://$PROJECT_DIR$/SearcherABC.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.61009175"> <state vertical-scroll-proportion="0.61009175">
@ -1450,7 +1268,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.8592715"> <state vertical-scroll-proportion="0.8592715">
<caret line="45" column="4" selection-start-line="45" selection-start-column="4" selection-end-line="45" selection-end-column="69" /> <caret line="45" column="4" selection-start-line="45" selection-start-column="4" selection-end-line="45" selection-end-column="69" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1458,7 +1275,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.54966885"> <state vertical-scroll-proportion="0.54966885">
<caret line="45" column="21" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="21" /> <caret line="45" column="21" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="21" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1537,32 +1353,9 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Player.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="207" column="39" selection-start-line="207" selection-start-column="25" selection-end-line="207" selection-end-column="39" />
<folding>
<element signature="e#24#832#1" expanded="false" />
<element signature="e#1950#3666#0" expanded="false" />
<element signature="e#2001#2656#0" expanded="false" />
<element signature="e#2686#2864#0" expanded="false" />
<element signature="e#2894#3072#0" expanded="false" />
<element signature="e#3103#3114#0" expanded="false" />
<element signature="e#3158#3175#0" expanded="false" />
<element signature="e#3228#3320#0" expanded="false" />
<element signature="e#3395#3666#0" expanded="false" />
<element signature="e#18638#19181#0" expanded="false" />
<element signature="e#19216#19357#0" expanded="false" />
<element signature="e#19398#19734#0" expanded="false" />
<element signature="e#19767#20024#0" expanded="false" />
<element signature="e#20066#20161#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<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 vertical-scroll-proportion="-6.551724"> <state vertical-scroll-proportion="0.0">
<caret line="613" column="9" selection-start-line="613" selection-start-column="9" selection-end-line="613" selection-end-column="19" /> <caret line="613" column="9" selection-start-line="613" selection-start-column="9" selection-end-line="613" selection-end-column="19" />
<folding> <folding>
<element signature="e#24#832#1" expanded="false" /> <element signature="e#24#832#1" expanded="false" />
@ -1703,17 +1496,6 @@
<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="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="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/btclient/btclient.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.19833334">
<caret line="25" column="21" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="21" />
<folding>
<element signature="e#22#33#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1721,7 +1503,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.51"> <state vertical-scroll-proportion="0.51">
<caret line="30" column="19" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="19" /> <caret line="30" column="19" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="19" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1729,19 +1510,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.425"> <state vertical-scroll-proportion="0.425">
<caret line="15" column="31" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" /> <caret line="15" column="31" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
<folding>
<element signature="e#25#34#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/btclient/common.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.5709282">
<caret line="217" column="37" selection-start-line="217" selection-start-column="37" selection-end-line="217" selection-end-column="37" />
<folding>
<element signature="e#46#55#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1749,25 +1517,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.7083333"> <state vertical-scroll-proportion="0.7083333">
<caret line="70" column="0" selection-start-line="70" selection-start-column="0" selection-end-line="70" selection-end-column="0" /> <caret line="70" column="0" selection-start-line="70" selection-start-column="0" selection-end-line="70" selection-end-column="0" />
<folding>
<element signature="e#2804#2849#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/BTClientPlayer.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.17">
<caret line="20" column="9" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
<folding>
<element signature="e#11443#12791#0" expanded="false" />
<element signature="e#15411#15494#0" expanded="false" />
<element signature="e#15911#16044#0" expanded="false" />
<element signature="e#19222#19363#0" expanded="false" />
<element signature="e#19404#19740#0" expanded="false" />
<element signature="e#19773#20030#0" expanded="false" />
<element signature="e#20072#20167#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1775,7 +1524,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="2.89"> <state vertical-scroll-proportion="2.89">
<caret line="108" column="0" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" /> <caret line="108" column="0" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1783,54 +1531,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="2.21"> <state vertical-scroll-proportion="2.21">
<caret line="384" column="12" selection-start-line="384" selection-start-column="12" selection-end-line="384" selection-end-column="12" /> <caret line="384" column="12" selection-start-line="384" selection-start-column="12" selection-end-line="384" selection-end-column="12" />
<folding>
<element signature="e#24#836#1" expanded="false" />
<element signature="e#838#851#0" expanded="true" />
<element signature="e#1480#3288#0" expanded="false" />
<element signature="e#3337#6314#0" expanded="false" />
<element signature="e#6353#7490#0" expanded="false" />
<element signature="e#7539#8584#0" expanded="false" />
<element signature="e#8623#8755#0" expanded="false" />
<element signature="e#8796#8930#0" expanded="false" />
<element signature="e#8964#9086#0" expanded="false" />
<element signature="e#9120#9242#0" expanded="false" />
<element signature="e#9292#9339#0" expanded="false" />
<element signature="e#9389#9493#0" expanded="false" />
<element signature="e#9533#9847#0" expanded="false" />
<element signature="e#9893#10063#0" expanded="false" />
<element signature="e#10484#10795#0" expanded="false" />
<element signature="e#10832#11011#0" expanded="false" />
<element signature="e#11079#12456#0" expanded="false" />
<element signature="e#12501#13429#0" expanded="false" />
<element signature="e#13466#15927#0" expanded="false" />
<element signature="e#16648#17446#0" expanded="false" />
<element signature="e#17483#17585#0" expanded="false" />
<element signature="e#17677#18849#0" expanded="false" />
<element signature="e#18885#19302#0" expanded="false" />
<element signature="e#19339#19743#0" expanded="false" />
<element signature="e#19780#20335#0" expanded="false" />
<element signature="e#20366#22388#0" expanded="false" />
<element signature="e#22434#23531#0" expanded="false" />
<element signature="e#23566#23709#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/addon.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="6" column="47" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/contenters/RiperAM.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
<folding>
<element signature="e#783#792#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1838,8 +1538,126 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.0766667"> <state vertical-scroll-proportion="1.0766667">
<caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" /> <caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/contenters/RiperAM.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.53833336">
<caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/addon.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.17">
<caret line="6" column="47" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cal.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.05666667">
<caret line="56" column="15" selection-start-line="56" selection-start-column="15" selection-end-line="56" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/btclient/htclient.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="313" column="30" selection-start-line="313" selection-start-column="30" selection-end-line="313" selection-end-column="30" />
<folding> <folding>
<element signature="e#147#172#0" expanded="true" /> <element signature="e#47#61#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://D:/Python27/Lib/base64.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.11333334">
<caret line="4" column="33" selection-start-line="4" selection-start-column="33" selection-end-line="4" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/btclient/cachebt.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="24" column="33" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/btclient/common.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="13" column="15" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/btclient/btclient.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="29" column="32" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
<folding>
<element signature="e#22#33#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/btclient/opensubtitle.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="22" column="26" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="26" />
<folding>
<element signature="e#46#62#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Player.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="237" column="24" selection-start-line="237" selection-start-column="24" selection-end-line="237" selection-end-column="24" />
<folding>
<element signature="e#24#832#1" expanded="false" />
<element signature="e#1950#3666#0" expanded="false" />
<element signature="e#2001#2656#0" expanded="false" />
<element signature="e#2686#2864#0" expanded="false" />
<element signature="e#2894#3072#0" expanded="false" />
<element signature="e#3103#3114#0" expanded="false" />
<element signature="e#3158#3175#0" expanded="false" />
<element signature="e#3228#3320#0" expanded="false" />
<element signature="e#3395#3666#0" expanded="false" />
<element signature="e#18638#19181#0" expanded="false" />
<element signature="e#19216#19357#0" expanded="false" />
<element signature="e#19398#19734#0" expanded="false" />
<element signature="e#19767#20024#0" expanded="false" />
<element signature="e#20066#20161#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/BTClientPlayer.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.35664335">
<caret line="29" column="19" selection-start-line="29" selection-start-column="19" selection-end-line="29" selection-end-column="19" />
<folding>
<element signature="e#24#832#1" expanded="false" />
<element signature="e#7046#7956#0" expanded="false" />
<element signature="e#7995#8337#0" expanded="false" />
<element signature="e#8369#10467#0" expanded="false" />
<element signature="e#11897#14264#0" expanded="false" />
<element signature="e#14307#14438#0" expanded="false" />
<element signature="e#14481#14564#0" expanded="false" />
<element signature="e#14606#14736#0" expanded="false" />
<element signature="e#14779#14910#0" expanded="false" />
<element signature="e#14981#15114#0" expanded="false" />
<element signature="e#17677#18125#0" expanded="false" />
<element signature="e#18160#18301#0" expanded="false" />
<element signature="e#18342#18678#0" expanded="false" />
<element signature="e#18711#18968#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>

119
BTClientPlayer.py
View File

@ -20,7 +20,7 @@
import os import os
from contextlib import contextmanager, closing, nested from contextlib import contextmanager, closing, nested
from argparse import Namespace from resources.btclient.argparse import Namespace
import xbmc import xbmc
import xbmcgui import xbmcgui
@ -30,7 +30,7 @@ import xbmcvfs
import Localization import Localization
from platform_pulsar import get_platform from platform_pulsar import get_platform
from resources.btclient.btclient import * from resources.btclient.btclient import *
from functions import showMessage, DownloadDB, get_ids_video, log, debug from functions import showMessage, DownloadDB, get_ids_video, log, debug, clearStorage
from Player import OverlayText from Player import OverlayText
ROOT = sys.modules["__main__"].__root__ ROOT = sys.modules["__main__"].__root__
@ -65,12 +65,6 @@ VIEWPORT_HEIGHT = 1088.0
OVERLAY_WIDTH = int(VIEWPORT_WIDTH * 0.7) # 70% size OVERLAY_WIDTH = int(VIEWPORT_WIDTH * 0.7) # 70% size
OVERLAY_HEIGHT = 150 OVERLAY_HEIGHT = 150
ENCRYPTION_SETTINGS = {
"Forced": 0,
"Enabled": 1,
"Disabled": 2,
}
class BTClientPlayer(xbmc.Player): class BTClientPlayer(xbmc.Player):
__plugin__ = sys.modules["__main__"].__plugin__ __plugin__ = sys.modules["__main__"].__plugin__
__settings__ = sys.modules["__main__"].__settings__ __settings__ = sys.modules["__main__"].__settings__
@ -133,42 +127,6 @@ class BTClientPlayer(xbmc.Player):
self.btclient=self.stream(args, BTClient) self.btclient=self.stream(args, BTClient)
#self.init()
#self.setup_torrent()
#if self.buffer():
# while True:
# if self.setup_play():
# debug('************************************* GOING LOOP')
# #self.torrent.continueSession(self.contentId)
# self.loop()
# else:
# break
# debug('************************************* GO NEXT?')
# if self.next_dl and self.next_dling and isinstance(self.next_contentId, int) and self.iterator == 100:
# self.contentId = self.next_contentId
# continue
# debug('************************************* NO! break')
# break
#self.torrent.stopSession()
#self.torrent.threadComplete = True
#self.torrent.checkThread()
#if '1' != self.__settings__.getSetting("keep_files") and 'Saved Files' not in self.userStorageDirectory:
# xbmc.sleep(1000)
# clearStorage(self.userStorageDirectory)
#else:
# if self.seeding_status:
# showMessage(self.localize('Information'),
# self.localize('Torrent is seeding. To stop it use Download Status.'), forced=True)
# else:
# if self.seeding: self.db_delete()
# showMessage(self.localize('Information'),
# self.localize('Torrent downloading is stopped.'), forced=True)
def on_exit(self):
self.c.close()
sys.exit(0)
def stream(self, args, client_class): def stream(self, args, client_class):
self.c = client_class(args.directory, args=args, lt=self.lt) self.c = client_class(args.directory, args=args, lt=self.lt)
try: try:
@ -196,17 +154,31 @@ class BTClientPlayer(xbmc.Player):
self.server.set_file(f) self.server.set_file(f)
self.setup_play() self.setup_play()
with closing( while True:
OverlayText(w=OVERLAY_WIDTH, h=OVERLAY_HEIGHT, alignment=XBFONT_CENTER_X | XBFONT_CENTER_Y)) as overlay: if self.setup_play():
with nested(self.attach(overlay.show, self.on_playback_paused), log('************************************* GOING LOOP')
self.attach(overlay.hide, self.on_playback_resumed, self.on_playback_stopped)): #self.torrent.continueSession(self.contentId)
while True: self.loop()
if xbmc.abortRequested or not self.isPlaying(): else:
break break
log('************************************* GO NEXT?')
if self.next_dl and self.next_dling and isinstance(self.next_contentId, int) and self.iterator == 100:
self.contentId = self.next_contentId
continue
log('************************************* NO! break')
break
status = self.c.status if '1' != self.__settings__.getSetting("keep_files") and 'Saved Files' not in self.userStorageDirectory:
overlay.text = "\n".join(self._get_status_lines(status)) xbmc.sleep(1000)
xbmc.sleep(1000) clearStorage(self.userStorageDirectory)
else:
if self.seeding_status:
showMessage(self.localize('Information'),
self.localize('Torrent is seeding. To stop it use Download Status.'), forced=True)
else:
if self.seeding: self.db_delete()
showMessage(self.localize('Information'),
self.localize('Torrent downloading is stopped.'), forced=True)
log('Play ended') log('Play ended')
if self.server: if self.server:
@ -284,7 +256,7 @@ class BTClientPlayer(xbmc.Player):
def setup_subs(self, label, path): def setup_subs(self, label, path):
iterator = 0 iterator = 0
subs = self.torrent.getSubsIds(label) subs = self.torrent.getSubsIds(label)
debug('[setup_subs] subs: '+str(subs)) log('[setup_subs] subs: '+str(subs))
if len(subs) > 0: if len(subs) > 0:
showMessage(self.localize('Information'), showMessage(self.localize('Information'),
self.localize('Downloading and copy subtitles. Please wait.'), forced=True) self.localize('Downloading and copy subtitles. Please wait.'), forced=True)
@ -292,7 +264,7 @@ class BTClientPlayer(xbmc.Player):
self.torrent.continueSession(ind) self.torrent.continueSession(ind)
while iterator < 100: while iterator < 100:
xbmc.sleep(1000) xbmc.sleep(1000)
self.torrent.debug() #self.torrent.debug()
status = self.torrent.torrentHandle.status() status = self.torrent.torrentHandle.status()
iterator = int(status.progress * 100) iterator = int(status.progress * 100)
# xbmc.sleep(2000) # xbmc.sleep(2000)
@ -303,7 +275,7 @@ class BTClientPlayer(xbmc.Player):
ext = temp.split('.')[-1] ext = temp.split('.')[-1]
temp = temp[:len(temp) - len(ext) - 1] + '.' + addition + '.' + ext temp = temp[:len(temp) - len(ext) - 1] + '.' + addition + '.' + ext
newFileName = os.path.join(os.path.dirname(path), temp) newFileName = os.path.join(os.path.dirname(path), temp)
debug('[setup_subs]: '+str((os.path.join(os.path.dirname(os.path.dirname(path)),title),newFileName))) log('[setup_subs]: '+str((os.path.join(os.path.dirname(os.path.dirname(path)),title),newFileName)))
if not xbmcvfs.exists(newFileName): if not xbmcvfs.exists(newFileName):
xbmcvfs.copy(os.path.join(os.path.dirname(os.path.dirname(path)), title), newFileName) xbmcvfs.copy(os.path.join(os.path.dirname(os.path.dirname(path)), title), newFileName)
@ -391,21 +363,22 @@ class BTClientPlayer(xbmc.Player):
event.remove(callback) event.remove(callback)
def loop(self): def loop(self):
debug_counter=0 #debug_counter=0
with closing( with closing(
OverlayText(w=OVERLAY_WIDTH, h=OVERLAY_HEIGHT, alignment=XBFONT_CENTER_X | XBFONT_CENTER_Y)) as overlay: OverlayText(w=OVERLAY_WIDTH, h=OVERLAY_HEIGHT, alignment=XBFONT_CENTER_X | XBFONT_CENTER_Y)) as overlay:
with nested(self.attach(overlay.show, self.on_playback_paused), with nested(self.attach(overlay.show, self.on_playback_paused),
self.attach(overlay.hide, self.on_playback_resumed, self.on_playback_stopped)): self.attach(overlay.hide, self.on_playback_resumed, self.on_playback_stopped)):
while not xbmc.abortRequested and self.isPlaying() and not self.torrent.threadComplete: while True:
self.torrent.checkThread() if xbmc.abortRequested or not self.isPlaying():
if self.iterator == 100 and debug_counter < 100: break
debug_counter += 1
else: #if self.iterator == 100 and debug_counter < 100:
self.torrent.debug() # debug_counter += 1
debug_counter=0 #else:
status = self.torrent.torrentHandle.status() # self.torrent.debug()
# debug_counter=0
status = self.c.status
overlay.text = "\n".join(self._get_status_lines(status)) overlay.text = "\n".join(self._get_status_lines(status))
# downloadedSize = torrent.torrentHandle.file_progress()[contentId]
self.iterator = int(status.progress * 100) self.iterator = int(status.progress * 100)
xbmc.sleep(1000) xbmc.sleep(1000)
if self.iterator == 100 and self.next_dl: if self.iterator == 100 and self.next_dl:
@ -414,7 +387,7 @@ class BTClientPlayer(xbmc.Player):
self.next_contentId = int(self.ids_video[next_contentId_index]) self.next_contentId = int(self.ids_video[next_contentId_index])
else: else:
self.next_contentId = False self.next_contentId = False
debug('[loop] next_contentId: '+str(self.next_contentId)) log('[loop] next_contentId: '+str(self.next_contentId))
if not self.seeding_run and self.iterator == 100 and self.seeding: if not self.seeding_run and self.iterator == 100 and self.seeding:
self.seeding_run = True self.seeding_run = True
self.seed(self.contentId) self.seed(self.contentId)
@ -467,3 +440,7 @@ class BTClientPlayer(xbmc.Player):
return Localization.localize(string) return Localization.localize(string)
except: except:
return string return string
def on_exit(self):
self.c.close()
sys.exit(0)

1
resources/btclient/_version.py
View File

@ -1 +0,0 @@
__version__ = '0.4.2'

2378
resources/btclient/argparse.py 100644
View File

File diff suppressed because it is too large Load Diff

1
resources/btclient/btclient.py
View File

@ -100,7 +100,6 @@ class StreamServer(SocketServer.ThreadingMixIn, htserver.HTTPServer):
# pprint.pprint(e) # pprint.pprint(e)
else: else:
logger.exception("HTTP Server Error") logger.exception("HTTP Server Error")
# TODO: remove print
traceback.print_exc() traceback.print_exc()

6
resources/btclient/common.py
View File

@ -131,7 +131,7 @@ class BaseClient(object):
self._delete_on_close = True if args and args.delete_on_finish else False self._delete_on_close = True if args and args.delete_on_finish else False
def _on_file_ready(self, filehash): def _on_file_ready(self, filehash):
self._file.filehash = filehash #self._file.filehash = filehash
self._ready = True self._ready = True
if self._on_ready_action: if self._on_ready_action:
self._on_ready_action(self._file, self.is_file_complete) self._on_ready_action(self._file, self.is_file_complete)
@ -225,10 +225,6 @@ class PieceCache(object):
c._cache_first = self._cache_first c._cache_first = self._cache_first
return c return c
@property
def cached_piece(self):
self._cache_first
def fill_cache(self, first): def fill_cache(self, first):
to_request = [] to_request = []
with self._lock: with self._lock:

4
resources/btclient/htclient.py
View File

@ -27,7 +27,7 @@ import gzip
import json import json
from collections import deque from collections import deque
from common import AbstractFile, BaseClient, Hasher, Resolver, TerminalColor from common import AbstractFile, BaseClient, Resolver, TerminalColor #Hasher
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
logger = logging.getLogger('htclient') logger = logging.getLogger('htclient')
@ -321,7 +321,7 @@ class HTClient(BaseClient):
if not self._file.pieces[i]: if not self._file.pieces[i]:
self._pool.add_piece(i) self._pool.add_piece(i)
self.hash = Hasher(self._file, self._on_file_ready) #self.hash = Hasher(self._file, self._on_file_ready)
@property @property
def is_file_complete(self): def is_file_complete(self):

4
resources/btclient/opensubtitle.py
View File

@ -13,8 +13,6 @@ import subprocess
import struct import struct
import time import time
from _version import __version__
logger = logging.getLogger('opensubtitles') logger = logging.getLogger('opensubtitles')
@ -33,7 +31,7 @@ class Urllib2Transport(xmlrpclib.Transport):
class OpenSubtitles(object): class OpenSubtitles(object):
USER_AGENT = 'BTClient v%s' % __version__ USER_AGENT = 'BTClient'
def __init__(self, lang, user='', pwd=''): def __init__(self, lang, user='', pwd=''):
self._lang = lang self._lang = lang