merge: release 2.0.0

- remove duplicated inline instruction text

- switch About dialog to explicit QDialog with clickable link

.gitea/workflows/ci.yml

@@ -28,8 +28,8 @@ jobs:
 
       - name: Validate syntax
         run: |
-          python -m py_compile app_version.py main.py build.py tests/test_auth_relogin_smoke.py
+          python -m py_compile app_version.py main.py build.py tests/test_auth_relogin_smoke.py tests/test_auto_update_service.py tests/test_chat_actions.py tests/test_token_store.py
 
       - name: Run tests
         run: |
-          python -m unittest tests/test_auth_relogin_smoke.py
+          python -m unittest discover -s tests -p "test_*.py" -v

.gitea/workflows/release.yml

@@ -47,31 +47,47 @@ jobs:
           [System.IO.File]::AppendAllText($env:GITHUB_OUTPUT, "version=$version`n", $utf8NoBom)
           Write-Host "Detected version: $version"
 
-      - name: Stop if version already released
+      - name: Initialize release flow
-        id: stop
+        id: flow_init
+        shell: powershell
+        run: |
+          $utf8NoBom = New-Object System.Text.UTF8Encoding($false)
+          [System.IO.File]::AppendAllText($env:GITHUB_ENV, "CONTINUE=true`n", $utf8NoBom)
+          exit 0
+
+      - name: Stop if release already exists
         shell: powershell
         run: |
           $version = "${{ steps.extract_version.outputs.version }}"
           $tag = "v$version"
-          git show-ref --tags --quiet --verify "refs/tags/$tag"
+          $apiUrl = "https://git.daemonlord.ru/api/v1/repos/${{ gitea.repository }}/releases?page=1&limit=100"
-          $tagExists = ($LASTEXITCODE -eq 0)
+          $headers = @{ Authorization = "token ${{ secrets.API_TOKEN }}" }
-          $global:LASTEXITCODE = 0
           $utf8NoBom = New-Object System.Text.UTF8Encoding($false)
