diff --git a/changelog.txt b/changelog.txt index 9740262..c526c5b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,4 @@ -[B]Version 2.2.3[/B] +[B]Version 2.2.2[/B] [+] Поиск: Исправлен RuTrackerOrg, T411FR [B]Version 2.2.1[/B] diff --git a/resources/searchers/RuTorOrg.py b/resources/searchers/RuTorOrg.py index f209f70..a382905 100644 --- a/resources/searchers/RuTorOrg.py +++ b/resources/searchers/RuTorOrg.py @@ -65,10 +65,10 @@ class RuTorOrg(SearcherABC.SearcherABC): filesList = [] self.timeout(5) #print 'strating Rutor' - url = "http://rutor.org/search/0/0/100/2/%s" % urllib.quote_plus(keyword) + url = "http://zerkalo-rutor.org/search/0/0/100/2/%s" % urllib.quote_plus(keyword) headers = [('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 YaBrowser/14.10.2062.12061 Safari/537.36'), - ('Referer', 'http://rutor.org'), ('Accept-encoding', 'gzip'), + ('Referer', 'http://zerkalo-rutor.org'), ('Accept-encoding', 'gzip'), ('Cookie', str(sys.modules["__main__"].__settings__.getSetting("rutor-auth")))] response = self.makeRequest(url, headers=headers) @@ -83,18 +83,19 @@ class RuTorOrg(SearcherABC.SearcherABC): sys.modules["__main__"].__settings__.setSetting("rutor-auth", cookie) headers = [('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 YaBrowser/14.10.2062.12061 Safari/537.36'), - ('Referer', 'http://rutor.org'), ('Accept-encoding', 'gzip'), + ('Referer', 'http://zerkalo-rutor.org'), ('Accept-encoding', 'gzip'), ('Cookie', str(sys.modules["__main__"].__settings__.getSetting("rutor-auth")))] response = self.makeRequest(url, headers=headers) if None != response and 0 < len(response): dat = re.compile( - '.+?.+?(.+?).+?(\d*?\..+? .+?).+? (\d+).+?alt="L".+?> (\d+)', + '.+?.+?(.+?).+?(\d*?\..+? .+?).+? (\d+).+?alt="L".+?> (\d+)', re.DOTALL).findall(response) if dat and len(dat) > 0: for (link, title, size, seeds, leechers) in dat: torrentTitle = title.strip() #"%s [S\L: %s\%s]" % (title, seeds, leechers) size = size.replace(' ', ' ') + link='http://zerkalo-rutor.org'+link image = sys.modules["__main__"].__root__ + self.searchIcon filesList.append(( int(int(self.sourceWeight) * int(seeds)),