From 710f36564d5ca1a2c6392c86a053a1e30e7031ca Mon Sep 17 00:00:00 2001 From: Marshal Miller Date: Wed, 3 Jan 2024 20:16:13 -0500 Subject: [PATCH] Regex Streamline --- linkrot/__init__.py | 2 +- linkrot/extractor.py | 32 +++++--------------------------- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/linkrot/__init__.py b/linkrot/__init__.py index dfbb328..fa4240e 100644 --- a/linkrot/__init__.py +++ b/linkrot/__init__.py @@ -31,7 +31,7 @@ """ __title__ = "linkrot" -__version__ = "5.1" +__version__ = "5.2" __author__ = "Marshal Miller" __license__ = "GPL-3.0-or-later" __copyright__ = "Copyright 2024, Marshal Miller" diff --git a/linkrot/extractor.py b/linkrot/extractor.py index 2e8f824..9ff25b0 100644 --- a/linkrot/extractor.py +++ b/linkrot/extractor.py @@ -9,33 +9,11 @@ DOI_REGEX = r"""DOI:\s?([^\s,]+)""" # URL -URL_REGEX = r"""(?i)\b((?:https?:(?:/{1,3}|[a-z0-9%])|[a-z0-9.\-]+[.](?:com|\ -net|org|edu|gov|mil|aero|asia|biz|cat|coop|info|int|jobs|mobi|\ -museum|name|post|pro|tel|travel|xxx|ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|\ -au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|\ -cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cs|cu|cv|cx|cy|cz|dd|de|dj|dk|dm|do|dz|ec|ee|eg|\ -eh|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|\ -gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|\ -kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|\ -mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|\ -nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|\ -sd|se|sg|sh|si|sj|Ja|sk|sl|sm|sn|so|sr|ss|st|su|sv|sx|sy|sz|tc|td|tf|tg|th|tj|\ -tk|tl|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|\ -ye|yt|yu|za|zm|zw)/)(?:[^\s()<>{}\[\]]+|\([^\s()]*?\([^\s()]+\)[^\s()]*?\)|\([\ -^\s]+?\))+(?:\([^\s()]*?\([^\s()]+\)[^\s()]*?\)|\([^\s]+?\)|[^\s`!()\[\]{};:\ -'".,<>?«»“”‘’])|(?:(?