-          if ($tagExists) {
+          try {
-            Write-Host "Version $tag already released, stopping job."
+            $response = Invoke-RestMethod -Uri $apiUrl -Headers $headers -Method Get
-            [System.IO.File]::AppendAllText($env:GITHUB_ENV, "CONTINUE=false`n", $utf8NoBom)
+            $found = $false
-          } else {
+            foreach ($release in $response) {
-            Write-Host "Version $tag not released yet, continuing workflow..."
+              if ($release.tag_name -eq $tag) {
-            [System.IO.File]::AppendAllText($env:GITHUB_ENV, "CONTINUE=true`n", $utf8NoBom)
+                $found = $true
+                break
+              }
+            }
+            if ($found) {
+              Write-Host "Release $tag already exists, stopping job."
+              [System.IO.File]::AppendAllText($env:GITHUB_ENV, "CONTINUE=false`n", $utf8NoBom)
+            } else {
+              Write-Host "Release $tag not found, continuing workflow..."
+            }
+          } catch {
+            Write-Host "Failed to query releases list, continuing workflow..."
           }
-          exit 0
 
       - name: Run tests
         if: env.CONTINUE == 'true'
         shell: powershell
         run: |
-          python -m py_compile app_version.py main.py build.py tests/test_auth_relogin_smoke.py
+          python -m py_compile app_version.py main.py build.py tests/test_auth_relogin_smoke.py tests/test_auto_update_service.py tests/test_chat_actions.py tests/test_token_store.py
-          python -m unittest tests/test_auth_relogin_smoke.py
+          python -m unittest discover -s tests -p "test_*.py" -v
 
       - name: Build release zip
         if: env.CONTINUE == 'true'
@@ -114,8 +130,13 @@ jobs:
         run: |
           $version = "${{ steps.extract_version.outputs.version }}"
           $tag = "v$version"
-          git tag "$tag"
+          $tagLine = (git ls-remote --tags origin "refs/tags/$tag" | Select-Object -First 1)
-          git push origin "$tag"
+          if ([string]::IsNullOrWhiteSpace($tagLine)) {
+            git tag "$tag"
+            git push origin "$tag"
+          } else {
+            Write-Host "Tag $tag already exists on origin, skipping tag push."
+          }
 
       - name: Create Gitea Release
         if: env.CONTINUE == 'true'

app_version.py

@@ -1 +1 @@
-APP_VERSION = "1.7.0"
+APP_VERSION = "2.0.0"

main.py

@@ -21,7 +21,7 @@ from ui.main_window import instructions_text
 from PySide6.QtWidgets import (QApplication, QMainWindow, QLabel, QLineEdit,
                                QPushButton, QVBoxLayout, QWidget, QMessageBox,
                                QTextBrowser, QScrollArea, QCheckBox, QHBoxLayout,
-                               QSizePolicy, QTabWidget,
+                               QSizePolicy, QTabWidget, QDialog, QDialogButtonBox,
                                QProgressBar)
 from PySide6.QtCore import Qt, QUrl, QDateTime, QTimer
 from PySide6.QtGui import QIcon, QAction, QDesktopServices
@@ -103,14 +103,6 @@ class VkChatManager(QMainWindow):
         layout.setSpacing(5)
 
         self.instructions = QTextBrowser()
-        self.instructions.setPlainText(
-            "Инструкция:\n"
-            "1. Авторизуйтесь через VK.\n"
-            "2. Выберите чаты.\n"
-            "3. Вставьте ссылку на пользователя в поле ниже. ID определится автоматически.\n"
-            "4. Для массовых операций, нажмите кнопку 'Список' и вставьте ссылки в окне.\n"
-            "5. Нажмите 'ИСКЛЮЧИТЬ' или 'ПРИГЛАСИТЬ'."
-        )
         self.instructions.setFixedHeight(120)
         self.instructions.setPlainText(instructions_text())
         layout.addWidget(self.instructions)
@@ -252,35 +244,33 @@ class VkChatManager(QMainWindow):
         self.about_action = about_action
 
     def show_about_dialog(self):
-        message_box = QMessageBox(self)
+        dialog = QDialog(self)
-        message_box.setWindowTitle("О приложении")
+        dialog.setWindowTitle("О приложении")
-        message_box.setIcon(QMessageBox.Information)
+        dialog.setMinimumWidth(460)
-        message_box.setTextFormat(Qt.RichText)
-
         repo_url = self.update_repository_url
         if repo_url:
             repo_html = f'<a href="{repo_url}">{repo_url}</a>'
         else:
             repo_html = "не указан"
-
+        content = QLabel(
-        message_box.setText(
+            f"<b>Anabasis Chat Manager</b><br>"
-            (
+            f"Версия: {APP_VERSION}<br><br>"
-                f"<b>Anabasis Chat Manager</b><br>"
+            "Инструмент для массового управления пользователями в чатах VK.<br>"
-                f"Версия: {APP_VERSION}<br><br>"
+            "Поддерживается проверка обновлений и автообновление Windows-сборки.<br><br>"
-                "Инструмент для массового управления пользователями в чатах VK.<br>"
+            f"Репозиторий: {repo_html}"
-                "Поддерживается проверка обновлений и автообновление Windows-сборки.<br><br>"
-                f"Репозиторий: {repo_html}"
-            )
         )
+        content.setTextFormat(Qt.RichText)
+        content.setTextInteractionFlags(Qt.TextBrowserInteraction)
+        content.setOpenExternalLinks(True)
+        content.setWordWrap(True)
 
-        # QMessageBox не имеет setOpenExternalLinks, настраиваем его внутренний QLabel.
+        button_box = QDialogButtonBox(QDialogButtonBox.Ok, parent=dialog)
-        for label in message_box.findChildren(QLabel):
+        button_box.accepted.connect(dialog.accept)
-            if "href=" in label.text():
-                label.setTextInteractionFlags(Qt.TextBrowserInteraction)
-                label.setOpenExternalLinks(True)
-                break
 
-        message_box.exec()
+        layout = QVBoxLayout(dialog)
+        layout.addWidget(content)
+        layout.addWidget(button_box)
+        dialog.exec()
 
     def create_chat_tab(self):
         # This implementation correctly creates a scrollable area for chat lists.