Skip to content

Completing md5sum comparison and download #915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 26, 2016
Merged

Completing md5sum comparison and download #915

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0478279
Fixing referenced before assignment
thopiekar Oct 23, 2016
7c3d5e1
recipe: Completing comparison via md5sum
thopiekar Oct 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions pythonforandroid/recipe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from urlparse import urlparse
except ImportError:
from urllib.parse import urlparse
from pythonforandroid.logger import (logger, info, warning, error, shprint, info_main)
from pythonforandroid.logger import (logger, info, warning, error, debug, shprint, info_main)
from pythonforandroid.util import (urlretrieve, current_directory, ensure_dir)

# this import is necessary to keep imp.load_source from complaining :)
Expand Down Expand Up @@ -360,11 +360,15 @@ def download(self):
if not exists(marker_filename):
shprint(sh.rm, filename)
elif self.md5sum:
current_md5 = shprint(sh.md5sum, filename)
print('downloaded md5: {}'.format(current_md5))
print('expected md5: {}'.format(self.md5sum))
print('md5 not handled yet, exiting')
exit(1)
current_md5 = shprint(sh.md5sum, filename).split()[0]
if current_md5 == self.md5sum:
debug('Downloaded expected content!')
do_download = False
else:
info('Downloaded unexpected content...')
debug('* Generated md5sum: {}'.format(current_md5))
debug('* Expected md5sum: {}'.format(self.md5sum))

else:
do_download = False
info('{} download already cached, skipping'
Expand All @@ -375,17 +379,22 @@ def download(self):

# If we got this far, we will download
if do_download:
print('Downloading {} from {}'.format(self.name, url))
debug('Downloading {} from {}'.format(self.name, url))

shprint(sh.rm, '-f', marker_filename)
self.download_file(url, filename)
shprint(sh.touch, marker_filename)

if self.md5sum is not None:
print('downloaded md5: {}'.format(current_md5))
print('expected md5: {}'.format(self.md5sum))
print('md5 not handled yet, exiting')
exit(1)
if exists(filename) and isfile(filename) and self.md5sum:
current_md5 = shprint(sh.md5sum, filename).split()[0]
if self.md5sum is not None:
if current_md5 == self.md5sum:
debug('Downloaded expected content!')
else:
info('Downloaded unexpected content...')
debug('* Generated md5sum: {}'.format(current_md5))
debug('* Expected md5sum: {}'.format(self.md5sum))
exit(1)

def unpack(self, arch):
info_main('Unpacking {} for {}'.format(self.name, arch))
Expand Down