From: Fredrik Tolf Date: Sun, 4 Sep 2016 13:48:21 +0000 (+0200) Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/automanga X-Git-Url: http://www.dolda2000.com/gitweb/?a=commitdiff_plain;h=7b75f5a132d06c1a1d1688a559d36cf737bcac3a;hp=-c;p=automanga.git Merge branch 'master' of git.dolda2000.com:/srv/git/r/automanga --- 7b75f5a132d06c1a1d1688a559d36cf737bcac3a diff --combined manga/batoto.py index 92c1032,8c25789..42edfac --- a/manga/batoto.py +++ b/manga/batoto.py @@@ -276,7 -276,6 +276,7 @@@ class session(object) else: return else: + pass form = page.find("form", id="login") if not form and pre: @@@ -289,6 -288,7 +289,7 @@@ values["rememberMe"] = "1" values["anonymous"] = "1" req = urllib.request.Request(form["action"], urllib.parse.urlencode(values).encode("ascii")) + req.add_header("User-Agent", self.useragent) with self.web.open(req) as hs: page = soupify(hs.read()) for resp in page.findAll("p", attrs={"class": "message"}): @@@ -301,8 -301,10 +302,10 @@@ def open(self, url): return self.web.open(url) + useragent = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.160 Safari/537.22" def fetch(self, url, headers=None): req = urllib.request.Request(url) + req.add_header("User-Agent", self.useragent) if headers is not None: for k, v in headers.items(): req.add_header(k, v) @@@ -339,7 -341,9 +342,9 @@@ class library(lib.library) while True: _pars = dict(pars) _pars["p"] = str(p) - resp = urllib.request.urlopen(self.base + "search?" + urllib.parse.urlencode(_pars)) + req = urllib.request.Request(self.base + "search?" + urllib.parse.urlencode(_pars)) + req.add_header("User-Agent", session.useragent) + resp = urllib.request.urlopen(req) try: page = soupify(resp.read()) finally: