From dd1cb3dc4f6bd10b07d66098a091ee6a70309114 Mon Sep 17 00:00:00 2001 From: Caesim404 Date: Tue, 31 Jan 2017 11:30:55 +0200 Subject: [PATCH 1/3] Fix error on initial download and using curl --- cloudget.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cloudget.py b/cloudget.py index 5d5a59d..79331e4 100755 --- a/cloudget.py +++ b/cloudget.py @@ -264,7 +264,7 @@ def cfcookie(cfurl): sess = requests.session() p = urlparse(cfurl) mnt = p.scheme + '://' - sess.mount(mnt, cfscrape.CloudflareAdapter()) + sess.mount(mnt, cfscrape.CloudflareScraper()) sess.get(cfurl) #sess.cookies l = sess.get(cfurl) @@ -276,7 +276,7 @@ def cfcookie(cfurl): ct = u''.join(t).encode('utf-8').strip() print('\033[34;1m' + str(cs) + '\033[0m') print('\033[32;1m' + str(ct) + '\033[0m') - cookies = "\"cf_clearance\"=\"%s\"" % sess.cookies.get('cf_clearance') + cookies = "\"cf_clearance\"=\"%s\"" % (sess.cookies.get('cf_clearance') if sess.cookies.get('cf_clearance') != None else "") if sess.cookies.get('__cfduid'): cookies = cookies + ";\"__cfduid\"=\"%s\"" % sess.cookies.get('__cfduid') else: @@ -436,7 +436,7 @@ def getpage(cfurl): checkresume = '2' dld = 0 df = open(savefile, 'wb+') - resumeheader = None + resumeheader = {} dlmsg = "\nwriting content to \'download\' directory as file %s. this may take awhile depending on file size... \n" % outfile print(dlmsg) From ca8346ab909f79df22d04e763425f4bc9a895adc Mon Sep 17 00:00:00 2001 From: Caesim404 Date: Tue, 31 Jan 2017 11:35:41 +0200 Subject: [PATCH 2/3] Revert "Fix error on initial download and using curl" This reverts commit dd1cb3dc4f6bd10b07d66098a091ee6a70309114. --- cloudget.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cloudget.py b/cloudget.py index 79331e4..5d5a59d 100755 --- a/cloudget.py +++ b/cloudget.py @@ -264,7 +264,7 @@ def cfcookie(cfurl): sess = requests.session() p = urlparse(cfurl) mnt = p.scheme + '://' - sess.mount(mnt, cfscrape.CloudflareScraper()) + sess.mount(mnt, cfscrape.CloudflareAdapter()) sess.get(cfurl) #sess.cookies l = sess.get(cfurl) @@ -276,7 +276,7 @@ def cfcookie(cfurl): ct = u''.join(t).encode('utf-8').strip() print('\033[34;1m' + str(cs) + '\033[0m') print('\033[32;1m' + str(ct) + '\033[0m') - cookies = "\"cf_clearance\"=\"%s\"" % (sess.cookies.get('cf_clearance') if sess.cookies.get('cf_clearance') != None else "") + cookies = "\"cf_clearance\"=\"%s\"" % sess.cookies.get('cf_clearance') if sess.cookies.get('__cfduid'): cookies = cookies + ";\"__cfduid\"=\"%s\"" % sess.cookies.get('__cfduid') else: @@ -436,7 +436,7 @@ def getpage(cfurl): checkresume = '2' dld = 0 df = open(savefile, 'wb+') - resumeheader = {} + resumeheader = None dlmsg = "\nwriting content to \'download\' directory as file %s. this may take awhile depending on file size... \n" % outfile print(dlmsg) From de747564168fc4e445807da20c21cbcea81dbf71 Mon Sep 17 00:00:00 2001 From: Caesim404 Date: Tue, 31 Jan 2017 11:37:43 +0200 Subject: [PATCH 3/3] Fix error on initial download and using curl --- cloudget.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudget.py b/cloudget.py index 5d5a59d..a68e3d2 100755 --- a/cloudget.py +++ b/cloudget.py @@ -264,7 +264,7 @@ def cfcookie(cfurl): sess = requests.session() p = urlparse(cfurl) mnt = p.scheme + '://' - sess.mount(mnt, cfscrape.CloudflareAdapter()) + sess.mount(mnt, cfscrape.CloudflareScraper()) sess.get(cfurl) #sess.cookies l = sess.get(cfurl) @@ -436,7 +436,7 @@ def getpage(cfurl): checkresume = '2' dld = 0 df = open(savefile, 'wb+') - resumeheader = None + resumeheader = {} dlmsg = "\nwriting content to \'download\' directory as file %s. this may take awhile depending on file size... \n" % outfile print(dlmsg)