Code cleanp scan through

This commit is contained in:
2026-02-22 21:53:53 -06:00
parent 88a6451fa8
commit 13f2750a7e
12 changed files with 27 additions and 34 deletions

View File

@@ -132,12 +132,10 @@ class Colorize(ColorConverterMixin):
if not start_itr: if not start_itr:
start_itr = buffer.get_start_iter() start_itr = buffer.get_start_iter()
results = self.search(start_itr, end_itr, "#") return self.search(start_itr, end_itr, "#")
return results
def search(self, start_itr = None, end_itr = None, query: str = None) -> list: def search(self, start_itr = None, end_itr = None, query: str = None) -> list:
if not start_itr or not query: return None, None if not start_itr or not query: return []
results: list = [] results: list = []
flags = Gtk.TextSearchFlags.VISIBLE_ONLY | Gtk.TextSearchFlags.TEXT_ONLY flags = Gtk.TextSearchFlags.VISIBLE_ONLY | Gtk.TextSearchFlags.TEXT_ONLY
@@ -150,7 +148,7 @@ class Colorize(ColorConverterMixin):
return results return results
def finalize_non_hex_matches(self, result_hits: [] = []) -> list: def finalize_non_hex_matches(self, result_hits: list = []) -> list:
results: list = [] results: list = []
for start_itr, end_itr in result_hits: for start_itr, end_itr in result_hits:
@@ -165,7 +163,7 @@ class Colorize(ColorConverterMixin):
end_itr.forward_chars(21) # Check if best case (255, 255, 255, 0.64) end_itr.forward_chars(21) # Check if best case (255, 255, 255, 0.64)
if end_itr.get_char() == ")": if end_itr.get_char() == ")":
end_itr.forward_char() end_itr.forward_char()
results.append([start, end_itr]) results.append([start_itr, end_itr])
continue continue
# Break loop if we get back to rgb/rgba/hsl/hsv -> ( # Break loop if we get back to rgb/rgba/hsl/hsv -> (
@@ -179,7 +177,7 @@ class Colorize(ColorConverterMixin):
return results return results
def finalize_hex_matches(self, result_hits: [] = []) -> list: def finalize_hex_matches(self, result_hits: list = []) -> list:
results: list = [] results: list = []
for start_itr, end_itr in result_hits: for start_itr, end_itr in result_hits:

View File

@@ -38,7 +38,6 @@ class SearchReplace(Gtk.Grid, SearchReplaceMixin):
self.set_hexpand(True) self.set_hexpand(True)
self.set_column_spacing(15) self.set_column_spacing(15)
self.set_row_spacing(15) self.set_row_spacing(15)
self.set_row_spacing(15)
self.set_margin_start(15) self.set_margin_start(15)
self.set_margin_end(15) self.set_margin_end(15)
@@ -151,7 +150,7 @@ class SearchReplace(Gtk.Grid, SearchReplaceMixin):
find_options += "Regex" find_options += "Regex"
find_options += ", " if self.mode_bttn_box.use_regex else "" find_options += ", " if self.mode_bttn_box.use_regex else ""
find_options += "Case Sensitive" if self.mode_bttn_box.match_case else "Case Inensitive" find_options += "Case Sensitive" if self.mode_bttn_box.match_case else "Case Insensitive"
if self.mode_bttn_box.in_selection: if self.mode_bttn_box.in_selection:
find_options += ", Within Current Selection" find_options += ", Within Current Selection"

View File

@@ -29,7 +29,7 @@ class BaseControllerMixin:
logger.info(f"Not a File: {arg}") logger.info(f"Not a File: {arg}")
if len(files) == 0: return if not files: return
settings_manager.set_is_starting_with_file(True) settings_manager.set_is_starting_with_file(True)
settings_manager.set_starting_files(files) settings_manager.set_starting_files(files)

View File

@@ -19,7 +19,7 @@ def execute(
starting_files = settings_manager.get_starting_files() starting_files = settings_manager.get_starting_files()
if len(starting_files) == 0: return if not starting_files: return
file = starting_files.pop() file = starting_files.pop()
file = file.replace("FILE|", "") file = file.replace("FILE|", "")
@@ -31,7 +31,7 @@ def execute(
(view, gfile, file) (view, gfile, file)
) )
if len(starting_files) == 0: return if not starting_files: return
for file in starting_files: for file in starting_files:
file = file.replace("FILE|", "") file = file.replace("FILE|", "")

View File

@@ -101,7 +101,7 @@ class FilesController(ControllerBase, list):
eve = Event_Factory.create_event( eve = Event_Factory.create_event(
"popped_file", "popped_file",
view = view, view = event.view,
file = popped_file, file = popped_file,
next_file = next_file next_file = next_file
) )
@@ -137,9 +137,9 @@ class FilesController(ControllerBase, list):
def next_index(self, i): def next_index(self, i):
size = len(self) size = len(self)
if (i == 0) & (size >= 2): if (i == 0) and (size >= 2):
j = i + 1 j = i + 1
elif (i == (size - 1)) & (size >= 2): elif (i == (size - 1)) and (size >= 2):
j = i - 1 j = i - 1
elif (size - 1) == 0: elif (size - 1) == 0:
j = -1 j = -1

View File

