Merge pull request #18 from DileSoft/main

Github action, new url

.github/workflows/python-app.yml

@@ -0,0 +1,51 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python application
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.10"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install pyinstaller requests pyqt5 wget
+    - name: Build
+      working-directory: src/launcher
+      shell: bash
+      run: |
+        echo "1" > ./release
+        pyinstaller launcher.spec
+    - name: Dist
+      shell: bash
+      run: |
+        mkdir ./dist
+        mkdir ./dist/src
+        cp ./src/launcher/dist/launcher.exe ./dist
+        cp -r ./src/launcher/* ./dist
+        cp -r ./src/themes ./dist
+        cp -r ./src/languages ./dist
+        cp -r ./src/client/* ./dist/src
+        rm -rf ./dist/dist
+        rm -rf ./dist/build
+    - uses: actions/upload-artifact@v1
+      with:
+        name: VMM-Release-64
+        path: dist

src/client/VMM.py

@@ -70,7 +70,7 @@ def __init__(self):
         # создание профилей для всех модов при отсутствии сейва (спасибо кэп)
         if "save.json" not in os.listdir(os.getcwd()) and "save" not in os.listdir(os.getcwd()):
             try:
-                response = get("https://kiv.name/comod").json()
+                response = get("http://kiv.vangers.net/comod").json()
             except Exception as msg:
                 self.errMsg(msg)
 
@@ -419,7 +419,7 @@ def refresh(self):
                 sys.exit(0)
 
         try:
-            self.response = get("https://kiv.name/comod").json()
+            self.response = get("http://kiv.vangers.net/comod").json()
         except Exception as msg:
             self.errMsg(msg)
 
@@ -582,10 +582,10 @@ def install(self):
 
                 if self.nameToModID[self.combo_mods.currentText()] != "none":
                     try:
-                        self.response = get("https://kiv.name/comod").json()
+                        self.response = get("http://kiv.vangers.net/comod").json()
                         mod_id = self.nameToModID[self.combo_mods.currentText()]
 
-                        file = download("https://kiv.name/comod/" + mod_id + "/get", self.edit_pathInstall.text() +
+                        file = download("http://kiv.vangers.net/comod/" + mod_id + "/get", self.edit_pathInstall.text() +
                                         "/Vangers [" + self.edit_profileName.text() + "]")
                     except Exception as msg:
                         self.errMsg(msg)