diff options
| author | U-ACORNSYS\pwang <pwang@pwang01.acornsys.com> | 2013-07-05 22:27:35 -0500 |
|---|---|---|
| committer | U-ACORNSYS\pwang <pwang@pwang01.acornsys.com> | 2013-07-05 22:27:35 -0500 |
| commit | a86e32c9d8e486999c25d7deb8039db0556cd2c2 (patch) | |
| tree | 747979c5663c73b37c064fdba226b5119f4d7322 | |
| parent | 373076efe2155b4df6ad44c8f9a80831a77a8643 (diff) | |
| parent | db89d5626467d5a67dad78c10d1d8049f5f514b5 (diff) | |
| download | paperbot-a86e32c9.tar.gz paperbot-a86e32c9.zip | |
libgen kwargs
| -rw-r--r-- | modules/papers.py | 6 | ||||
| -rw-r--r-- | modules/scihub.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/papers.py b/modules/papers.py index b7bc0fa..68860df 100644 --- a/modules/papers.py +++ b/modules/papers.py @@ -8,7 +8,7 @@ import random import requests import lxml.etree from StringIO import StringIO -from scihub import scihubber, libgen +import modules.scihub import pdfparanoia @@ -136,10 +136,10 @@ def download(phenny, input, verbose=True): phenny.say(download_url(line)) continue else: - pdfurl, doi = scihubber(line, headers={}) + pdfurl, doi = modules.scihub.scihubber(line, headers={}) if pdfurl: if str.find(pdfurl, "pdfcache"): - if doi: phenny.say(libgen(pdfurl, doi, headers={})) + if doi: phenny.say(modules.scihub.libgen(pdfurl, doi, headers={})) else: phenny.say(download_url(pdfurl)) else: phenny.say(pdfurl) return diff --git a/modules/scihub.py b/modules/scihub.py index 90fa631..922e7e4 100644 --- a/modules/scihub.py +++ b/modules/scihub.py @@ -15,9 +15,9 @@ scihub_cookie = os.environ.get("SCIHUB_PASSWORD", None) if scihub_cookie == None: raise Exception("need SCIHUB_PASSWORD set") -def libgen(url, doi): +def libgen(url, doi, **kwargs): auth_ = requests.auth.HTTPBasicAuth("genesis", "upload") - re = requests.get(url) + re = requests.get(url, **kwargs) payload = "data:application/pdf;base64," + base64.b64encode(re.content) re = requests.get("http://libgen.org/scimag/librarian/form.php", auth = auth_, files = {"uploadedfile":("derp.pdf", payload)}, data = {"doi": doi}) |