From 4c7c01f0ab441ab881d94fca25005561debf6773 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Mon, 3 Feb 2020 22:00:17 +0000 Subject: Reorder provider check for local file The is_url function can in some cases consider a path to a file as a valid url, which defeats the purpose. So I'm setting it back to first checking for a local file, then checking for a url --- paper2remarkable/ui.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/paper2remarkable/ui.py b/paper2remarkable/ui.py index 032bf99..4160f12 100644 --- a/paper2remarkable/ui.py +++ b/paper2remarkable/ui.py @@ -99,13 +99,13 @@ def main(): args = parse_args() cookiejar = None - if is_url(args.input): + if LocalFile.validate(args.input): + # input is a local file + provider = LocalFile + elif is_url(args.input): # input is a url url, cookiejar = follow_redirects(args.input) provider = next((p for p in providers if p.validate(url)), None) - elif LocalFile.validate(args.input): - # input is a local file - provider = LocalFile else: # not a proper URL or non-existent file exception( -- cgit v1.2.3