more linting updates

Author: Benjababe

core/download.py

@@ -1,10 +1,10 @@
 import asyncio
 from typing import List
-import cfscrape
 import os
 import re
-import requests
 from concurrent.futures import ThreadPoolExecutor
+import requests
+import cfscrape
 
 from models import Chapter, Extension
 
@@ -25,7 +25,7 @@ def download_chapters(ext_active: Extension, valid_chapters: List[Chapter]):
     for chapter in valid_chapters:
         # runs the pre_download for the extension if needed
         # most likely used to retrieve page_urls for the chapter
-        if chapter.pre_download == True:
+        if chapter.pre_download is True:
             chapter = ext_active.pre_download(chapter)
 
         loop = asyncio.get_event_loop()
@@ -52,7 +52,7 @@ async def download_chapter_async(chapter: Chapter):
         loop = asyncio.get_event_loop()
         tasks = []
 
-        for i in range(len(chapter.page_urls)):
+        for i, page_url in enumerate(chapter.page_urls):
             dl_print = f"{chapter.manga_title}: Chapter {chapter.number} page {i} download complete"
 
             if not os.path.exists(chapter_path):
@@ -63,7 +63,7 @@ async def download_chapter_async(chapter: Chapter):
                     executor,
                     download_page,
                     *(
-                        chapter.page_urls[i],
+                        page_url,
                         chapter_path,
                         i + 1,
                         dl_print,
@@ -81,7 +81,7 @@ def download_page(
     page_num: int,
     dl_print: str = "",
     cloudflare: bool = False,
-    headers: dict = {},
+    headers: dict = None,
 ):
     """Downloads manga image from URL
 
@@ -90,14 +90,18 @@ def download_page(
         chapter_path (str): Directory path to save chapter
         page_num (int): Page number of image
         dl_print (str): String to print upon download completion
-        cloudflare (bool, optional): Boolean flag to indicate whether cloudflare bypass is required. Defaults to False.
+        cloudflare (bool, optional): Boolean flag to indicate whether cloudflare bypass is required.
+                                     Defaults to False.
         headers (dict, optional): Dict of http headers for cloudflare bypass. Defaults to {}.
     """
 
     # if somehow folder hasn't been made yet
     if not os.path.exists(chapter_path):
         os.makedirs(chapter_path)
 
+    # in case url has spaces
+    url = re.sub(r"\s", "", url)
+
     # Use either cloudflare bypass or regular http requests depending on extension requirements
     if cloudflare:
         res = cf_scraper.get(url, headers=headers)

core/manga_info.py

@@ -20,7 +20,7 @@ def get_manga_info(ext_active: Extension, manga: Manga) -> List[Chapter]:
     # if no available chapters, exit
     if len(manga_info.chapters) == 0:
         print("There are no chapters for this manga in english")
-        return
+        return None
 
     # if only 1 available chapter, no need to process
     if len(manga_info.chapters) == 1:
@@ -31,7 +31,8 @@ def get_manga_info(ext_active: Extension, manga: Manga) -> List[Chapter]:
 
     for chapter in manga_info.chapters:
         scanlator = f"[{chapter.scanlator}] " if chapter.scanlator else ""
-        foldername = f"{scanlator}Ch.{chapter.number}{'' if chapter.title == '' else ' - '}{chapter.title}"
+        foldername = f"{scanlator}Ch.{chapter.number}{'' if chapter.title == '' else ' - '}\
+                        {chapter.title}"
 
         chapter_float = round(float(chapter.number), 3)
         chapter.foldername = foldername
@@ -49,12 +50,10 @@ def get_manga_info(ext_active: Extension, manga: Manga) -> List[Chapter]:
         to_download = input(query_str).lower().strip() or "q"
 
         if to_download == "q":
-            return
+            return None
 
         # keeps asking for chapters until a valid input is given
-        if is_valid_download_range(to_download):
-            break
-        else:
+        if not is_valid_download_range(to_download):
             print("Error with input, please try again.")
 
     to_download = parse_to_download(to_download, valid_chapters)
@@ -73,7 +72,8 @@ def parse_to_download(to_download: str, valid_chapters: List[Chapter]) -> List[C
         valid_chapters (List[Chapter]): List of models.Chapter objects
 
     Returns:
-        List[Chapter]: List of models.Chapter objects with chapter numbers in range of 'to_download' parameter
+        List[Chapter]: List of models.Chapter objects with chapter numbers
+                       in range of 'to_download' parameter
     """
 
     new_to_download = []

core/misc.py

@@ -14,9 +14,9 @@ def check_pickle(ext: str):
 
     # creates pickle file if it doesn't exist and stores an empty dict in it
     if not os.path.exists(DATA_FILE):
-        f = open(DATA_FILE, "wb")
-        pickle.dump({}, f)
-        f.close()
+        with open(DATA_FILE, "wb") as f:
+            pickle.dump({}, f)
+            f.close()
 
     with open(DATA_FILE, "rb") as f:
         data = pickle.load(f)
@@ -52,7 +52,7 @@ def write_pickle(ext: str, key: str, value):
         f.close()
 
 
-def read_pickle(ext: str, key: str):
+def read_pickle(ext: str, key: str) -> str:
     """Reads pickle data for extension
 
     Args:
@@ -72,8 +72,7 @@ def read_pickle(ext: str, key: str):
     if key in data[ext]:
         return data[ext][key]
 
-    else:
-        return None
+    return None
 
 
 def delete_pickle(ext: str, key: str = "") -> bool:
@@ -100,7 +99,7 @@ def delete_pickle(ext: str, key: str = "") -> bool:
         else:
             del data[ext][key]
 
-    except:
+    except KeyError:
         return False
 
     with open(DATA_FILE, "wb") as f:
@@ -130,7 +129,7 @@ def is_url(url: str) -> bool:
         re.IGNORECASE,
     )
 
-    return not re.match(regex, url) == None
+    return re.match(regex, url) is not None
 
 
 def is_valid_download_range(to_download: str) -> bool:
@@ -143,12 +142,12 @@ def is_valid_download_range(to_download: str) -> bool:
         bool: _description_
     """
     res = True
-    pattern = re.compile("^\d+(\.?\d+)?$")
+    pattern = re.compile(r"^\d+(\.?\d+)?$")
     dl_spl = to_download.split(",")
     num_list = []
 
-    for i in range(len(dl_spl)):
-        num_list += dl_spl[i].split("-")
+    for i, spl in enumerate(dl_spl):
+        num_list += spl[i].split("-")
 
     for number in num_list:
         if not bool(re.search(pattern, number.strip())):

core/random_manga.py

@@ -20,9 +20,9 @@ def random_manga(ext_active: Extension) -> Manga:
         dl = input(query) or "Y"
 
         if dl.upper() == "N":
-            return
+            return None
 
-        elif dl.upper() == "Y":
+        if dl.upper() == "Y":
             break
 
     return manga

core/search.py

@@ -17,13 +17,13 @@ def search(ext_active: Extension, query: str) -> Manga:
     search_page = 1
     page_index_in = -1
 
-    while manga == None:
+    while manga is None:
         # first retrieves list of manga from search query
         search_res = ext_active.search(query, search_page)
 
         if len(search_res.manga_list) == 0:
             print("There are 0 results for your search query. Exiting...")
-            return
+            return None
 
         print(f"Search results for '{query}' page {search_page}:")
 
@@ -35,11 +35,12 @@ def search(ext_active: Extension, query: str) -> Manga:
         # keep asking until a manga selection is made, flagged by reinput
         while reinput:
             max_num = len(search_res.manga_list)
-            query_str = f"Which manga do you wish to download (1-{max_num}, < or > to move search page, q to quit): "
+            query_str = f"Which manga do you wish to download (1-{max_num}, \
+                            < or > to move search page, q to quit): "
             page_index_in = (input(query_str) or "q").strip()
 
             if page_index_in == "q":
-                return
+                return None
 
             print("")
 
@@ -52,15 +53,14 @@ def search(ext_active: Extension, query: str) -> Manga:
                     continue
 
                 # incrementing page when last page is reached
-                elif search_res.last_page and page_index_in == ">":
+                if search_res.last_page and page_index_in == ">":
                     page_index_in = -1
                     print("You can't go to a next page")
                     continue
 
                 # increment/decrement as per usual
-                else:
-                    search_page += -1 if page_index_in == "<" else 1
-                    reinput = False
+                search_page += -1 if page_index_in == "<" else 1
+                reinput = False
 
                 page_index_in = -1
 
@@ -78,7 +78,7 @@ def search(ext_active: Extension, query: str) -> Manga:
                 print("Invalid input")
 
         # only choose manga if valid index is input via user
-        if page_index_in >= 0 and page_index_in < len(search_res.manga_list):
+        if 0 <= page_index_in < len(search_res.manga_list):
             manga = search_res.manga_list[page_index_in]
             print(f"You chose: '{manga.title}'")
 

extensions/hitomi/ext.py

@@ -1,35 +1,49 @@
 import re
+
+
 from typing import List
+
+
 import requests
 
+
 # local files
+
+
 from models import Chapter, Extension, Manga, Tag, SearchResult, ParseResult
 import core
 
+
 import extensions.hitomi.parse as parse
 
+
 NAME = "hitomi"
 
 
 class Hitomi(Extension):
     session = requests.Session()
+
     always_webp = True
 
     def __init__(self):
         super().__init__()
+
         res = self.session.get("https://ltn.hitomi.la/gg.js")
         res.close()
+
         self.gg = res.text
 
-    def parse_url(self, query: str) -> dict:
+    def parse_url(self, url: str) -> dict:
         pattern = r"https:\/\/hitomi.la\/(gamecg|cg|manga|doujinshi){1}\/"
-        matches = re.search(pattern, query)
+
+        matches = re.search(pattern, url)
 
         if matches == None:
             return None
 
-        chapter = parse.parse_gallery(self, query)
-        return ParseResult(ParseResult._CHAPTER, chapter)
+        chapter = parse.parse_gallery(self, url)
+
+        return ParseResult(ParseResult.CHAPTER, chapter)
 
     def search(self, query: str, page: int, cover: bool = False) -> SearchResult:
         return SearchResult(None, None)

extensions/mangadex/account.py

@@ -1,8 +1,7 @@
 from datetime import datetime
 import json
 import requests
-
-import core
+from core.misc import read_pickle, write_pickle
 
 API_URL = "https://api.mangadex.org"
 
@@ -43,7 +42,7 @@ def login(
     if data["result"] == "ok":
         update_login_session(session, data)
         print("Successfully logged in as", username)
-        mark_on_dl_store = False
+        mark_on_dl_store = mark_on_dl
 
         if mark_on_dl == "":
             mark_on_dl = input(
@@ -58,7 +57,7 @@ def login(
                 print("Invalid input, defaulting to no")
                 mark_on_dl_store = False
 
-        core.write_pickle("mangadex", "mark_on_dl", str(mark_on_dl_store))
+        write_pickle("mangadex", "mark_on_dl", str(mark_on_dl_store))
 
 
 def check_login_session(session: requests.Session):
@@ -101,14 +100,14 @@ def update_login_session(session: requests.Session, data: dict):
     session.headers.update({"Authorization": f"Bearer {data['token']['session']}"})
 
     # saving current session into a pickle
-    core.write_pickle("mangadex", "session", session)
+    write_pickle("mangadex", "session", session)
 
 
 def toggle_data_saver():
     """Toggles data setting for MangaDex"""
-    data_saver = core.read_pickle("mangadex", "data_saver")
+    data_saver = read_pickle("mangadex", "data_saver")
     data_saver = not data_saver
-    core.write_pickle("mangadex", "data_saver", data_saver)
+    write_pickle("mangadex", "data_saver", data_saver)
 
     print(f"Data saver set to: {data_saver}")
 
@@ -120,7 +119,7 @@ def set_language(language: str):
         language (str): Language code to set to
     """
 
-    core.write_pickle("mangadex", "language", language)
+    write_pickle("mangadex", "language", language)
     print(f"Language set to: {language}")