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

myshows fix

pull/1/head
DiMartinoXBMC 2015-01-27 22:27:59 +03:00
parent f2b0db6a9a
commit c684a7f848
4 changed files with 55 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
.idea/workspace.xml
View File

@ -2,8 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment="">
<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$/Core.py" afterPath="$PROJECT_DIR$/Core.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Localization.py" afterPath="$PROJECT_DIR$/Localization.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/scrapers/cache.py" afterPath="$PROJECT_DIR$/resources/scrapers/cache.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="plugin.video.torrenter.iws" />
@ -35,45 +36,22 @@
<splitter split-orientation="horizontal" split-proportion="0.5">
<split-first>
<leaf>
<file leaf-file-name="Core.py" pinned="false" current="false" current-in-tab="false">
<file leaf-file-name="Core.py" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Core.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="27098" max-vertical-offset="29903">
<caret line="1617" column="33" selection-start-line="1617" selection-start-column="33" selection-end-line="1617" selection-end-column="33" />
<state vertical-scroll-proportion="14.008324" vertical-offset="15470" max-vertical-offset="29733">
<caret line="1617" column="19" selection-start-line="1617" selection-start-column="19" selection-end-line="1617" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Player.py" pinned="false" current="true" current-in-tab="true">
<file leaf-file-name="Player.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Player.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.60879904" vertical-offset="1953" max-vertical-offset="2958">
<caret line="354" column="29" selection-start-line="354" selection-start-column="29" selection-end-line="354" selection-end-column="29" />
<folding>
<element signature="e#1125#2841#0" expanded="false" />
<element signature="e#1176#1831#0" expanded="false" />
<element signature="e#1861#2039#0" expanded="false" />
<element signature="e#2069#2247#0" expanded="false" />
<element signature="e#2278#2289#0" expanded="false" />
<element signature="e#2333#2350#0" expanded="false" />
<element signature="e#2403#2495#0" expanded="false" />
<element signature="e#2570#2841#0" expanded="false" />
<element signature="e#5678#6069#0" expanded="false" />
<element signature="e#6108#6779#0" expanded="false" />
<element signature="e#6811#9235#0" expanded="false" />
<element signature="e#9284#10585#0" expanded="false" />
<element signature="e#10621#12712#0" expanded="false" />
<element signature="e#12755#12862#0" expanded="false" />
<element signature="e#12905#12988#0" expanded="false" />
<element signature="e#13030#13137#0" expanded="false" />
<element signature="e#13180#13287#0" expanded="false" />
<element signature="e#13358#13491#0" expanded="false" />
<element signature="e#15799#16271#0" expanded="false" />
<element signature="e#16306#16401#0" expanded="false" />
<element signature="e#16442#16770#0" expanded="false" />
<element signature="e#16803#17470#0" expanded="false" />
</folding>
<state vertical-scroll-proportion="0.0" vertical-offset="5610" max-vertical-offset="6885">
<caret line="385" column="0" selection-start-line="385" selection-start-column="0" selection-end-line="385" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@ -81,7 +59,7 @@
<file leaf-file-name="addon.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/addon.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510">
<state vertical-scroll-proportion="0.0" vertical-offset="204" max-vertical-offset="510">
<caret line="12" column="51" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
<folding />
</state>
@ -125,35 +103,9 @@
<file leaf-file-name="Libtorrent.py" pinned="false" current="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.5399754" vertical-offset="445" max-vertical-offset="1309">
<state vertical-scroll-proportion="0.0" vertical-offset="4471" max-vertical-offset="6732">
<caret line="277" column="12" selection-start-line="277" selection-start-column="12" selection-end-line="277" selection-end-column="12" />
<folding>
<element signature="e#24#785#1" expanded="false" />
<element signature="e#1427#2875#0" expanded="false" />
<element signature="e#2924#5656#0" expanded="false" />
<element signature="e#5695#6679#0" expanded="false" />
<element signature="e#6728#7730#0" expanded="false" />
<element signature="e#7769#7901#0" expanded="false" />
<element signature="e#7942#8076#0" expanded="false" />
<element signature="e#8110#8232#0" expanded="false" />
<element signature="e#8266#8388#0" expanded="false" />
<element signature="e#8438#8485#0" expanded="false" />
<element signature="e#8535#8635#0" expanded="false" />
<element signature="e#8675#8989#0" expanded="false" />
<element signature="e#9035#9203#0" expanded="false" />
<element signature="e#9259#9314#0" expanded="false" />
<element signature="e#9372#9429#0" expanded="false" />
<element signature="e#9466#9645#0" expanded="false" />
<element signature="e#9697#10933#0" expanded="false" />
<element signature="e#10978#11878#0" expanded="false" />
<element signature="e#11915#12409#0" expanded="false" />
<element signature="e#12447#13049#0" expanded="false" />
<element signature="e#13086#13188#0" expanded="false" />
<element signature="e#13267#14413#0" expanded="false" />
<element signature="e#14449#14866#0" expanded="false" />
<element signature="e#15085#16214#0" expanded="false" />
<element signature="e#16249#16392#0" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
@ -161,7 +113,7 @@
<file leaf-file-name="net.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/utorrent/net.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="15028" max-vertical-offset="22576">
<state vertical-scroll-proportion="0.0" vertical-offset="15487" max-vertical-offset="22848">
<caret line="911" column="20" selection-start-line="911" selection-start-column="20" selection-end-line="911" selection-end-column="20" />
<folding />
</state>
@ -602,7 +554,11 @@
<created>1422131055103</created>
<updated>1422131055103</updated>
</task>
<option name="localTasksCounter" value="30" />
<task id="LOCAL-00030" summary="false positive fix">
<created>1422137592938</created>
<updated>1422137592938</updated>
</task>
<option name="localTasksCounter" value="31" />
<servers />
</component>
<component name="TodoView" selected-index="0">
@ -633,7 +589,7 @@
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3288889" sideWeight="0.5" order="7" 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="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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25478724" 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.13085106" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<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="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" 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" />
@ -688,7 +644,8 @@
<MESSAGE value="TC copy files from subfold" />
<MESSAGE value="ace stream fix" />
<MESSAGE value="deluge net fix" />
<option name="LAST_COMMIT_MESSAGE" value="deluge net fix" />
<MESSAGE value="false positive fix" />
<option name="LAST_COMMIT_MESSAGE" value="false positive fix" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@ -1004,7 +961,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="3234" max-vertical-offset="4046">
<caret line="88" column="23" selection-start-line="88" selection-start-column="23" selection-end-line="88" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
@ -1012,7 +968,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="187" max-vertical-offset="2278">
<caret line="78" column="8" selection-start-line="78" selection-start-column="8" selection-end-line="78" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
@ -1024,19 +979,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Core.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="27098" max-vertical-offset="29903">
<caret line="1617" column="33" selection-start-line="1617" selection-start-column="33" selection-end-line="1617" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/AceStream.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.5012225" vertical-offset="1409" max-vertical-offset="2448">
<caret line="120" column="46" selection-start-line="120" selection-start-column="46" selection-end-line="120" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
@ -1058,66 +1004,25 @@
</entry>
<entry file="file://$PROJECT_DIR$/Libtorrent.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.5399754" vertical-offset="445" max-vertical-offset="1309">
<state vertical-scroll-proportion="0.0" vertical-offset="4471" max-vertical-offset="6732">
<caret line="277" column="12" selection-start-line="277" selection-start-column="12" selection-end-line="277" selection-end-column="12" />
<folding>
<element signature="e#24#785#1" expanded="false" />
<element signature="e#1427#2875#0" expanded="false" />
<element signature="e#2924#5656#0" expanded="false" />
<element signature="e#5695#6679#0" expanded="false" />
<element signature="e#6728#7730#0" expanded="false" />
<element signature="e#7769#7901#0" expanded="false" />
<element signature="e#7942#8076#0" expanded="false" />
<element signature="e#8110#8232#0" expanded="false" />
<element signature="e#8266#8388#0" expanded="false" />
<element signature="e#8438#8485#0" expanded="false" />
<element signature="e#8535#8635#0" expanded="false" />
<element signature="e#8675#8989#0" expanded="false" />
<element signature="e#9035#9203#0" expanded="false" />
<element signature="e#9259#9314#0" expanded="false" />
<element signature="e#9372#9429#0" expanded="false" />
<element signature="e#9466#9645#0" expanded="false" />
<element signature="e#9697#10933#0" expanded="false" />
<element signature="e#10978#11878#0" expanded="false" />
<element signature="e#11915#12409#0" expanded="false" />
<element signature="e#12447#13049#0" expanded="false" />
<element signature="e#13086#13188#0" expanded="false" />
<element signature="e#13267#14413#0" expanded="false" />
<element signature="e#14449#14866#0" expanded="false" />
<element signature="e#15085#16214#0" expanded="false" />
<element signature="e#16249#16392#0" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Player.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.60879904" vertical-offset="1953" max-vertical-offset="2958">
<caret line="354" column="29" selection-start-line="354" selection-start-column="29" selection-end-line="354" selection-end-column="29" />
<folding>
<element signature="e#1125#2841#0" expanded="false" />
<element signature="e#1176#1831#0" expanded="false" />
<element signature="e#1861#2039#0" expanded="false" />
<element signature="e#2069#2247#0" expanded="false" />
<element signature="e#2278#2289#0" expanded="false" />
<element signature="e#2333#2350#0" expanded="false" />
<element signature="e#2403#2495#0" expanded="false" />
<element signature="e#2570#2841#0" expanded="false" />
<element signature="e#5678#6069#0" expanded="false" />
<element signature="e#6108#6779#0" expanded="false" />
<element signature="e#6811#9235#0" expanded="false" />
<element signature="e#9284#10585#0" expanded="false" />
<element signature="e#10621#12712#0" expanded="false" />
<element signature="e#12755#12862#0" expanded="false" />
<element signature="e#12905#12988#0" expanded="false" />
<element signature="e#13030#13137#0" expanded="false" />
<element signature="e#13180#13287#0" expanded="false" />
<element signature="e#13358#13491#0" expanded="false" />
<element signature="e#15799#16271#0" expanded="false" />
<element signature="e#16306#16401#0" expanded="false" />
<element signature="e#16442#16770#0" expanded="false" />
<element signature="e#16803#17470#0" expanded="false" />
</folding>
<state vertical-scroll-proportion="0.0" vertical-offset="5610" max-vertical-offset="6885">
<caret line="385" column="0" selection-start-line="385" selection-start-column="0" selection-end-line="385" 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="14.008324" vertical-offset="15470" max-vertical-offset="29733">
<caret line="1617" column="19" selection-start-line="1617" selection-start-column="19" selection-end-line="1617" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>

