mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 23:10:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '1.0-fixes' into 'master'

Browse source 
1.0 fixes

Closes #357

See merge request fdroid/fdroidserver!353
This commit is contained in:
Torsten Grote 2017-10-17 14:19:47 +00:00
commit 7832c0ef38
5 changed files with 782 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/exception.py
View file

@ -19,7 +19,7 @@ class FDroidException(Exception):
def __str__(self): def __str__(self):
ret = self.value ret = self.value
if self.detail: if self.detail:
ret += "\n==== detail begin ====\n%s\n==== detail end ====" % self.detail.strip() ret += "\n==== detail begin ====\n%s\n==== detail end ====" % ''.join(self.detail).strip()
return ret return ret

68
fdroidserver/server.py
View file

@ -69,7 +69,8 @@ def update_awsbucket_s3cmd(repo_section):
to use a full MD5 checksum of all files to detect changes. to use a full MD5 checksum of all files to detect changes.
''' '''
logging.debug('using s3cmd to sync with ' + config['awsbucket']) logging.debug(_('Using s3cmd to sync with: {url}')
.format(url=config['awsbucket']))
configfilename = '.s3cfg' configfilename = '.s3cfg'
fd = os.open(configfilename, os.O_CREAT | os.O_TRUNC | os.O_WRONLY, 0o600) fd = os.open(configfilename, os.O_CREAT | os.O_TRUNC | os.O_WRONLY, 0o600)
@ -78,22 +79,29 @@ def update_awsbucket_s3cmd(repo_section):
os.write(fd, ('secret_key = ' + config['awssecretkey'] + '\n').encode('utf-8')) os.write(fd, ('secret_key = ' + config['awssecretkey'] + '\n').encode('utf-8'))
os.close(fd) os.close(fd)
s3url = 's3://' + config['awsbucket'] + '/fdroid/' s3bucketurl = 's3://' + config['awsbucket']
s3cmdargs = [ s3cmd = [config['s3cmd'], '--config=' + configfilename]
's3cmd', if subprocess.call(s3cmd + ['info', s3bucketurl]) != 0:
'sync', logging.warning(_('Creating new S3 bucket: {url}')
'--config=' + configfilename, .format(url=s3bucketurl))
'--acl-public', if subprocess.call(s3cmd + ['mb', s3bucketurl]) != 0:
] logging.error(_('Failed to create S3 bucket: {url}')
.format(url=s3bucketurl))
raise FDroidException()
s3cmd_sync = s3cmd + ['sync', '--acl-public']
if options.verbose: if options.verbose:
s3cmdargs += ['--verbose'] s3cmd_sync += ['--verbose']
if options.quiet: if options.quiet:
s3cmdargs += ['--quiet'] s3cmd_sync += ['--quiet']
indexxml = os.path.join(repo_section, 'index.xml') indexxml = os.path.join(repo_section, 'index.xml')
indexjar = os.path.join(repo_section, 'index.jar') indexjar = os.path.join(repo_section, 'index.jar')
indexv1jar = os.path.join(repo_section, 'index-v1.jar') indexv1jar = os.path.join(repo_section, 'index-v1.jar')
s3url = s3bucketurl + '/fdroid/'
logging.debug('s3cmd sync new files in ' + repo_section + ' to ' + s3url) logging.debug('s3cmd sync new files in ' + repo_section + ' to ' + s3url)
if subprocess.call(s3cmdargs + logging.debug(_('Running first pass with MD5 checking disabled'))
if subprocess.call(s3cmd_sync +
['--no-check-md5', '--skip-existing', ['--no-check-md5', '--skip-existing',
'--exclude', indexxml, '--exclude', indexxml,
'--exclude', indexjar, '--exclude', indexjar,
@ -101,7 +109,7 @@ def update_awsbucket_s3cmd(repo_section):
repo_section, s3url]) != 0: repo_section, s3url]) != 0:
raise FDroidException() raise FDroidException()
logging.debug('s3cmd sync all files in ' + repo_section + ' to ' + s3url) logging.debug('s3cmd sync all files in ' + repo_section + ' to ' + s3url)
if subprocess.call(s3cmdargs + if subprocess.call(s3cmd_sync +
['--no-check-md5', ['--no-check-md5',
'--exclude', indexxml, '--exclude', indexxml,
'--exclude', indexjar, '--exclude', indexjar,
@ -109,14 +117,15 @@ def update_awsbucket_s3cmd(repo_section):
repo_section, s3url]) != 0: repo_section, s3url]) != 0:
raise FDroidException() raise FDroidException()
logging.debug('s3cmd sync indexes ' + repo_section + ' to ' + s3url + ' and delete') logging.debug(_('s3cmd sync indexes {path} to {url} and delete')
s3cmdargs.append('--delete-removed') .format(path=repo_section, url=s3url))
s3cmdargs.append('--delete-after') s3cmd_sync.append('--delete-removed')
s3cmd_sync.append('--delete-after')
if options.no_checksum: if options.no_checksum:
s3cmdargs.append('--no-check-md5') s3cmd_sync.append('--no-check-md5')
else: else:
s3cmdargs.append('--check-md5') s3cmd_sync.append('--check-md5')
if subprocess.call(s3cmdargs + [repo_section, s3url]) != 0: if subprocess.call(s3cmd_sync + [repo_section, s3url]) != 0:
raise FDroidException() raise FDroidException()
@ -129,7 +138,8 @@ def update_awsbucket_libcloud(repo_section):
Requires AWS credentials set in config.py: awsaccesskeyid, awssecretkey Requires AWS credentials set in config.py: awsaccesskeyid, awssecretkey
''' '''
logging.debug('using Apache libcloud to sync with ' + config['awsbucket']) logging.debug(_('using Apache libcloud to sync with {url}')
.format(url=config['awsbucket']))
import libcloud.security import libcloud.security
libcloud.security.VERIFY_SSL_CERT = True libcloud.security.VERIFY_SSL_CERT = True
@ -138,7 +148,7 @@ def update_awsbucket_libcloud(repo_section):
if not config.get('awsaccesskeyid') or not config.get('awssecretkey'): if not config.get('awsaccesskeyid') or not config.get('awssecretkey'):
raise FDroidException( raise FDroidException(
'To use awsbucket, you must set awssecretkey and awsaccesskeyid in config.py!') _('To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!'))
awsbucket = config['awsbucket'] awsbucket = config['awsbucket']
cls = get_driver(Provider.S3) cls = get_driver(Provider.S3)
@ -147,7 +157,8 @@ def update_awsbucket_libcloud(repo_section):
container = driver.get_container(container_name=awsbucket) container = driver.get_container(container_name=awsbucket)
except ContainerDoesNotExistError: except ContainerDoesNotExistError:
container = driver.create_container(container_name=awsbucket) container = driver.create_container(container_name=awsbucket)
logging.info('Created new container "' + container.name + '"') logging.info(_('Created new container "{name}"')
.format(name=container.name))
upload_dir = 'fdroid/' + repo_section upload_dir = 'fdroid/' + repo_section
objs = dict() objs = dict()
@ -403,7 +414,7 @@ def update_servergitmirrors(servergitmirrors, repo_section):
repo.git.add(all=True) repo.git.add(all=True)
repo.index.commit("fdroidserver git-mirror: Deploy to GitLab Pages") repo.index.commit("fdroidserver git-mirror: Deploy to GitLab Pages")
logging.debug('Pushing to ' + remote.url) logging.debug(_('Pushing to {url}').format(url=remote.url))
with repo.git.custom_environment(GIT_SSH_COMMAND=ssh_cmd): with repo.git.custom_environment(GIT_SSH_COMMAND=ssh_cmd):
pushinfos = remote.push('master', force=True, set_upstream=True, progress=progress) pushinfos = remote.push('master', force=True, set_upstream=True, progress=progress)
for pushinfo in pushinfos: for pushinfo in pushinfos:
@ -540,7 +551,8 @@ def push_binary_transparency(git_repo_path, git_remote):
''' '''
import git import git
logging.info('Pushing binary transparency log to ' + git_remote) logging.info(_('Pushing binary transparency log to {url}')
.format(url=git_remote))
if os.path.isdir(os.path.dirname(git_remote)): if os.path.isdir(os.path.dirname(git_remote)):
# from offline machine to thumbdrive # from offline machine to thumbdrive
@ -628,17 +640,17 @@ def main():
logging.error(_('local_copy_dir must be directory, not a file!')) logging.error(_('local_copy_dir must be directory, not a file!'))
sys.exit(1) sys.exit(1)
if not os.path.exists(os.path.dirname(fdroiddir)): if not os.path.exists(os.path.dirname(fdroiddir)):
logging.error('The root dir for local_copy_dir "' logging.error(_('The root dir for local_copy_dir "{path}" does not exist!')
+ os.path.dirname(fdroiddir) .format(path=os.path.dirname(fdroiddir)))
+ '" does not exist!')
sys.exit(1) sys.exit(1)
if not os.path.isabs(fdroiddir): if not os.path.isabs(fdroiddir):
logging.error(_('local_copy_dir must be an absolute path!')) logging.error(_('local_copy_dir must be an absolute path!'))
sys.exit(1) sys.exit(1)
repobase = os.path.basename(fdroiddir) repobase = os.path.basename(fdroiddir)
if standardwebroot and repobase != 'fdroid': if standardwebroot and repobase != 'fdroid':
logging.error('local_copy_dir does not end with "fdroid", ' logging.error(_('local_copy_dir does not end with "fdroid", '
+ 'perhaps you meant: ' + fdroiddir + '/fdroid') + 'perhaps you meant: "{path}"')
.format(path=fdroiddir + '/fdroid'))
sys.exit(1) sys.exit(1)
if local_copy_dir[-1] != '/': if local_copy_dir[-1] != '/':
local_copy_dir += '/' local_copy_dir += '/'

