Debug

modules/gui.py

@@ -699,6 +699,9 @@ class Ui_MainWindow(object):
 class Ui_LoginWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(":/images/horsy_white32x32.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        MainWindow.setWindowIcon(icon)
         MainWindow.resize(292, 200)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -771,6 +774,9 @@ class Ui_DownloadWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
         MainWindow.resize(682, 252)
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(":/images/horsy_white32x32.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        MainWindow.setWindowIcon(icon)
         MainWindow.setMinimumSize(QtCore.QSize(682, 252))
         MainWindow.setMaximumSize(QtCore.QSize(682, 252))
         MainWindow.setStyleSheet("QWidget{\n"
@@ -810,6 +816,9 @@ class Ui_DownloadWindow(object):
 class Ui_PackageWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(":/images/horsy_white32x32.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        MainWindow.setWindowIcon(icon)
         MainWindow.resize(331, 433)
         MainWindow.setMinimumSize(QtCore.QSize(331, 433))
         MainWindow.setMaximumSize(QtCore.QSize(331, 433))

modules/gui_manager.py

@@ -1,150 +1,155 @@
 import json
 import threading
-import time
-from modules.unerrored import run_threaded
+from modules.http_status import handle
 import requests
 import modules.vars as horsy_vars
 import os
 import zipfile
 from modules.virustotal import get_key, scan_file, get_report
 from horsygui import UiDownloadWindow, download_ui
-from modules.gui import popup, cpopup
-success = 0
+from modules.gui import cpopup
+from PyQt5 import QtGui
 
 
 def install(package):
-    global success
-    r = requests.get(f"{horsy_vars.protocol}{horsy_vars.server_url}/packages/json/{package}").text
-    if r == "":
-        run_threaded(popup("Installation", f"Package {package} not found"))
-        print(r)
-        return f"Package {package} not found"
-    try:
-        r = json.loads(r)
-    except:
-        print("[red]Error with unsupported message[/]")
-        run_threaded(popup("Error", "Error with unsupported message"))
-        return "Error with unsupported message"
-    try:
-        if r["message"] == "Internal server error":
-            print("Internal server error")
-            run_threaded(popup("Error", "Internal server error"))
-            return "Internal server error"
-    except:
-        pass
+    r = requests.get(f"{horsy_vars.protocol}{horsy_vars.server_url}/packages/json/{package}")
+    r_code = handle(r.status_code)
+    r = r.text
+    r = json.loads(r)
+
+    if r_code[1] not in [200, 201]:
+        cpopup("Error", r_code[1])
 
     try:
         UiDownloadWindow.show()
-
-        if not os.path.exists('{1}apps/{0}'.format(r['name'], horsy_vars.horsypath)):
-            os.makedirs('{1}apps/{0}'.format(r['name'], horsy_vars.horsypath))
-
         download_ui.logs_box.clear()
         download_ui.logs_box.append(f"Downloading {r['url'].split('/')[-1]}")
 
-        def dl_main_file():
-            global success
-            UiDownloadWindow.show()
-            file_r = requests.get(r['url'], stream=True)
-            chunk_size = int(int(file_r.headers['Content-Length']) / 100)
-            percent = 0
-            with open('{2}apps/{0}/{1}'.format(r['name'], r['url'].split('/')[-1], horsy_vars.horsypath), "wb") as f:
-                for chunk in file_r.iter_content(chunk_size=chunk_size):
-                    if chunk:
-                        percent += 1
-                        f.write(chunk)
-            download_ui.logs_box.append("")
-            if not get_key():
-                download_ui.logs_box.append("Virustotal api key not found \n"
-                                            "You can add it by entering horsy --vt [key] in terminal")
-            else:
-                download_ui.logs_box.append("If you want to disable scan, type horsy --vt disable in terminal")
-                download_ui.logs_box.append("Starting virustotal scan for program")
-                scan_file('{2}apps/{0}/{1}'.format(r['name'], r['url'].split('/')[-1], horsy_vars.horsypath))
-                analysis = get_report('{2}apps/{0}/{1}'.format(r['name'], r['url'].split('/')[-1],
-                                                               horsy_vars.horsypath))
-                download_ui.logs_box.append(f"Scan finished for program \nYou can see report by opening: "
-                                            f"{analysis['link']} \n"
-                                    f"{analysis['detect']['malicious']} antivirus flagged this file as malicious")
+        def install_this():
+            if not os.path.exists('{1}apps/{0}'.format(r['name'], horsy_vars.horsypath)):
+                os.makedirs('{1}apps/{0}'.format(r['name'], horsy_vars.horsypath))
+
+            def dl_main_file():
+                global success
+                UiDownloadWindow.show()
+                file_r = requests.get(r['url'], stream=True)
+                chunk_size = int(int(file_r.headers['Content-Length']) / 100)
+                percent = 0
+                with open('{2}apps/{0}/{1}'.format(r['name'], r['url'].split('/')[-1], horsy_vars.horsypath), "wb") as f:
+                    for chunk in file_r.iter_content(chunk_size=chunk_size):
+                        if chunk:
+                            percent += 1
+                            f.write(chunk)
+                download_ui.logs_box.append("")
+                download_ui.logs_box.moveCursor(QtGui.QTextCursor.End)
+
+            threads = list()
+            threads.append(threading.Thread(target=dl_main_file))
+
+            if r['download']:
+                download_ui.logs_box.append(f"Downloading {r['download'].split('/')[-1]}")
+                download_ui.logs_box.moveCursor(QtGui.QTextCursor.End)
+
+                def dl_dep_file():
+                    global success
+                    file_r = requests.get(r['download'], stream=True)
+                    chunk_size = int(int(file_r.headers['Content-Length']) / 100)
+                    with open('{2}apps/{0}/{1}'.format(r['name'], r['download'].split('/')[-1], horsy_vars.horsypath),
+                              "wb") as f:
+                        for chunk in file_r.iter_content(chunk_size=chunk_size):
+                            if chunk:
+                                f.write(chunk)
+                    download_ui.logs_box.append("")
+                    download_ui.logs_box.append(f"Starting virustotal scan for dependency")
+                    download_ui.logs_box.moveCursor(QtGui.QTextCursor.End)
+
+                threads.append(threading.Thread(target=dl_dep_file))
+
+            for t in threads:
+                t.start()
+
+            for t in threads:
+                t.join()
 
             def unzip(file, where):
                 with zipfile.ZipFile(file, 'r') as zip_ref:
                     zip_ref.extractall(where)
-                    print(f"Extracted")
+                    download_ui.logs_box.append(f"Extracted")
+                    download_ui.logs_box.moveCursor(QtGui.QTextCursor.End)
 
             if r['url'].split('.')[-1] == 'zip':
-                print(f"Extracting {r['url'].split('/')[-1]}")
+                download_ui.logs_box.append(f"Extracting {r['url'].split('/')[-1]}")
+                download_ui.logs_box.moveCursor(QtGui.QTextCursor.End)
                 unzip('{2}apps/{0}/{1}'.format(r['name'], r['url'].split('/')[-1], horsy_vars.horsypath),
                       '{1}apps/{0}'.format(r['name'], horsy_vars.horsypath))
 
-            success += 1
+            download_ui.logs_box.append("")
+            download_ui.logs_box.moveCursor(QtGui.QTextCursor.End)
 
-        threads = list()
-        threads.append(threading.Thread(target=dl_main_file))
+            if not get_key():
+                download_ui.logs_box.append("Virustotal api key not found \n"
+                                            "You can add it by entering horsy --vt [key] in terminal")
+                download_ui.logs_box.moveCursor(QtGui.QTextCursor.End)
+            else:
+                download_ui.logs_box.append("If you want to disable scan, type horsy --vt disable in terminal")
+                download_ui.logs_box.append("Starting virustotal scan for program")
+                download_ui.logs_box.moveCursor(QtGui.QTextCursor.End)
+                scan_file('{2}apps/{0}/{1}'.format(r['name'], r['url'].split('/')[-1], horsy_vars.horsypath))
+                analysis = get_report('{2}apps/{0}/{1}'.format(r['name'], r['url'].split('/')[-1],
+                                                               horsy_vars.horsypath))
+                download_ui.logs_box.append(f"Scan finished for program \nYou can see report for program by opening: "
+                                            f"{analysis['link']} \n"
+                                    f"{analysis['detect']['malicious']} antivirus flagged this file as malicious")
+                download_ui.logs_box.moveCursor(QtGui.QTextCursor.End)
 
-        if r['download']:
-            def dl_dep_file():
-                global success
-                download_ui.logs_box.append(f"Downloading {r['download'].split('/')[-1]}")
-                file_r = requests.get(r['download'], stream=True)
-                chunk_size = int(int(file_r.headers['Content-Length']) / 100)
-                with open('{2}apps/{0}/{1}'.format(r['name'], r['download'].split('/')[-1], horsy_vars.horsypath),
-                          "wb") as f:
-                    for chunk in file_r.iter_content(chunk_size=chunk_size):
-                        if chunk:
-                            f.write(chunk)
-                download_ui.logs_box.append("")
-                download_ui.logs_box.append(f"Starting virustotal scan for dependency")
-                if not get_key():
-                    download_ui.logs_box.append(f"Virustotal api key not found")
-                    download_ui.logs_box.append(f"You can add it by entering horsy --vt [key] in terminal")
-                else:
+                if r['download']:
+                    download_ui.logs_box.append("")
+                    download_ui.logs_box.append("Starting virustotal scan for dependency")
+                    download_ui.logs_box.moveCursor(QtGui.QTextCursor.End)
                     scan_file('{2}apps/{0}/{1}'.format(r['name'], r['download'].split('/')[-1], horsy_vars.horsypath))
-                    download_ui.logs_box.append(f"Virustotal scan finished for dependency")
+                    download_ui.logs_box.append(f"Scan finished for dependency")
+                    download_ui.logs_box.moveCursor(QtGui.QTextCursor.End)
                     analysis = get_report('{2}apps/{0}/{1}'.format(r['name'], r['download'].split('/')[-1],
                                                                    horsy_vars.horsypath))
                     download_ui.logs_box.append(f"You can see report for dependency by opening: {analysis['link']}")
                     download_ui.logs_box.append(f"{analysis['detect']['malicious']} "
                                                 f"antivirus flagged this file as malicious")
+                    download_ui.logs_box.moveCursor(QtGui.QTextCursor.End)
                     if analysis['detect']['malicious'] > 0:
+                        download_ui.logs_box.append("")
                         download_ui.logs_box.append(f"SECURITY WARNING, APP INSTALLATION STOPPED")
                         download_ui.logs_box.append(f"Dependency can be malicious. "
                                                     f"It may run now, if this added to installation config")
                         download_ui.logs_box.append(f"You can disable VT check with horsy --vt disable \n"
                                                     f"or use horsy CLI to force install")
-                        success -= 1
-                        return
+                        download_ui.logs_box.append("")
+                        download_ui.logs_box.moveCursor(QtGui.QTextCursor.End)
 
-                success += 1
+            download_ui.logs_box.append("")
+            download_ui.logs_box.append("Generating launch script")
+            with open('{1}apps/{0}.bat'.format(r['name'], horsy_vars.horsypath), 'w') as f:
+                f.write(f"@ECHO off\n")
+                f.write(f"%horsypath:~0,1%:\n")
+                f.write(f"cd %horsypath%/apps/{r['name']}\n")
+                f.write(f"{r['run']} %*\n")
+            download_ui.logs_box.append("")
+            download_ui.logs_box.moveCursor(QtGui.QTextCursor.End)
 
-            threads.append(threading.Thread(target=dl_dep_file))
-
-        for t in threads:
-            t.start()
-
-        with open('{1}apps/{0}.bat'.format(r['name'], horsy_vars.horsypath), 'w') as f:
-            f.write(f"@ECHO off\n")
-            f.write(f"%horsypath:~0,1%:\n")
-            f.write(f"cd %horsypath%/apps/{r['name']}\n")
-            f.write(f"{r['run']} %*\n")
-
-        def wait_for_success():
-            while success != 2:
-                time.sleep(1)
-            if success == 2:
-                if r['install']:
-                    download_ui.logs_box.append(f"Found install option")
-                    threading.Thread(target=os.system, args=('{2}apps/{0}/{1}'.format(r['name'], r['install'],
-                                                                                      horsy_vars.horsypath),)).start()
+            if r['install']:
+                download_ui.logs_box.append(f"Found install option, launching {r['install']}")
+                download_ui.logs_box.append("")
+                download_ui.logs_box.moveCursor(QtGui.QTextCursor.End)
+                threading.Thread(target=os.system, args=('{2}apps/{0}/{1}'.format(r['name'], r['install'],
+                                                                                  horsy_vars.horsypath),)).start()
                 download_ui.logs_box.append(f"All done!\nYou can run your app by entering {r['name']} in terminal")
-                return
-        threading.Thread(target=wait_for_success).start()
+                download_ui.logs_box.moveCursor(QtGui.QTextCursor.End)
+        threading.Thread(target=install_this).start()
 
     except:
         pass
 
 
-def uninstall(package, login_ui=None, Ui_LoginWindow=None):
+def uninstall(package):
     if os.path.exists('{1}apps/{0}'.format(package, horsy_vars.horsypath)):
         os.system('rmdir /s /q "{1}apps/{0}"'.format(package, horsy_vars.horsypath))
         cpopup("Uninstallation", f"Files deleted")