From f4036f128f66a3a32d0c291ca730647de51137d6 Mon Sep 17 00:00:00 2001 From: Cody Logan Date: Fri, 14 Jun 2019 14:19:27 -0700 Subject: Case insensitive check for File: prefix --- test/test_wikiget.py | 2 +- wikiget/wikiget.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test_wikiget.py b/test/test_wikiget.py index 71c9006..143bd71 100644 --- a/test/test_wikiget.py +++ b/test/test_wikiget.py @@ -60,7 +60,7 @@ def test_valid_file_input(): Valid file strings should return regex match objects. """ valid_input = ["Image:example.jpg", "file:example.jpg", - "File:example.file-01.jpg", + "File:example.file-01.jpg", "FILE:FOO.BMP", "File:ß handwritten sample.gif", "File:A (1).jpeg"] for i in valid_input: file_match = wikiget.valid_file(i) diff --git a/wikiget/wikiget.py b/wikiget/wikiget.py index 895d4b3..196ceb0 100644 --- a/wikiget/wikiget.py +++ b/wikiget/wikiget.py @@ -163,7 +163,7 @@ def main(): print(e) sys.exit(1) - # verify file integrity + # verify file integrity and optionally print details dl_sha1 = verify_hash(dest) if args.verbose >= 1: @@ -193,7 +193,7 @@ def valid_file(search_string): """ # second group could also restrict to file extensions with three or more # letters with ([^/\r\n\t\f\v]+\.\w{3,}) - file_regex = re.compile(r"([Ff]ile:|[Ii]mage:)([^/\r\n\t\f\v]+\.\w+)$") + file_regex = re.compile(r"(File:|Image:)([^/\r\n\t\f\v]+\.\w+)$", re.I) return file_regex.search(search_string) -- cgit v1.2.3