Merge pull request #157 from billyowo/main

Image optimization and Refactoring code

biscuit/core/__init__.py

@@ -133,7 +133,7 @@ def setup_tk(self) -> None:
             style = style | WS_EX_APPWINDOW
             windll.user32.SetWindowLongW(hwnd, GWL_EXSTYLE, style)
             self.withdraw()
-            self.after(10, lambda:self.wm_deiconify())
+            self.after(10, self.wm_deiconify)
 
         self.dpi_value = self.winfo_fpixels('1i')
         self.scale = self.dpi_value / 96.11191135734073

biscuit/core/components/editors/texteditor/highlighter.py

@@ -24,7 +24,6 @@ def __init__(self, text: Text, language: str=None, *args, **kwargs) -> None:
         language : str, optional
             Language to highlight, by default None
         """
-
         self.text: Text = text
         self.base = text.base
         self.language = language

biscuit/core/components/editors/texteditor/text.py

@@ -211,9 +211,9 @@ def replace_current_word(self, new_word):
 
     def check_autocomplete_keys(self, event):
         """Helper function for autocomplete.show to check triggers"""
-        return True if event.keysym not in [
+        return event.keysym not in [
             "BackSpace", "Escape", "Return", "Tab", "space", 
-            "Up", "Down", "Control_L", "Control_R"] else False 
+            "Up", "Down", "Control_L", "Control_R"] 
 
     def cursor_screen_location(self):
         """Helper function for autocomplete.show to detect cursor location"""
@@ -323,9 +323,9 @@ def detect_encoding(self, file_path):
 
         if bom.startswith(codecs.BOM_UTF8):
             return 'utf-8'
-        elif bom.startswith(codecs.BOM_LE) or bom.startswith(codecs.BOM_BE):
+        if bom.startswith(codecs.BOM_LE) or bom.startswith(codecs.BOM_BE):
             return 'utf-16'
-        elif bom.startswith(codecs.BOM32_BE) or bom.startswith(codecs.BOM32_LE):
+        if bom.startswith(codecs.BOM32_BE) or bom.startswith(codecs.BOM32_LE):
             return 'utf-32'
 
         self.bom = False
@@ -340,15 +340,13 @@ def detect_eol(self, path):
                 return "CRLF"
 
             # Check for '\n' to detect Unix-style EOL
-            elif b'\n' in chunk:
+            if b'\n' in chunk:
                 return "LF"
 
             # Check for '\r' to detect Mac-style EOL (older Macs)
-            elif b'\r' in chunk:
+            if b'\r' in chunk:
                 return "CR"
-
-            else:
-                return "UNKNOWN"
+            return "UNKNOWN"
 
     def load_file(self):
         if not self.path:

biscuit/core/components/extensions/__init__.py

@@ -25,7 +25,7 @@ def __init__(self, base) -> None:
         for extension_file in os.listdir(self.base.extensionsdir):
             if extension_file.endswith(".py"):
                 extension_name = os.path.splitext(extension_file)[0]
-                if extension_name in self.extensions.keys():
+                if extension_name in self.extensions:
                     return
                 self.queue.put(extension_name)
 
@@ -72,7 +72,7 @@ def load_extension(self, file):
             extension_name = os.path.splitext(file)[0]
 
             # if an extension with same name is already loaded, skip
-            if extension_name in self.extensions.keys():
+            if extension_name in self.extensions:
                 return
             self.queue.put(extension_name)
 

biscuit/core/components/floating/findreplace/__init__.py

@@ -90,8 +90,7 @@ def hide(self, *_):
     def current(self):
         if not self.text.count("1.0", self.text.index(tk.INSERT), "chars"):
             return 0
-        else:
-            return self.text.count("1.0", self.text.index(tk.INSERT), "chars")[0]
+        return self.text.count("1.0", self.text.index(tk.INSERT), "chars")[0]
 
     def highlight_matches(self):
         self.text.tag_remove("found", "1.0", "end")
@@ -194,10 +193,7 @@ def replace(self, *_):
 
     def is_on_match(self):
         """tells if the editor is currently pointing to a match"""
-        if self.current in self.matches.keys():
-            return True
-        else:
-            return False
+        return self.current in self.matches()
 
     def replace_all(self, *_):
         """replaces all occurences of the string for the replace string, it will even replace partial words."""

biscuit/core/components/floating/palette/actionset.py

@@ -18,7 +18,6 @@ def __init__(self, description: str, prompt: str, items: List[Tuple[str, Callabl
         pinned : List[Tuple[str, Callable]]
             The pinned items in the actionset.
         """
-
         super().__init__(items, *args, **kwargs)
         self.description: str = description
         self.prompt: str = prompt

biscuit/core/components/games/__init__.py

@@ -24,7 +24,6 @@ def get_game(name) -> str:
 
 def register_game(game) -> None:
     "registers a game"
-    global games
     try:
         games[game.name] = game
     except AttributeError:

biscuit/core/components/games/snake.py

@@ -120,7 +120,7 @@ def on_key_press(self, e):
             ):
                 self.direction = key
         else:
-            if key == "r" or key == "R":
+            if key in ("r", "R"):
                 self.restart_game()
 
     def show_game_over_text(self):

biscuit/core/components/games/tetris.py

@@ -80,7 +80,7 @@ def clear_lines(self):
         lines = 0
 
         all_squares = self.board.find_all()
-        all_squares_h = {k : v for k,v in zip(all_squares, [self.board.coords(sq)[3] for sq in all_squares])}
+        all_squares_h = dict(zip(all_squares, [self.board.coords(sq)[3] for sq in all_squares]))
         count = Counter()
         for sq in all_squares_h.values(): count[sq] += 1
         full_lines = [k for k,v in count.items() if v == WIDTH/SIDE]
