feat: Сделал разделение игр на категории

JustDev-oper · JustDev-oper · commit fdef557e08ee · 2025-10-27T10:49:36.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .idea
 ui/add_game_dialog.ui
 ui/mainWindow.ui
+ui/createCategory.ui
 venv
 main.spec
 build
diff --git a/db.py b/db.py
@@ -21,13 +21,28 @@ def get_connection(self):
     def create_tables(self):
         conn = self.get_connection()
         cursor = conn.cursor()
+
+        cursor.execute(
+            """CREATE TABLE IF NOT EXISTS Categories (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            name TEXT NOT NULL UNIQUE
+            )"""
+        )
+
         cursor.execute(
             """CREATE TABLE IF NOT EXISTS Games (
             id INTEGER PRIMARY KEY AUTOINCREMENT,
             name TEXT NOT NULL UNIQUE,
-            path TEXT NOT NULL UNIQUE
+            path TEXT NOT NULL UNIQUE,
+            category_id INTEGER NOT NULL,
+            FOREIGN KEY (category_id) REFERENCES Categories(id)
             )"""
         )
+
+        cursor.execute(
+            "INSERT OR IGNORE INTO Categories (name) VALUES (?)", ("Все",)
+        )
+
         conn.commit()
         conn.close()
 
@@ -47,13 +62,13 @@ def check_path_is_unique(self, game_path):
         count = cursor.fetchone()[0]
         return count == 0
 
-    def insert_game(self, name, game_path):
+    def insert_game(self, name, game_path, category_id):
         conn = self.get_connection()
         cursor = conn.cursor()
         try:
             cursor.execute(
-                "INSERT INTO Games (name, path) VALUES (?, ?)",
-                (name, game_path),
+                "INSERT INTO Games (name, path, category_id) VALUES (?, ?, ?)",
+                (name, game_path, category_id),
             )
             conn.commit()
             print(f"Игра '{name}' добавлена в базу данных")
@@ -64,6 +79,55 @@ def insert_game(self, name, game_path):
         finally:
             conn.close()
 
+    def insert_category(self, name):
+        conn = self.get_connection()
+        cursor = conn.cursor()
+        try:
+            cursor.execute(
+                "INSERT INTO Categories (name) VALUES (?)",
+                (name,),
+            )
+            conn.commit()
+        except sqlite3.IntegrityError:
+            print(f"Ошибка: категория с именем '{name}' уже существует")
+        except Exception as e:
+            print(f"Ошибка при добавлении категории: {e}")
+        finally:
+            conn.close()
+
+    def get_categories(self):
+        conn = self.get_connection()
+        cursor = conn.cursor()
+        cursor.execute("""SELECT name FROM Categories""")
+        categories = cursor.fetchall()
+        conn.close()
+        return categories
+
+    def get_category_name_by_id(self, _id):
+        conn = self.get_connection()
+        cursor = conn.cursor()
+        cursor.execute("SELECT name FROM Categories WHERE id = ?", (_id,))
+        name = cursor.fetchone()[0]
+        conn.close()
+        return name
+
+    def get_category_id_by_name(self, name):
+        conn = self.get_connection()
+        cursor = conn.cursor()
+        cursor.execute("SELECT id FROM Categories WHERE name = ?", (name,))
+        _id = cursor.fetchone()[0]
+        conn.close()
+        return _id
+
+    def category_name_check_unique(self, name):
+        conn = self.get_connection()
+        cursor = conn.cursor()
+        cursor.execute(
+            "SELECT COUNT(*) FROM Categories WHERE name = ?", (name,)
+        )
+        count = cursor.fetchone()[0]
+        return count == 0
+
     def delete_game(self, name):
         conn = self.get_connection()
         cursor = conn.cursor()
diff --git a/dialogs.py b/dialogs.py
@@ -1,23 +1,32 @@
 from PyQt6.QtWidgets import QDialog, QFileDialog, QMessageBox
 
 from db import database
-from ui.add_game_dialog_ui import Ui_Dialog
+from ui.add_game_dialog_ui import Ui_Dialog as AddGameUI
+from ui.createCategory_ui import Ui_Dialog as AddCategoryUI
 
 
-class AddGameDialog(QDialog, Ui_Dialog):
+class AddGameDialog(QDialog, AddGameUI):
     def __init__(self):
         super().__init__()