10
fdroidserver/update.py
View file

@ -717,15 +717,16 @@ def copy_triple_t_store_metadata(apps):
base, extension = common.get_extension(f) base, extension = common.get_extension(f)
dirname = os.path.basename(root) dirname = os.path.basename(root)
if dirname in GRAPHIC_NAMES and extension in ALLOWED_EXTENSIONS: if extension in ALLOWED_EXTENSIONS \
and (dirname in GRAPHIC_NAMES or dirname in SCREENSHOT_DIRS):
if segments[-2] == 'listing': if segments[-2] == 'listing':
locale = segments[-3] locale = segments[-3]
else: else:
locale = segments[-2] locale = segments[-2]
destdir = os.path.join('repo', packageName, locale) destdir = os.path.join('repo', packageName, locale, dirname)
os.makedirs(destdir, mode=0o755, exist_ok=True) os.makedirs(destdir, mode=0o755, exist_ok=True)
sourcefile = os.path.join(root, f) sourcefile = os.path.join(root, f)
destfile = os.path.join(destdir, dirname + '.' + extension) destfile = os.path.join(destdir, os.path.basename(f))
logging.debug('copying ' + sourcefile + ' ' + destfile) logging.debug('copying ' + sourcefile + ' ' + destfile)
shutil.copy(sourcefile, destfile) shutil.copy(sourcefile, destfile)
@ -816,6 +817,9 @@ def insert_localized_app_metadata(apps):
shutil.copy(os.path.join(root, f), destdir) shutil.copy(os.path.join(root, f), destdir)
for d in dirs: for d in dirs:
if d in SCREENSHOT_DIRS: if d in SCREENSHOT_DIRS:
if locale == 'images':
locale = segments[-2]
destdir = os.path.join('repo', packageName, locale)
for f in glob.glob(os.path.join(root, d, '*.*')): for f in glob.glob(os.path.join(root, d, '*.*')):
_, extension = common.get_extension(f) _, extension = common.get_extension(f)
if extension in ALLOWED_EXTENSIONS: if extension in ALLOWED_EXTENSIONS:

