From 2cfcf8444a1bab64f8744ac5d24c53a12ec3448d Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Thu, 16 Apr 2020 10:16:33 +0100 Subject: Allow + in urls --- paper2remarkable/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paper2remarkable/utils.py b/paper2remarkable/utils.py index 791e81a..97ff713 100644 --- a/paper2remarkable/utils.py +++ b/paper2remarkable/utils.py @@ -163,7 +163,7 @@ def upload_to_remarkable(filepath, remarkable_dir="/", rmapi_path="rmapi"): def is_url(string): # pattern adapted from CleverCSV - pattern = "((https?|ftp):\/\/(?!\-))?(((([\p{L}\p{N}]*\-?[\p{L}\p{N}]+)+\.)+([a-z]{2,}|local)(\.[a-z]{2,3})?)|localhost|(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(\:\d{1,5})?))(\/[\p{L}\p{N}_\/()~?=&%\-\#\.:]*)?(\.[a-z]+)?" + pattern = "((https?|ftp):\/\/(?!\-))?(((([\p{L}\p{N}]*\-?[\p{L}\p{N}]+)+\.)+([a-z]{2,}|local)(\.[a-z]{2,3})?)|localhost|(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(\:\d{1,5})?))(\/[\p{L}\p{N}_\/()~?=&%\-\#\.:+]*)?(\.[a-z]+)?" string = string.strip(" ") match = regex.fullmatch(pattern, string) return match is not None -- cgit v1.2.3