42
Core.py
View File

@ -1339,8 +1339,7 @@ class Core:
try:
searcherObject = getattr(__import__(searcher), searcher)()
except Exception, e:
print 'Unable to use searcher: ' + searcher + ' at ' + self.__plugin__ + ' openTorrent(). Exception: ' + str(
e)
print 'Unable to use searcher: ' + searcher + ' at ' + self.__plugin__ + ' openTorrent(). Exception: ' + str(e)
return
url = searcherObject.getTorrentFile(classMatch.group(2))
self.__settings__.setSetting("lastTorrentUrl", url)
@ -1356,8 +1355,6 @@ class Core:
self.__settings__.setSetting("lastTorrent", torrent.saveTorrent(url))
if silent != 'true':
if external:
myshows_setting = xbmcaddon.Addon(id='plugin.video.myshows')
myshows_lang = myshows_setting.getLocalizedString
myshows_items = []
myshows_files = []
myshows_sizes = {}
@ -1388,13 +1385,13 @@ class Core:
x=x+1
fileTitle=myshows_sizes[str(i)]+myshows_cut[x]
myshows_items.append(fileTitle)
myshows_items.append(unicode(myshows_lang(30400)))
myshows_items.append(self.localize('Return to MyShows.ru'))
myshows_files.append('')
dialog = xbmcgui.Dialog()
if len(myshows_items) == 2:
ret = 0
else:
ret = dialog.select(unicode(myshows_lang(30401)), myshows_items)
ret = dialog.select(self.localize('Search results:'), myshows_items)
if ret > -1:
xbmc.executebuiltin('xbmc.RunPlugin("plugin://plugin.video.torrenter/?action=playTorrent&url=' + myshows_files[ret] + '")')
else:
@ -1494,7 +1491,7 @@ class Core:
e)
return filesList
def showFilesList(self, filesList, params={}): #myshows
def showFilesList(self, filesList, params={}):
get = params.get
external = unquote(get("external"), None)
silent = get("silent")
@ -1512,8 +1509,6 @@ class Core:
xbmc.executebuiltin(
'XBMC.Notification("%s", "%s", %s)' % ("Поиск", "Ничего не найдено :(", "2500"))
return
myshows_setting = xbmcaddon.Addon(id='plugin.video.myshows')
myshows_lang = myshows_setting.getLocalizedString
if silent:
order, seeds, leechers, size, title, link, image = filesList[0]
xbmc.executebuiltin('XBMC.RunPlugin(%s)' % (
@ -1529,23 +1524,24 @@ class Core:
for key in link_dict.keys():
if link_dict.get(key):
link_url = '%s&%s=%s' % (link_url, key, urllib.quote_plus(link_dict.get(key)))
contextMenu = [(self.localize('Open (no return)'),
'XBMC.ActivateWindow(Videos,%s)' % ('%s?action=%s%s') % (
sys.argv[0], 'openTorrent', link_url)),
(myshows_lang(30409),
contextMenu = [
(self.localize('Add to MyShows.ru'),
'XBMC.RunPlugin(%s)' % (
'plugin://plugin.video.myshows/?mode=3010&sort=activate&stringdata=' + urllib.quote_plus(
'{"filename":"%s", "stype":%s, "showId":%s, "seasonId":%s, "id":%s, "episodeId":%s}' % (
link, jstr(s['stype']), jstr(s['showId']), jstr(s['seasonId']), jstr(s['id']),
jstr(s['episodeId']))))),
(myshows_lang(30400),
(self.localize('Return to MyShows.ru'),
(self.localize('Open (no return)'),
'XBMC.ActivateWindow(Videos,%s)' % ('%s?action=%s%s') % (
sys.argv[0], 'openTorrent', link_url)),
'XBMC.ActivateWindow(%s)' % ('Videos,plugin://plugin.video.myshows/?mode=3013')),
]
title = self.titleMake(seeds, leechers, size, title)
self.drawItem(title, 'context', link, image, contextMenu=contextMenu)
except:
showMessage(self.localize('Information'), self.localize('Torrent list is empty.'))
xbmc.executebuiltin('XBMC.ActivateWindow(%s)' % 'Videos,plugin://plugin.video.myshows/?mode=3013')
xbmc.executebuiltin('XBMC.RunPlugin(%s)' % 'plugin://plugin.video.myshows/?mode=3013')
return
else:
for (order, seeds, leechers, size, title, link, image) in filesList:
@ -1555,15 +1551,15 @@ class Core:
if link_dict.get(key):
link_url = '%s&%s=%s' % (link_url, key, urllib.quote_plus(link_dict.get(key)))
contextMenu = [
(self.localize('Open (no return)'),
'XBMC.ActivateWindow(Videos,%s)' % ('%s?action=%s%s') % (
sys.argv[0], 'openTorrent', link_url)),
(self.localize('Download via T-client'),
'XBMC.RunPlugin(%s)' % ('%s?action=%s&url=%s') % (
sys.argv[0], 'downloadFilesList', urllib.quote_plus(link))),
(self.localize('Download via Libtorrent'),
'XBMC.RunPlugin(%s)' % ('%s?action=%s&url=%s') % (
sys.argv[0], 'downloadLibtorrent', urllib.quote_plus(link)))
sys.argv[0], 'downloadLibtorrent', urllib.quote_plus(link))),
(self.localize('Open (no return)'),
'XBMC.ActivateWindow(Videos,%s)' % ('%s?action=%s%s') % (
sys.argv[0], 'openTorrent', link_url)),
]
title = self.titleMake(seeds, leechers, size, title)
@ -1715,13 +1711,7 @@ class Core:
def search(self, params={}):
defaultKeyword = params.get('url')
try:
myshows_setting = xbmcaddon.Addon(id='plugin.video.myshows')
showKey = myshows_setting.getSetting("torrenter_keyboard")
except:
showKey = None
if params.get('showKey'): showKey=params.get('showKey')
showKey=params.get('showKey')
if showKey == "true" or defaultKeyword == '' or not defaultKeyword:
if not defaultKeyword:

4
Localization.py
View File

@ -221,6 +221,10 @@ dictionary = {
'Keyboard':'Клавиатура',
'Copy Files in Root':'Скопировать файлы в Корень',
'Copied %d files!':'Скопировано %d файлов!',
'Add to MyShows.ru':'Добавить в MyShows.ru',
'Return to MyShows.ru':'Вернуться в MyShows.ru',
'Search results:':'Результаты поиска:',
}
}

1
resources/scrapers/cache.py
View File

@ -146,7 +146,6 @@ class Cache:
def download(self):
dirname = os.path.dirname(self.filename)
print self.filename
zipname = os.path.basename(self.filename).rstrip('.db') + '.zip'
url = 'http://www.tat-store.ru/torrenter/' + zipname
self.http = HTTP()