From e29f985a4573c9ab871914a72dd53cd2b1235458 Mon Sep 17 00:00:00 2001
From: dez <noone@none.com>
Date: Tue, 27 Feb 2024 11:12:51 +0100
Subject: [PATCH] moved get packages functions

---
 src/gui_main.py      |  1 -
 src/json_main.py     |  9 ---------
 src/json_packages.py | 25 +++++++++++++++++++++++++
 3 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 src/json_packages.py

diff --git a/src/gui_main.py b/src/gui_main.py
index e1b788f..e8aceba 100644
--- a/src/gui_main.py
+++ b/src/gui_main.py
@@ -6,7 +6,6 @@ from PIL import Image, ImageTk
 
 import download_main
 from gui_starfield import StarField
-from json_main import save_package, get_default_packages
 
 def run_installer(download_folder_tmp, col_isDark):
     global visible_widgets, tab_combobox, progress_bar  # Declare tab_combobox as a global variable
diff --git a/src/json_main.py b/src/json_main.py
index 977b3b4..fa8c227 100644
--- a/src/json_main.py
+++ b/src/json_main.py
@@ -113,15 +113,6 @@ def get_package(app):
         return {}
 
 
-def get_default_packages():
-    if sys.platform == 'win32':
-        spitfire_source_info = {
-        "url": "https://downloads.sourceforge.net/project/spitfire-browser/nightly/components/Browser/win-bin-nighty.zip",
-        }
-
-        #(version, app, source_type, source_info, package_type)
-        save_package("1.0", "Spitfire", "sourceforge", spitfire_source_info, "browser")
-
 # ######################
 # # save package test
 
diff --git a/src/json_packages.py b/src/json_packages.py
new file mode 100644
index 0000000..5dfd6be
--- /dev/null
+++ b/src/json_packages.py
@@ -0,0 +1,25 @@
+import cpuinfo
+import sys
+
+def has_avx2_support():
+    info = cpuinfo.get_cpu_info()
+    if 'flags' in info and 'avx2' in info['flags']:
+        return True
+    return False
+
+# I would say that this is stupid way to do this thing, and one source file about sources would be great, but this way is more decentralised, simpler and easier to maintain. But its a messy code.
+
+def get_browser_package():
+    if sys.platform == 'win32':
+        spitfire_source_info = {
+        "url": "https://downloads.sourceforge.net/project/spitfire-browser/nightly/components/Browser/win-bin-nighty.zip",
+        }
+
+        #(version, app, source_type, source_info, package_type)
+        save_package("1.0", "Spitfire", "sourceforge", spitfire_source_info, "browser")
+
+def get_ublock_package():
+    github_source_info = {
+        "github_url": "https://api.github.com/repos/emoacht/Monitorian"
+    }
+    save_package("1.0", "uBlock", "github", github_source_info, "extension")
\ No newline at end of file