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

.torrent and AM

pull/17/head
DiMartinoXBMC 2018-08-08 15:20:50 +03:00
parent 21248ecbb4
commit 1c106b15ba
5 changed files with 1461 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1668
.idea/workspace.xml
View File

File diff suppressed because it is too large Load Diff

4
Core.py
View File

@ -1433,6 +1433,7 @@ class Core:
if not url: if not url:
action = xbmcgui.Dialog() action = xbmcgui.Dialog()
url = action.browse(1, self.localize('Choose .torrent in video library'), 'video', '.torrent') url = action.browse(1, self.localize('Choose .torrent in video library'), 'video', '.torrent')
url = urllib.quote_plus(url)
torrent = Downloader.Torrent(self.userStorageDirectory, torrentFilesDirectory=self.torrentFilesDirectory) torrent = Downloader.Torrent(self.userStorageDirectory, torrentFilesDirectory=self.torrentFilesDirectory)
self.__settings__.setSetting("lastTorrent", torrent.saveTorrent(url)) self.__settings__.setSetting("lastTorrent", torrent.saveTorrent(url))
self.__settings__.setSetting("lastTorrentUrl", url) self.__settings__.setSetting("lastTorrentUrl", url)
@ -1588,7 +1589,8 @@ class Core:
url = Searchers().downloadWithSearcher(classMatch.group(2), searcher) url = Searchers().downloadWithSearcher(classMatch.group(2), searcher)
self.__settings__.setSetting("lastTorrent", url) self.__settings__.setSetting("lastTorrent", url)
torrent = Downloader.Torrent(self.userStorageDirectory, torrentFilesDirectory=self.torrentFilesDirectory) torrent = Downloader.Torrent(self.userStorageDirectory,
torrentFilesDirectory=self.torrentFilesDirectory)
if not torrent: torrent = Downloader.Torrent(self.userStorageDirectory, if not torrent: torrent = Downloader.Torrent(self.userStorageDirectory,
torrentFilesDirectory=self.torrentFilesDirectory) torrentFilesDirectory=self.torrentFilesDirectory)
filename = torrent.saveTorrent(url) filename = torrent.saveTorrent(url)

2
changelog.txt
View File

@ -1,5 +1,7 @@
[B]Version 2.6.7[/B] [B]Version 2.6.7[/B]
[+] Теперь можно указать порт SOCKS-прокси, при использоании прокси Tor [+] Теперь можно указать порт SOCKS-прокси, при использоании прокси Tor
[+] Списки медиа: исправлен RiperAM
[+] .torrent Player: Исправлена работа c длинными названиями
[B]Version 2.6.6[/B] [B]Version 2.6.6[/B]
[+] Добавлена поддержка прокси для windows [+] Добавлена поддержка прокси для windows

2
resources/contenters/RiperAM.py
View File

@ -28,7 +28,7 @@ class RiperAM(Content.Content):
'hot': ('Most Recent', '/', {'page': '/portal.php?tp=%d', 'increase': 30, 'second_page': 30}), 'hot': ('Most Recent', '/', {'page': '/portal.php?tp=%d', 'increase': 30, 'second_page': 30}),
} }
baseurl = "http://bt.kubyshka.org" baseurl = "http://riperam.org/"
headers = [('User-Agent', headers = [('User-Agent',
'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124' + \ 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124' + \
' YaBrowser/14.10.2062.12061 Safari/537.36'), ' YaBrowser/14.10.2062.12061 Safari/537.36'),

2
resources/contenters/RuTorOrg.py
View File

@ -103,7 +103,7 @@ class RuTorOrg(Content.Content):
return False return False
def get_contentList(self, category, subcategory=None, apps_property=None): def get_contentList(self, category, subcategory=None, apps_property=None):
self.debug = self.log #self.debug = self.log
contentList = [] contentList = []
url = 'http://%s' % self.get_url(category, subcategory, apps_property) url = 'http://%s' % self.get_url(category, subcategory, apps_property)
self.debug(url) self.debug(url)