Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use a non-deprecated technique for resuming partial downloads in the Linux installer. Fixes #1827289 [Deprecation warning in installation script.](https://bugs.launchpad.net/calibre/+bug/1827289)

Browse Source
This commit is contained in:
Kovid Goyal 2019-05-02 07:17:44 +05:30
parent bc9ac66ae2
commit d6402a0fdd
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
setup/linux-installer.py
View File

@ -26,11 +26,13 @@ if py3:
unicode = str unicode = str
raw_input = input raw_input = input
from urllib.parse import urlparse from urllib.parse import urlparse
from urllib.request import BaseHandler, build_opener, Request
import http.client as httplib import http.client as httplib
encode_for_subprocess = lambda x:x encode_for_subprocess = lambda x:x
else: else:
from future_builtins import map from future_builtins import map
from urlparse import urlparse from urlparse import urlparse
from urllib2 import BaseHandler, build_opener, Request
import httplib import httplib
def encode_for_subprocess(x): def encode_for_subprocess(x):
@ -266,18 +268,21 @@ def check_signature(dest, signature):
return raw return raw
class URLOpener(urllib.FancyURLopener): class RangeHandler(BaseHandler):
def http_error_206(self, url, fp, errcode, errmsg, headers, data=None): def http_error_206(self, req, fp, code, msg, hdrs):
''' 206 means partial content, ignore it ''' # 206 Partial Content Response
pass r = urllib.addinfourl(fp, hdrs, req.get_full_url())
r.code = code
r.msg = msg
return r
https_error_206 = http_error_206
def do_download(dest): def do_download(dest):
prints('Will download and install', os.path.basename(dest)) prints('Will download and install', os.path.basename(dest))
reporter = Reporter(os.path.basename(dest)) reporter = Reporter(os.path.basename(dest))
offset = 0 offset = 0
urlopener = URLOpener()
if os.path.exists(dest): if os.path.exists(dest):
offset = os.path.getsize(dest) offset = os.path.getsize(dest)
@ -288,11 +293,13 @@ def do_download(dest):
accepts_ranges = headers.get('accept-ranges', None) == 'bytes' accepts_ranges = headers.get('accept-ranges', None) == 'bytes'
mode = 'wb' mode = 'wb'
if accepts_ranges and offset > 0: if accepts_ranges and offset > 0:
rurl = rq.geturl() req = Request(rq.geturl())
req.add_header('Range', 'bytes=%s-'%offset)
mode = 'ab' mode = 'ab'
rq.close() rq.close()
urlopener.addheader('Range', 'bytes=%s-'%offset) handler = RangeHandler()
rq = urlopener.open(rurl) opener = build_opener(handler)
rq = opener.open(req)
with open(dest, mode) as f: with open(dest, mode) as f:
while f.tell() < size: while f.tell() < size:
raw = rq.read(8192) raw = rq.read(8192)

27
setup/linux-installer.sh
View File

@ -75,11 +75,13 @@ if py3:
unicode = str unicode = str
raw_input = input raw_input = input
from urllib.parse import urlparse from urllib.parse import urlparse
from urllib.request import BaseHandler, build_opener, Request
import http.client as httplib import http.client as httplib
encode_for_subprocess = lambda x:x encode_for_subprocess = lambda x:x
else: else:
from future_builtins import map from future_builtins import map
from urlparse import urlparse from urlparse import urlparse
from urllib2 import BaseHandler, build_opener, Request
import httplib import httplib
def encode_for_subprocess(x): def encode_for_subprocess(x):
@ -315,18 +317,21 @@ def check_signature(dest, signature):
return raw return raw
class URLOpener(urllib.FancyURLopener): class RangeHandler(BaseHandler):
def http_error_206(self, url, fp, errcode, errmsg, headers, data=None): def http_error_206(self, req, fp, code, msg, hdrs):
''' 206 means partial content, ignore it ''' # 206 Partial Content Response
pass r = urllib.addinfourl(fp, hdrs, req.get_full_url())
r.code = code
r.msg = msg
return r
https_error_206 = http_error_206
def do_download(dest): def do_download(dest):
prints('Will download and install', os.path.basename(dest)) prints('Will download and install', os.path.basename(dest))
reporter = Reporter(os.path.basename(dest)) reporter = Reporter(os.path.basename(dest))
offset = 0 offset = 0
urlopener = URLOpener()
if os.path.exists(dest): if os.path.exists(dest):
offset = os.path.getsize(dest) offset = os.path.getsize(dest)
@ -337,11 +342,13 @@ def do_download(dest):
accepts_ranges = headers.get('accept-ranges', None) == 'bytes' accepts_ranges = headers.get('accept-ranges', None) == 'bytes'
mode = 'wb' mode = 'wb'
if accepts_ranges and offset > 0: if accepts_ranges and offset > 0:
rurl = rq.geturl() req = Request(rq.geturl())
req.add_header('Range', 'bytes=%s-'%offset)
mode = 'ab' mode = 'ab'
rq.close() rq.close()
urlopener.addheader('Range', 'bytes=%s-'%offset) handler = RangeHandler()
rq = urlopener.open(rurl) opener = build_opener(handler)
rq = opener.open(req)
with open(dest, mode) as f: with open(dest, mode) as f:
while f.tell() < size: while f.tell() < size:
raw = rq.read(8192) raw = rq.read(8192)
@ -368,7 +375,7 @@ def download_tarball():
dest = os.path.join(cache, fname) dest = os.path.join(cache, fname)
raw = check_signature(dest, signature) raw = check_signature(dest, signature)
if raw is not None: if raw is not None:
print ('Using previously downloaded', fname) print('Using previously downloaded', fname)
return raw return raw
cached_sigf = dest +'.signature' cached_sigf = dest +'.signature'
cached_sig = None cached_sig = None
@ -720,7 +727,7 @@ def run_installer(install_dir, isolated, bin_dir, share_dir):
if not os.path.isdir(destdir): if not os.path.isdir(destdir):
prints(destdir, 'exists and is not a directory. Choose a location like /opt or /usr/local') prints(destdir, 'exists and is not a directory. Choose a location like /opt or /usr/local')
return 1 return 1
print ('Installing to', destdir) print('Installing to', destdir)
download_and_extract(destdir) download_and_extract(destdir)