-        self.setFixedSize(450, 120)
+        self.setFixedSize(450, 180)
 
         self.setupUi(self)
         self.path_button.clicked.connect(self.choose_file)
 
         self.buttonBox.accepted.disconnect()
         self.buttonBox.rejected.disconnect()
 
+        self.get_categories()
+
         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 choose_file(self):
         file_path = QFileDialog.getOpenFileName(
             self, "Выбрать файл", "", "EXE - Файл (*.exe)"
@@ -28,6 +37,9 @@ def choose_file(self):
     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()
+        )
 
         if not game_name:
             QMessageBox.warning(self, "Ошибка", "Введите название игры")
@@ -37,6 +49,9 @@ def accept_dialog(self):
             QMessageBox.warning(self, "Ошибка", "Выберите файл игры")
             return
 
+        if not category_id:
+            category_id = 1
+
         if not database.check_name_is_unique(game_name):
             QMessageBox.warning(
                 self, "Ошибка", "Игра с таким именем уже существует"
@@ -50,11 +65,51 @@ def accept_dialog(self):
             return
 
         try:
-            database.insert_game(game_name, game_path)
+            database.insert_game(game_name, game_path, category_id)
             self.accept()
             QMessageBox.information(self, "Успех", "Игра добавлена!")
 
         except Exception as e:
             QMessageBox.critical(
                 self, "Ошибка", f"Не удалось добавить игру: {str(e)}"
             )
+
+
+class AddCategoryDialog(QDialog, AddCategoryUI):
+    def __init__(self):
+        super().__init__()
+        self.setFixedSize(300, 110)
+
+        self.setupUi(self)
+
+        self.buttonBox.accepted.disconnect()
+        self.buttonBox.rejected.disconnect()
+
+        self.buttonBox.accepted.connect(self.accept_dialog)
+        self.buttonBox.rejected.connect(self.reject)
+
+    def accept_dialog(self):
+        category_name = self.lineEdit.text().strip()
+        if not category_name:
+            QMessageBox.warning(
+                self, "Ошибка", "Категория не может быть пустой"
+            )
+            return
+
+        if not database.category_name_check_unique(category_name):
+            QMessageBox.warning(
+                self, "Ошибка", "Категория с таким именем уже есть"
+            )
+            return
+
+        try:
+            database.insert_category(category_name)
+            self.accept()
+            QMessageBox.information(
+                self, "Успех", "Категория успешно добавлена"
+            )
+
+        except Exception as e:
+            QMessageBox.critical(
+                self, "Ошибка", f"Не удалось добавить категорию: {str(e)}"
+            )
diff --git a/main.py b/main.py
@@ -1,6 +1,7 @@
 import os
 import sys
 
+from PyQt6.QtGui import QAction
 from PyQt6.QtWidgets import QApplication, QMainWindow, QMessageBox
 
 import dialogs
@@ -19,26 +20,31 @@ def resource_path(relative_path: str) -> str:
 class QtLauncher(QMainWindow, Ui_MainWindow):
     def __init__(self):
         super().__init__()
-        self.setFixedSize(750, 420)
+        self.setFixedSize(750, 400)
         self.setupUi(self)
 
         self.update_game_list()
         txt_editor.create_txt()
         self.update_last_game_list()
         json_editor.create_json()
 
+        self.update_menu_bar()
+
         theme_file = resource_path(f"style/{json_editor.get_theme()}.qss")
         with open(theme_file, "r", encoding="utf-8") as qss:
             self.setStyleSheet(qss.read())
 
         # Сигналы
-        self.add_game.clicked.connect(self.open_dialog)
+        self.add_game.clicked.connect(lambda: self.open_dialog("add_game"))
         self.list_games.itemDoubleClicked.connect(self.open_game)
         self.delete_game.clicked.connect(self.delete_game_from_list)
         self.sort_name_a_z.clicked.connect(lambda: self.sort_games(""))
         self.sort_name_z_a.clicked.connect(lambda: self.sort_games("r"))
         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")
+        )
 
     def set_theme(self, theme):
         theme_file = resource_path(f"style/{theme}.qss")
