Merge pull request #26 from wikm360/dev

Dev to main

Author: wikm360

.github/workflows/dev.yml

@@ -99,38 +99,6 @@ jobs:
           name: ubuntu-release
           path: ./release/XC-ubuntu.zip
 
-  build-ubuntu20:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      
-      - name: Setup Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install pyinstaller
-          pip install -r requirements.txt
-
-      - name: Build executable with flet
-        run: flet pack -i ./GUI-ver/src/assets/icon.ico ./GUI-ver/src/main.py -n XC --product-name XC --file-description "XC Created By wikm" --product-version v4.2-${{ github.run_number }} --file-version v4.2-${{ github.run_number }} --company-name wikm.ir
-
-      - name: Zip executable and folders
-        run: |
-          mkdir release
-          cp -r ./dist/XC ./release/
-          zip -r ./release/XC-ubuntu20.zip ./release/
-
-      - name: Upload Release Asset
-        uses: actions/upload-artifact@v4
-        with:
-          name: ubuntu20-release
-          path: ./release/XC-ubuntu20.zip
-
   build-fedora:
     runs-on: ubuntu-latest
     steps:
@@ -187,7 +155,7 @@ jobs:
 
   github-release:
     name: Upload to GitHub Release
-    needs: [build-windows, build-ubuntu, build-ubuntu20, build-fedora, build-cli]
+    needs: [build-windows, build-ubuntu, build-fedora, build-cli]
     runs-on: ubuntu-latest
 
     permissions:
@@ -210,12 +178,6 @@ jobs:
           name: ubuntu-release
           path: ./release/ubuntu/
 
-      - name: Download Release Assets
-        uses: actions/download-artifact@v4
-        with:
-          name: ubuntu20-release
-          path: ./release/ubuntu20/
-
       - name: Download Release Assets
         uses: actions/download-artifact@v4
         with:
@@ -248,7 +210,6 @@ jobs:
             "v4.2-${{ github.run_number }}" \
             ./release/windows/XC-windows.zip \
             ./release/ubuntu/XC-ubuntu.zip \
-            ./release/ubuntu20/XC-ubuntu20.zip \
             ./release/fedora/XC-fedora.zip \
             ./release/cli/XC-CLI.zip \
             --repo "${{ github.repository }}"

.github/workflows/main.yml

@@ -98,38 +98,6 @@ jobs:
           name: ubuntu-release
           path: ./release/XC-ubuntu.zip
 
-  build-ubuntu20:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      
-      - name: Setup Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install pyinstaller
-          pip install -r requirements.txt
-
-      - name: Build executable with flet
-        run: flet pack -i ./GUI-ver/src/assets/icon.ico ./GUI-ver/src/main.py -n XC --product-name XC --file-description "XC Created By wikm" --product-version v4.3-${{ github.run_number }} --file-version v4.3-${{ github.run_number }} --company-name wikm.ir
-
-      - name: Zip executable and folders
-        run: |
-          mkdir release
-          cp -r ./dist/XC ./release/
-          zip -r ./release/XC-ubuntu20.zip ./release/
-
-      - name: Upload Release Asset
-        uses: actions/upload-artifact@v4
-        with:
-          name: ubuntu20-release
-          path: ./release/XC-ubuntu20.zip
-
   build-fedora:
     runs-on: ubuntu-latest
     steps:
@@ -186,7 +154,7 @@ jobs:
 
   github-release:
     name: Upload to GitHub Release
-    needs: [build-windows, build-ubuntu, build-ubuntu20, build-fedora, build-cli]
+    needs: [build-windows, build-ubuntu, build-fedora, build-cli]
     runs-on: ubuntu-latest
 
     permissions:
@@ -209,12 +177,6 @@ jobs:
           name: ubuntu-release
           path: ./release/ubuntu/
 
-      - name: Download Release Assets
-        uses: actions/download-artifact@v4
-        with:
-          name: ubuntu20-release
-          path: ./release/ubuntu20/
-
       - name: Download Release Assets
         uses: actions/download-artifact@v4
         with:
@@ -247,7 +209,6 @@ jobs:
             "v4.3-${{ github.run_number }}" \
             ./release/windows/XC-windows.zip \
             ./release/ubuntu/XC-ubuntu.zip \
-            ./release/ubuntu20/XC-ubuntu20.zip \
             ./release/fedora/XC-fedora.zip \
             ./release/cli/XC-CLI.zip \
             --repo "${{ github.repository }}"

GUI-ver/src/AppDir/.DirIcon

@@ -0,0 +1 @@
+icon.png

GUI-ver/src/AppDir/AppRun

@@ -0,0 +1,3 @@
+#!/bin/bash
+HERE="$(dirname "$(readlink -f "${0}")")"
+exec "$HERE/usr/bin/xc"

GUI-ver/src/AppDir/icon.png

@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=xc
+Exec=xc
+Icon=icon
+Categories=Utility;

GUI-ver/src/AppDir/usr/bin/xc

@@ -698,10 +698,12 @@ def disable_gnome_proxy(self):
     def _get_xray_traffic(self, stat_name):
             """Helper function to get traffic stats from Xray"""
             try:
+                creation_flags = subprocess.CREATE_NO_WINDOW if self.os_sys == "win" else 0
                 result = subprocess.run(
                     [self.xray_path, "api", "stats", f"--server={self.server}", f"-name={stat_name}"],
                     capture_output=True,
-                    text=True
+                    text=True,
+                    creationflags=creation_flags
                 )
                 if result.returncode == 0:
                     data = json.loads(result.stdout)

GUI-ver/src/AppDir/xc.desktop

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# دریافت appimagetool در صورت نیاز
+if [ ! -f appimagetool ]; then
+    wget https://github.com/AppImage/AppImageKit/releases/latest/download/appimagetool-x86_64.AppImage -O appimagetool
+    chmod +x appimagetool
+fi
+
+# ساخت AppImage
+./appimagetool AppDir