feat: Сделал удаление категории и поменял интерфейс

Author: JustDev-oper

db.py

@@ -39,9 +39,8 @@ def create_tables(self):
             )"""
         )
 
-        cursor.execute(
-            "INSERT OR IGNORE INTO Categories (name) VALUES (?)", ("Все",)
-        )
+        cursor.execute("INSERT OR IGNORE INTO Categories (name) VALUES (?)",
+                       ("Все",))
 
         conn.commit()
         conn.close()
@@ -56,9 +55,8 @@ def check_name_is_unique(self, name):
     def check_path_is_unique(self, game_path):
         conn = self.get_connection()
         cursor = conn.cursor()
-        cursor.execute(
-            "SELECT COUNT(*) FROM Games WHERE path = ?", (game_path,)
-        )
+        cursor.execute("SELECT COUNT(*) FROM Games WHERE path = ?",
+                       (game_path,))
         count = cursor.fetchone()[0]
         return count == 0
 
@@ -95,6 +93,42 @@ def insert_category(self, name):
         finally:
             conn.close()
 
+    def delete_category(self, category_id):
+        conn = self.get_connection()
+        cursor = conn.cursor()
+        try:
+            cursor.execute(
+                "DELETE FROM Categories WHERE id = ?", (category_id,)
+            )
+            conn.commit()
+        except Exception as e:
+            print(f"Ошибка при удалении категории: {e}")
+        finally:
+            conn.close()
+
+    def get_games_by_category(self, category_id):
+        conn = self.get_connection()
+        cursor = conn.cursor()
+        cursor.execute("SELECT * FROM Games WHERE category_id = ?",
+                       (category_id,))
+        games = cursor.fetchall()
+        conn.close()
+        return games
+
+    def edit_games_category(self, category_id_old, category_id_new):
+        conn = self.get_connection()
+        cursor = conn.cursor()
+        try:
+            cursor.execute(
+                "UPDATE Games SET category_id = ? WHERE category_id = ?",
+                (category_id_new, category_id_old),
+            )
+            conn.commit()
+        except Exception as e:
+            print(f"Ошибка при изменении категории для игры: {str(e)}")
+        finally:
+            conn.close()
+
     def get_categories(self):
         conn = self.get_connection()
         cursor = conn.cursor()
@@ -122,9 +156,8 @@ def get_category_id_by_name(self, name):
     def category_name_check_unique(self, name):
         conn = self.get_connection()
         cursor = conn.cursor()
-        cursor.execute(
-            "SELECT COUNT(*) FROM Categories WHERE name = ?", (name,)
-        )
+        cursor.execute("SELECT COUNT(*) FROM Categories WHERE name = ?",
+                       (name,))
         count = cursor.fetchone()[0]
         return count == 0
 

dialogs.py

@@ -1,8 +1,9 @@
 from PyQt6.QtWidgets import QDialog, QFileDialog, QMessageBox
 
 from db import database
-from ui.add_game_dialog_ui import Ui_Dialog as AddGameUI
-from ui.createCategory_ui import Ui_Dialog as AddCategoryUI
+from ui.add_game_dialog import Ui_Dialog as AddGameUI
+from ui.createCategory import Ui_Dialog as AddCategoryUI
+from ui.deleteCategory import Ui_Dialog as DeleteCategoryUI
 
 
 class AddGameDialog(QDialog, AddGameUI):
@@ -38,8 +39,7 @@ def accept_dialog(self):
         game_name = self.game_name.text().strip()
         game_path = self.file_path.text().strip()
         category_id = database.get_category_id_by_name(
-            self.comboBox.currentText()
-        )
+            self.comboBox.currentText())
 
         if not game_name:
             QMessageBox.warning(self, "Ошибка", "Введите название игры")
@@ -53,15 +53,13 @@ def accept_dialog(self):
             category_id = 1
 
         if not database.check_name_is_unique(game_name):
-            QMessageBox.warning(
-                self, "Ошибка", "Игра с таким именем уже существует"
-            )
+            QMessageBox.warning(self, "Ошибка",
+                                "Игра с таким именем уже существует")
             return
 
         if not database.check_path_is_unique(game_path):
-            QMessageBox.warning(
-                self, "Ошибка", "Игра с таким путём уке существует"
-            )
+            QMessageBox.warning(self, "Ошибка",
+                                "Игра с таким путём уке существует")
             return
 
         try:
@@ -70,9 +68,8 @@ def accept_dialog(self):
             QMessageBox.information(self, "Успех", "Игра добавлена!")
 
         except Exception as e:
-            QMessageBox.critical(
-                self, "Ошибка", f"Не удалось добавить игру: {str(e)}"
-            )
+            QMessageBox.critical(self, "Ошибка",
+                                 f"Не удалось добавить игру: {str(e)}")
 
 
 class AddCategoryDialog(QDialog, AddCategoryUI):
@@ -91,25 +88,70 @@ def __init__(self):
     def accept_dialog(self):
         category_name = self.lineEdit.text().strip()
         if not category_name:
-            QMessageBox.warning(
-                self, "Ошибка", "Категория не может быть пустой"
-            )
+            QMessageBox.warning(self, "Ошибка",
+                                "Категория не может быть пустой")
             return
 
         if not database.category_name_check_unique(category_name):
-            QMessageBox.warning(
-                self, "Ошибка", "Категория с таким именем уже есть"
-            )
+            QMessageBox.warning(self, "Ошибка",
+                                "Категория с таким именем уже есть")
             return
 
         try:
             database.insert_category(category_name)
             self.accept()
-            QMessageBox.information(
-                self, "Успех", "Категория успешно добавлена"
-            )
+            QMessageBox.information(self, "Успех",
+                                    "Категория успешно добавлена")
 
         except Exception as e:
             QMessageBox.critical(
                 self, "Ошибка", f"Не удалось добавить категорию: {str(e)}"
             )
+
+
+class DeleteCategoryDialog(QDialog, DeleteCategoryUI):
+    def __init__(self):
+        super().__init__()
+        self.setFixedSize(300, 110)
+
+        self.setupUi(self)
+
+        self.get_categories()
+
+        self.buttonBox.accepted.disconnect()
+        self.buttonBox.rejected.disconnect()
+
+        self.buttonBox.accepted.connect(self.accept_dialog)
+        self.buttonBox.rejected.connect(self.reject)
+
+    def get_categories(self):
+        combobox = self.comboBox
+        categories = database.get_categories()
+        for category in categories:
+            combobox.addItem(category[0])
+
+    def accept_dialog(self):
+        category_name = self.comboBox.currentText()
+        if category_name == "Все":
+            QMessageBox.warning(self, "Ошибка",
+                                "Данную категорию удалить нельзя!")
+            return
+        if not category_name:
+            QMessageBox.warning(self, "Ошибка",
+                                "Категория не может быть пустой")
+            return
+
+        try:
+            database.edit_games_category(
+                database.get_category_id_by_name(category_name), 1)
+
+            database.delete_category(
+                database.get_category_id_by_name(category_name))
+            self.accept()
+            QMessageBox.information(self, "Успех",
+                                    "Категория успешно удалена")
+
+        except Exception as e:
+            QMessageBox.critical(
+                self, "Ошибка", f"Не удалось удалить категорию: {str(e)}"
+            )

main.py

@@ -6,7 +6,7 @@
 
 import dialogs
 from db import database
-from ui.mainWindow_ui import Ui_MainWindow
+from ui.mainWindow import Ui_MainWindow
 from utils import txt_editor, json_editor
 
 
@@ -43,7 +43,9 @@ def __init__(self):
         self.action_2.triggered.connect(lambda: self.set_theme("light"))
         self.action_3.triggered.connect(lambda: self.set_theme("dark"))
         self.create_category.triggered.connect(
-            lambda: self.open_dialog("add_category")
+            lambda: self.open_dialog("add_category"))
+        self.delete_category.triggered.connect(
+            lambda: self.open_dialog("delete_category")
         )
 
     def set_theme(self, theme):
@@ -98,6 +100,10 @@ def open_dialog(self, dialog):
             _dialog = dialogs.AddCategoryDialog()
             _dialog.exec()
             self.update_menu_bar()
+        if dialog == "delete_category":
+            _dialog = dialogs.DeleteCategoryDialog()
+            _dialog.exec()
+            self.update_menu_bar()
 
     def update_menu_bar(self):
         menu = self.menu_3
@@ -110,15 +116,16 @@ def update_menu_bar(self):
                 break
 
         if separator_index != -1:
-            for action in actions[separator_index + 1 :]:
+            for action in actions[separator_index + 1:]:
                 menu.removeAction(action)
 
         categories = database.get_categories()
         for category in categories:
             category_name = category[0]
             action = QAction(category_name, self)
             action.triggered.connect(
-                lambda checked, cat_name=category_name: self.on_category_selected(
+                lambda checked,
+                       cat_name=category_name: self.on_category_selected(
                     cat_name
                 )
             )

ui/add_game_dialog_ui.py renamed to ui/add_game_dialog.py

@@ -0,0 +1,47 @@
+# Form implementation generated from reading ui file 'deleteCategory.ui'
+#
+# Created by: PyQt6 UI code generator 6.10.0
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt6 import QtCore, QtGui, QtWidgets
+
+
+class Ui_Dialog(object):
+    def setupUi(self, Dialog):
+        Dialog.setObjectName("Dialog")
+        Dialog.resize(300, 110)
+        font = QtGui.QFont()
+        font.setFamily("Arial")
+        Dialog.setFont(font)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
+        self.buttonBox.setGeometry(QtCore.QRect(40, 60, 221, 41))
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
+        self.buttonBox.setStandardButtons(
+            QtWidgets.QDialogButtonBox.StandardButton.Cancel
+            | QtWidgets.QDialogButtonBox.StandardButton.Ok
+        )
+        self.buttonBox.setCenterButtons(True)
+        self.buttonBox.setObjectName("buttonBox")
+        self.label = QtWidgets.QLabel(parent=Dialog)
+        self.label.setGeometry(QtCore.QRect(30, 10, 241, 21))
+        font = QtGui.QFont()
+        font.setPointSize(12)
+        self.label.setFont(font)
+        self.label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
+        self.label.setObjectName("label")
+        self.comboBox = QtWidgets.QComboBox(parent=Dialog)
+        self.comboBox.setGeometry(QtCore.QRect(90, 40, 121, 22))
+        self.comboBox.setObjectName("comboBox")
+
+        self.retranslateUi(Dialog)
+        self.buttonBox.accepted.connect(Dialog.accept)  # type: ignore
+        self.buttonBox.rejected.connect(Dialog.reject)  # type: ignore
+        QtCore.QMetaObject.connectSlotsByName(Dialog)
+
+    def retranslateUi(self, Dialog):
+        _translate = QtCore.QCoreApplication.translate
+        Dialog.setWindowTitle(_translate("Dialog", "Удаление категории"))
+        self.label.setText(_translate("Dialog", "Имя категории"))