Isort, reformat and refactor

Author: bohdanbobrowski

blog2epub/Blog2EpubCli.py

@@ -1,7 +1,8 @@
 import sys
 from urllib import parse
 
-from blog2epub.Blog2Epub import Blog2Epub, BadUrlException, NotEnoughCommandsException
+from blog2epub.Blog2Epub import (BadUrlException, Blog2Epub,
+                                 NotEnoughCommandsException)
 from blog2epub.crawlers.Crawler import EmptyInterface
 
 

blog2epub/Blog2EpubKivy.py

@@ -26,7 +26,7 @@
 from kivy.uix.popup import Popup
 from kivy.uix.textinput import TextInput
 
-from blog2epub.Blog2Epub import Blog2Epub, BadUrlException
+from blog2epub.Blog2Epub import BadUrlException, Blog2Epub
 from blog2epub.Common import asset_path
 from blog2epub.crawlers.Crawler import EmptyInterface
 
@@ -193,7 +193,6 @@ def save_settings(self):
 
     def about_popup(self, instance):
         about_content = BoxLayout(orientation="vertical")
-        self.interface.print(asset_path("blog2epub.png"))
         about_content.add_widget(
             Image(
                 source=asset_path("blog2epub.png"),

blog2epub/Common.py

@@ -1,38 +1,10 @@
-import logging
 import os
-import platform
 import sys
-from pathlib import Path
 
 
 def asset_path(filename: str) -> str:
-    # TODO: this needs refactor
-    result = None
-    if platform.system() == "Windows":
-        try:
-            base_path = sys._MEIPASS
-        except AttributeError:
-            base_path = os.path.abspath("./assets/")
-        result = os.path.join(base_path, filename)
-    elif platform.system() == "Darwin":
-        in_osx_app = os.path.join(
-            os.path.dirname(sys.executable).replace(
-                "/Contents/MacOS", "/Contents/Resources"
-            ),
-            filename,
-        )
-        in_sources = os.path.join(
-            Path(__file__).parent.resolve(), "..", "assets", filename
-        )
-        if os.path.isfile(in_osx_app):
-            result = in_osx_app
-        if os.path.isfile(in_sources):
-            result = in_sources
-    else:
-        in_sources = os.path.join(
-            Path(__file__).parent.resolve(), "..", "assets", filename
-        )
-        if os.path.isfile(in_sources):
-            result = in_sources
-    logging.info(f"Loading asset: {result}")
-    return result
+    try:
+        base_path = sys._MEIPASS
+    except AttributeError:
+        base_path = os.path.abspath("./assets/")
+    return os.path.join(base_path, filename)

blog2epub/crawlers/Crawler.py

@@ -16,9 +16,9 @@
 import atoma
 import dateutil.parser
 import requests
-from PIL import Image
 from lxml.ElementInclude import etree
 from lxml.html.soupparser import fromstring
+from PIL import Image
 
 import blog2epub
 from blog2epub.Book import Book

blog2epub/crawlers/CrawlerWordpress.py

@@ -8,7 +8,7 @@
 from lxml.ElementInclude import etree
 from lxml.html.soupparser import fromstring
 
-from blog2epub.crawlers.Crawler import Crawler, Article
+from blog2epub.crawlers.Crawler import Article, Crawler
 
 
 class CrawlerWordpress(Crawler):