kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00
Code Activity

remove SUPPORTED_FORMATS list from rewritemeta

Browse Source
This commit is contained in:
Michael Pöhn 2020-08-19 19:24:47 +02:00
parent fac033314a
commit c45ef453fd
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fdroidserver/rewritemeta.py
View File

@ -30,9 +30,6 @@ config = None
options = None options = None
SUPPORTED_FORMATS = ['yml']
def proper_format(app): def proper_format(app):
s = io.StringIO() s = io.StringIO()
# TODO: currently reading entire file again, should reuse first # TODO: currently reading entire file again, should reuse first
@ -56,8 +53,6 @@ def main():
common.setup_global_opts(parser) common.setup_global_opts(parser)
parser.add_argument("-l", "--list", action="store_true", default=False, parser.add_argument("-l", "--list", action="store_true", default=False,
help=_("List files that would be reformatted")) help=_("List files that would be reformatted"))
parser.add_argument("-t", "--to", default=None,
help=_("Rewrite to a specific format: ") + ', '.join(SUPPORTED_FORMATS))
parser.add_argument("appid", nargs='*', help=_("applicationId in the form APPID")) parser.add_argument("appid", nargs='*', help=_("applicationId in the form APPID"))
metadata.add_metadata_arguments(parser) metadata.add_metadata_arguments(parser)
options = parser.parse_args() options = parser.parse_args()
@ -69,28 +64,15 @@ def main():
allapps = metadata.read_metadata(xref=True) allapps = metadata.read_metadata(xref=True)
apps = common.read_app_args(options.appid, allapps, False) apps = common.read_app_args(options.appid, allapps, False)
if options.list and options.to is not None:
parser.error(_("Cannot use --list and --to at the same time"))
if options.to is not None and options.to not in SUPPORTED_FORMATS:
parser.error(_("Unsupported metadata format, use: --to [{supported}]")
.format(supported=' '.join(SUPPORTED_FORMATS)))
for appid, app in apps.items(): for appid, app in apps.items():
path = app.metadatapath path = app.metadatapath
base, ext = common.get_extension(path) base, ext = common.get_extension(path)
if not options.to and ext not in SUPPORTED_FORMATS: if ext != "yml":
logging.info(_("Ignoring {ext} file at '{path}'").format(ext=ext, path=path)) logging.info(_("Ignoring {ext} file at '{path}'").format(ext=ext, path=path))
continue continue
elif options.to is not None:
logging.info(_("Rewriting '{appid}' to '{path}'").format(appid=appid, path=options.to))
else: else:
logging.info(_("Rewriting '{appid}'").format(appid=appid)) logging.info(_("Rewriting '{appid}'").format(appid=appid))
to_ext = ext
if options.to is not None:
to_ext = options.to
if options.list: if options.list:
if not proper_format(app): if not proper_format(app):
print(path) print(path)
@ -108,11 +90,7 @@ def main():
app.builds = newbuilds app.builds = newbuilds
try: try:
metadata.write_metadata(base + '.' + to_ext, app) metadata.write_metadata(path, app)
# remove old format metadata if there was a format change
# and rewriting to the new format worked
if ext != to_ext:
os.remove(path)
finally: finally:
pass pass