chore: Fix ruff issues and ignore more rules

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
     rev: v0.8.2
     hooks:
     -   id: ruff
-        args: [ "--fix", "--ignore", "F401" ]
+        args: [ "--fix", "--ignore", "F401,F402,E722,E741" ]
     -   id: ruff-format
 
 -   repo: https://github.com/pre-commit/mirrors-mypy

bottles/backend/managers/data.py

@@ -79,7 +79,7 @@ def set(self, key, value, of_type=None):
             else:
                 self.__data[key] = value
         else:
-            if of_type == list:
+            if of_type is list:
                 self.__data[key] = [value]
             else:
                 self.__data[key] = value

bottles/frontend/cli/cli.py

@@ -38,6 +38,7 @@
 
 signal.signal(signal.SIGINT, signal.SIG_DFL)
 
+# ruff: noqa: E402
 from gi.repository import Gio
 
 from bottles.frontend.params import APP_ID

bottles/frontend/operation.py

@@ -17,14 +17,11 @@
 from typing import Dict
 from uuid import UUID
 
-import gi
+from gi.repository import Gtk, Adw
 
 from bottles.backend.models.result import Result
 from bottles.backend.state import TaskManager
 
-gi.require_version("Adw", "1")
-from gi.repository import Gtk, Adw
-
 
 @Gtk.Template(resource_path="/com/usebottles/bottles/task-entry.ui")
 class TaskEntry(Adw.ActionRow):

bottles/frontend/utils/filters.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from gettext import gettext as _
+
 from gi.repository import Gtk
 
 

bottles/frontend/widgets/importer.py

@@ -15,6 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from gettext import gettext as _
+
 from gi.repository import Gtk, Adw
 
 from bottles.backend.utils.manager import ManagerUtils

bottles/frontend/widgets/state.py

@@ -16,6 +16,7 @@
 #
 
 from datetime import datetime
+from gettext import gettext as _
 
 from gi.repository import Gtk, Adw
 

bottles/frontend/windows/crash.py

@@ -63,7 +63,7 @@ def __init__(self, window, log, **kwargs):
         super().__init__(**kwargs)
         self.set_transient_for(window)
 
-        if type(log) == list:
+        if type(log) is list:
             log = "".join(log)
 
         # connect signals

bottles/frontend/windows/display.py

@@ -144,7 +144,7 @@ def update(result, error=False):
             )
 
         if (
-            self.expander_virtual_desktop.get_enable_expansion() == True
+            self.expander_virtual_desktop.get_enable_expansion()
             and resolution != self.parameters.virtual_desktop_res
         ):
             """Set virtual desktop resolution"""

bottles/frontend/windows/dlloverrides.py

@@ -15,6 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from gettext import gettext as _
+
 from gi.repository import Gtk, GLib, Adw
 
 from bottles.backend.dlls.dll import DLLComponent

bottles/frontend/windows/drives.py

@@ -17,6 +17,8 @@
 
 import string
 
+from gettext import gettext as _
+
 from gi.repository import Gtk, GLib, Adw
 
 from bottles.backend.wine.drives import Drives

bottles/frontend/windows/envvars.py

@@ -15,6 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from gettext import gettext as _
+
 from gi.repository import Gtk, GLib, Adw
 
 from bottles.frontend.utils.gtk import GtkUtils

bottles/frontend/windows/exclusionpatterns.py

@@ -15,6 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from gettext import gettext as _
+
 from gi.repository import Gtk, GLib, Adw
 
 

bottles/frontend/windows/fsr.py

@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from gettext import gettext as _
+
 from gi.repository import Gtk, GLib, Adw
 from bottles.backend.logger import Logger
 

bottles/frontend/windows/generic.py

@@ -178,7 +178,7 @@ def __build_ui(self):
         btn_copy.connect("clicked", self.__copy_text)
         btn_copy.set_tooltip_text(_("Copy to clipboard"))
 
-        webview.load_html(self.message, "file://")
+        # webview.load_html(self.message, "file://")
         # scrolled.append(webview)
 
         box.append(headerbar)

bottles/frontend/windows/installer.py

@@ -17,6 +17,7 @@
 
 import urllib.request
 
+from gettext import gettext as _
 from gi.repository import Gtk, GLib, Gio, GdkPixbuf, Adw
 
 from bottles.backend.utils.threading import RunAsync

bottles/frontend/windows/vkbasalt.py

@@ -116,10 +116,10 @@ def __init__(self, window, config, **kwargs):
 
             # Check if subeffects are used
             for conf in subeffects:
-                if conf[0] != None:
+                if conf[0] is not None:
                     conf[1].set_value(float(conf[0]))
 
-            if VkBasaltSettings.smaa_edge_detection != None:
+            if VkBasaltSettings.smaa_edge_detection is not None:
                 if VkBasaltSettings.smaa_edge_detection == "color":
                     self.toggle_color.set_active(True)
                     self.smaa_edge_detection = "color"
@@ -186,7 +186,7 @@ def __check_state(self, *args):
     # Enable and disable other buttons depending on default button when necessary
     def __default(self, widget, state):
         self.group_effects.set_sensitive(not state)
-        if self.check_effects_states() == False:
+        if not self.check_effects_states():
             self.btn_save.set_sensitive(state)
 
     # Change edge detection type

pyproject.toml

@@ -2,3 +2,9 @@
 log_cli = true
 log_cli_level = "INFO"
 log_cli_format = "%(asctime)s [%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)"
+
+[tool.ruff]
+exclude = [
+	"bottles/backend/utils/nvidia.py",
+	"bottles/backend/utils/vdf.py",
+]