7
locale/Makefile
View file

@ -1,5 +1,8 @@
FILES = ../fdroid $(wildcard ../fdroidserver/*.py) FILES = ../fdroid $(wildcard ../fdroidserver/*.py) \
$(wildcard /usr/lib/python3.*/argparse.py) \
$(wildcard /usr/lib/python3.*/optparse.py) \
$(wildcard /usr/lib/python3.*/getopt.py)
# these are the supported languages # these are the supported languages
ALL_LINGUAS = de es pt_BR pt_PT tr zh_Hans zh_Hant ALL_LINGUAS = de es pt_BR pt_PT tr zh_Hans zh_Hant
@ -23,7 +26,7 @@ template: $(TEMPLATE)
$(TEMPLATE): $(FILES) $(TEMPLATE): $(FILES)
xgettext --join-existing --from-code=UTF-8 \ xgettext --join-existing --from-code=UTF-8 \
--language=Python --keyword=_ \ --language=Python --keyword=_ \
--sort-output --no-location --output=$(TEMPLATE) \ --sort-output --add-location=file --output=$(TEMPLATE) \
--package-name="fdroidserver" --package-version=$(VERSION) \ --package-name="fdroidserver" --package-version=$(VERSION) \
--foreign-user \ --foreign-user \
--msgid-bugs-address=https://gitlab.com/fdroid/fdroidserver/issues \ --msgid-bugs-address=https://gitlab.com/fdroid/fdroidserver/issues \

733
locale/fdroidserver.pot
View file

File diff suppressed because it is too large Load diff