@@ -83,10 +89,66 @@ def open_game(self, item):
             QMessageBox.warning(self, "Ошибка!", str(e))
         self.update_last_game_list()
 
-    def open_dialog(self):
-        dialog = dialogs.AddGameDialog()
-        dialog.exec()
-        self.update_game_list()
+    def open_dialog(self, dialog):
+        if dialog == "add_game":
+            _dialog = dialogs.AddGameDialog()
+            _dialog.exec()
+            self.update_game_list()
+        if dialog == "add_category":
+            _dialog = dialogs.AddCategoryDialog()
+            _dialog.exec()
+            self.update_menu_bar()
+
+    def update_menu_bar(self):
+        menu = self.menu_3
+        actions = menu.actions()
+
+        separator_index = -1
+        for i, action in enumerate(actions):
+            if action.isSeparator():
+                separator_index = i
+                break
+
+        if 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(
+                    cat_name
+                )
+            )
+            menu.addAction(action)
+
+    def on_category_selected(self, category_name):
+        self.filter_games_by_category(category_name)
+
+    def filter_games_by_category(self, category_name):
+        if category_name != "Все":
+            category_id = database.get_category_id_by_name(category_name)
+
+            if category_id:
+                conn = database.get_connection()
+                cursor = conn.cursor()
+                cursor.execute(
+                    "SELECT name FROM Games WHERE category_id = ?",
+                    (category_id,),
+                )
+                games = cursor.fetchall()
+                conn.close()
+
+                self.list_games.clear()
+                for game in games:
+                    self.list_games.addItem(game[0])
+            else:
+                self.update_game_list()
+        else:
+            self.list_games.clear()
+            self.update_game_list()
 
 
 if __name__ == "__main__":
diff --git a/ui/add_game_dialog_ui.py b/ui/add_game_dialog_ui.py
@@ -12,11 +12,11 @@
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
-        Dialog.resize(450, 120)
+        Dialog.resize(450, 171)
         Dialog.setSizeGripEnabled(False)
         Dialog.setModal(False)
         self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
-        self.buttonBox.setGeometry(QtCore.QRect(220, 80, 220, 40))
+        self.buttonBox.setGeometry(QtCore.QRect(220, 130, 220, 40))
         self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
         self.buttonBox.setStandardButtons(
             QtWidgets.QDialogButtonBox.StandardButton.Cancel
@@ -57,6 +57,26 @@ def setupUi(self, Dialog):
         self.file_path.setText("")
         self.file_path.setReadOnly(True)
         self.file_path.setObjectName("file_path")
+        self.label_2 = QtWidgets.QLabel(parent=Dialog)
+        self.label_2.setGeometry(QtCore.QRect(10, 100, 80, 20))
+        font = QtGui.QFont()
+        font.setFamily("Arial")
+        font.setPointSize(10)
+        font.setBold(False)
+        font.setUnderline(False)
+        font.setWeight(50)
+        self.label_2.setFont(font)
+        self.label_2.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
+        self.label_2.setObjectName("label_2")
+        self.comboBox = QtWidgets.QComboBox(parent=Dialog)
+        self.comboBox.setGeometry(QtCore.QRect(100, 100, 111, 22))
+        font = QtGui.QFont()
+        font.setFamily("Arial")
+        font.setPointSize(10)
+        self.comboBox.setFont(font)
+        self.comboBox.setEditable(False)
+        self.comboBox.setFrame(True)
+        self.comboBox.setObjectName("comboBox")
 
         self.retranslateUi(Dialog)
         self.buttonBox.accepted.connect(Dialog.accept)  # type: ignore
@@ -68,3 +88,4 @@ def retranslateUi(self, Dialog):
         Dialog.setWindowTitle(_translate("Dialog", "Добавить игру"))
         self.label.setText(_translate("Dialog", "Имя игры"))
         self.path_button.setText(_translate("Dialog", "Путь к файлу"))
+        self.label_2.setText(_translate("Dialog", "Категория"))
diff --git a/ui/createCategory_ui.py b/ui/createCategory_ui.py
diff --git a/ui/mainWindow_ui.py b/ui/mainWindow_ui.py