@@ -180,10 +180,9 @@ def place_on_board(self):
     def move(self, x, y):
         if not self.is_move_allowed(x, y):
             return False
-        else:
-            for square in self.squares:
-                self.canvas.move(square, x * SIDE, y * SIDE)
-            return True
+        for square in self.squares:
+            self.canvas.move(square, x * SIDE, y * SIDE)
+        return True
 
     def rotate(self):
         squares = self.squares[:]

biscuit/core/components/games/whoops.py

@@ -107,7 +107,7 @@ def update_obstacles(self):
                 self.obstacles.remove(obstacle)
 
         # spawn a new obstacle if there's enough gap between the last one and the right side of the canvas
-        if not len(self.obstacles) or self.obstacle_spawnpoint - (self.obstacles[-1].x + self.obstacles[-1].width) >= self.min_obstacle_gap:
+        if not self.obstacles or self.obstacle_spawnpoint - (self.obstacles[-1].x + self.obstacles[-1].width) >= self.min_obstacle_gap:
             self.spawn_obstacle()
 
         self.after(10, self.update_obstacles)

biscuit/core/components/git/__init__.py

@@ -56,8 +56,7 @@ def clone(self, url: str, dir: str) -> None:
             GitRepo.clone_from(url, dir)
             return dir
 
-        else:
-            raise Exception(f'The url `{url}` does not point to a git repo')
+        raise Exception(f'The url `{url}` does not point to a git repo')
 
     def repo_name(self, url: str) -> None:
         match = re.search(r'/([^/]+?)(\.git)?$', url)

biscuit/core/components/git/repo.py

@@ -13,7 +13,7 @@ def __init__(self, master=None, path=None, *args, **kwargs) -> None:
         self.author = git.Actor(self.author_name, self.author_email)
 
     def get_untracked_files(self) -> list:
-        return [item for item in self.untracked_files]
+        return list(self.untracked_files)
 
     def get_added_files(self) -> list:
         return [item.a_path for item in self.index.diff(None).iter_change_type('A')]

biscuit/core/components/views/panel/terminal/__init__.py

@@ -116,5 +116,5 @@ def active_terminal(self):
         return self.tabs.active_tab.terminal
 
     def refresh(self) -> None:
-        if not len(self.terminals):
+        if not self.terminals:
             self.master.toggle_panel()

biscuit/core/components/views/sidebar/sourcecontrol/changes.py

@@ -30,7 +30,7 @@ def clear_tree(self, *_) -> None:
         self.items.clear()
 
     def add_item(self, path, kind) -> None:
-        if path in self.items.keys():
+        if path in self.items:
             return
 
         new_item = ChangeItem(self.content, path, kind)

biscuit/core/components/views/sidebar/sourcecontrol/stagedchanges.py

@@ -28,7 +28,7 @@ def clear_tree(self, *_) -> None:
         self.items.clear()
 
     def add_item(self, path, kind) -> None:
-        if path in self.items.keys():
+        if path in self.items:
             return
 
         new_item = StagedChangeItem(self.content, path, kind)

biscuit/core/layout/base/content/editors/__init__.py

@@ -138,10 +138,10 @@ def active_editor(self) -> Editor:
         return self.tabs.active_tab.editor
 
     def refresh(self) -> None:
-        if not len(self.editors) and self.empty:
+        if not self.editors and self.empty:
             self.emptytab.grid()
             self.base.set_title(os.path.basename(self.base.active_directory) if self.base.active_directory else None)
-        elif len(self.editors) and not self.empty:
+        elif self.editors and not self.empty:
             self.emptytab.grid_remove()
         self.empty = not self.empty
         self.base.update_statusbar()

biscuit/core/settings/__init__.py

@@ -88,7 +88,7 @@ def late_setup(self) -> None:
 
         from biscuit.core.components import ActionSet
         clone_actionset = ActionSet(
-            "Clone git repository", "clone", pinned=[[Formattable("clone {}"), lambda url: self.base.events.clone_repo(url)]]
+            "Clone git repository", "clone", pinned=[[Formattable("clone {}"), self.base.events.clone_repo]]
         )
         self.base.palette.register_actionset(lambda: clone_actionset)
 

biscuit/core/settings/editor/items.py

@@ -52,10 +52,7 @@ def __init__(self, master, name="Example", default="0", *args, **kwargs) -> None
         self.entry.pack(side=tk.LEFT)
 
     def validate(self, value) -> None:
-        if value.isdigit() or value == "":
-            return True
-        else:
-            return False
+        return bool(value.isdigit() or value == "")
 
     @property
     def value(self) -> str:

biscuit/core/utils/demo/window_demo.py

@@ -18,7 +18,7 @@ def set_appwindow():
         style = style | WS_EX_APPWINDOW
         res = windll.user32.SetWindowLongW(hwnd, GWL_EXSTYLE, style)
         root.withdraw()
-        root.after(10, lambda:root.wm_deiconify())
+        root.after(10, root.wm_deiconify)
         hasstyle=True
 
 def get_pos(event):
@@ -33,7 +33,7 @@ def move_window(event):
     previousPosition = [root.winfo_x(), root.winfo_y()]
 
 def move_window_bindings(*args, status=True):
-    if status == True:
+    if status is True:
         title_bar.bind("<B1-Motion>", move_window)
         title_bar.bind("<Button-1>", get_pos)
         title_name.bind("<B1-Motion>", move_window)
@@ -54,8 +54,7 @@ def minimize(hide=False):
 
 def maximizeToggle():
     global maximized
-    global previousPosition
-    if maximized == False:
+    if not maximized:
         #maximize current window
         maximize_btn.config(text="❐")
         hwnd = windll.user32.GetParent(root.winfo_id())