user requests and change display format

Author: digitronik

setup.py

@@ -5,7 +5,7 @@
 with open("README.md") as readme_file:
     readme = readme_file.read()
 
-install_requirements = ["click", "markdown"]
+install_requirements = ["click", "markdown", "requests"]
 
 setup_requirements = ["setuptools_scm"]
 
@@ -17,6 +17,9 @@
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        'Intended Audience :: End Users/Desktop',
+        'Intended Audience :: Developers',
+        'Environment :: Console',
     ],
     python_requires=">=3.5",
     description="Simple text/ markdown links status checker",
@@ -27,7 +30,7 @@
     include_package_data=True,
     setup_requires=setup_requirements,
     use_scm_version=True,
-    keywords="linkstatus, linkchecker, link-checker, markdown, text, linklint",
+    keywords=["linkstatus", "linkchecker", "link-checker", "markdown", "text", "linklint", "link"],
     name="linkstatus",
     packages=find_packages(include=["linkstatus"]),
     url="https://github.com/digitronik/linkstatus",

src/linkstatus.py

@@ -1,9 +1,7 @@
 import os
 import glob
-from urllib import request
-from urllib.error import URLError
-from urllib.error import HTTPError
 
+import requests
 import click
 
 from src.parser import parse_file
@@ -16,15 +14,19 @@ def link_status(link):
         link: link to check status
 
     Returns:
-        tuple of status (bool) and status code/ reason
+        tuple of status (bool) and status code
     """
+
     try:
-        connection = request.urlopen(link)
-        return True, connection.code
-    except HTTPError as e:
-        return False, e.code
-    except URLError as e:
-        return False, e.reason
+        status_code = requests.get(link, timeout=3).status_code
+    except requests.exceptions.SSLError:
+        status_code = requests.get(link, verify=False, timeout=3).status_code
+    except Exception:  #noqa
+        # TODO: include exception in logging
+        status_code = None
+        pass
+
+    return status_code == 200, status_code
 
 
 def all_files(source):
@@ -54,9 +56,16 @@ def main(source):
                 for url in link.urls:
                     status, code = link_status(url)
 
-                    fg = "green" if status else "red"
-                    _status = "UP" if status else "DOWN"
-
+                    if status:
+                        fg = "green"
+                        icon = "✓"
+                    else:
+                        fg = "red"
+                        icon = "✗"
                     click.echo(
-                        "L{}: {} ==> {}".format(link.line, url, click.style(_status, fg=fg))
+                        "{icon} L{ln} : {l}".format(
+                            icon=click.style(icon, fg=fg, bold=True),
+                            ln=link.line,
+                            l=click.style(url, fg=fg)
+                        )
                     )

src/parser.py

@@ -22,8 +22,8 @@ def parse_line(string):
         html_format = markdown.markdown(string, output_format='html')
         links = re.findall(REGULAR_EXP, html_format)
 
-        # TODO: Improve regex to remove this workaround for trailing </p>
-        links = [l.replace('</p>', '') if '</p>' in l else l for l in links]
+        # TODO: Improve regex to remove this workaround for trailing </p> or </li>
+        links = [l.replace('</p>', '').replace('</li>', "") for l in links]
         return links
     else:
         return []