@@ -111,13 +111,13 @@ class KeyMapper:
def _set_key_state(self, eve): def _set_key_state(self, eve):
modifiers = Gdk.ModifierType(eve.get_state() & ~Gdk.ModifierType.LOCK_MASK) modifiers = Gdk.ModifierType(eve.get_state() & ~Gdk.ModifierType.LOCK_MASK)
is_control = True if modifiers & Gdk.ModifierType.CONTROL_MASK else False is_control = modifiers & Gdk.ModifierType.CONTROL_MASK
is_shift = True if modifiers & Gdk.ModifierType.SHIFT_MASK else False is_shift = modifiers & Gdk.ModifierType.SHIFT_MASK
try: try:
is_alt = True if modifiers & Gdk.ModifierType.ALT_MASK else False is_alt = modifiers & Gdk.ModifierType.ALT_MASK
except Exception: except:
is_alt = True if modifiers & Gdk.ModifierType.MOD1_MASK else False is_alt = modifiers & Gdk.ModifierType.MOD1_MASK
self.state = NoKeyState self.state = NoKeyState
if is_control: if is_control:
@@ -129,11 +129,11 @@ class KeyMapper:
def is_control(self, eve): def is_control(self, eve):
modifiers = Gdk.ModifierType(eve.get_state() & ~Gdk.ModifierType.LOCK_MASK) modifiers = Gdk.ModifierType(eve.get_state() & ~Gdk.ModifierType.LOCK_MASK)
return True if modifiers & Gdk.ModifierType.CONTROL_MASK else False return modifiers & Gdk.ModifierType.CONTROL_MASK
def is_shift(self, eve): def is_shift(self, eve):
modifiers = Gdk.ModifierType(eve.get_state() & ~Gdk.ModifierType.LOCK_MASK) modifiers = Gdk.ModifierType(eve.get_state() & ~Gdk.ModifierType.LOCK_MASK)
return True if modifiers & Gdk.ModifierType.SHIFT_MASK else False return modifiers & Gdk.ModifierType.SHIFT_MASK
def get_raw_keyname(self, eve): def get_raw_keyname(self, eve):
return Gdk.keyval_name(eve.keyval) return Gdk.keyval_name(eve.keyval)

View File

@@ -26,8 +26,8 @@ class SourceViewDnDMixin:
if info == 80: if info == 80:
uris = data.get_uris() uris = data.get_uris()
if len(uris) == 0: if not uris: return
uris = data.get_text().split("\n") uris = data.get_text().split("\n")
self._on_uri_data_received(uris) self._on_uri_data_received(uris)
@@ -35,6 +35,6 @@ class SourceViewDnDMixin:
uri = uris.pop(0) uri = uris.pop(0)
self.command.exec_with_args("dnd_load_file_to_buffer", (self, uri)) self.command.exec_with_args("dnd_load_file_to_buffer", (self, uri))
if len(uris) == 0: return if not uris: return
self.command.exec_with_args("dnd_load_files", (self, uris)) self.command.exec_with_args("dnd_load_files", (self, uris))

View File

@@ -71,6 +71,4 @@ class SourceBuffer(GtkSource.Buffer):
self.disconnect(handle_id) self.disconnect(handle_id)
def __del__(self): def __del__(self):
for handle_id in self._handler_ids: self.clear_signals()
self.disconnect(handle_id)

View File

@@ -17,7 +17,6 @@ class TabWidget(Gtk.Box):
self.file = None self.file = None
self._close_tab = None
self._handler_id = None self._handler_id = None
self._eve_handler_id = None self._eve_handler_id = None
@@ -63,7 +62,6 @@ class TabWidget(Gtk.Box):
def clear_signals_and_data(self): def clear_signals_and_data(self):
self.close_bttn.disconnect(self._handler_id) self.close_bttn.disconnect(self._handler_id)
self.event_box.disconnect(self._eve_handler_id) self.event_box.disconnect(self._eve_handler_id)
self._close_tab = None
self._handler_id = None self._handler_id = None
for child in self.get_children(): for child in self.get_children():

View File

@@ -55,7 +55,7 @@ class DnDMixin:
uris = data.get_uris() uris = data.get_uris()
files = [] files = []
if len(uris) == 0: if not uris:
uris = data.get_text().split("\n") uris = data.get_text().split("\n")
for uri in uris: for uri in uris:

View File

@@ -14,8 +14,8 @@ class Config:
blender_thumbnailer_path: str = "" blender_thumbnailer_path: str = ""
go_past_home: str = "true" go_past_home: str = "true"
lock_folder: str = "false" lock_folder: str = "false"
locked_folders: list = field(default_factory=lambda: [ "venv", "flasks" ]) locked_folders: list = field(default_factory=lambda: [ "venv", "flasks" ])
mplayer_options: str = "-quiet -really-quiet -xy 1600 -geometry 50%:50%", mplayer_options: str = "-quiet -really-quiet -xy 1600 -geometry 50%:50%"
music_app: str = "/opt/deadbeef/bin/deadbeef" music_app: str = "/opt/deadbeef/bin/deadbeef"
media_app: str = "mpv" media_app: str = "mpv"
image_app: str = "mirage" image_app: str = "mirage"

View File

@@ -2,7 +2,7 @@
from dataclasses import dataclass, field from dataclasses import dataclass, field
from dataclasses import asdict from dataclasses import asdict
# Gtk imports # Lib imports
# Application imports # Application imports
from .config import Config from .config import Config