From 18f90f17917ff5d0375eba9cbe88d04f9068621f Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 17:32:26 +0530
Subject: [PATCH 01/22] extend function #1
---
blackbox/Functions.py | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index 689b15f..1a1e1e3 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -1174,4 +1174,31 @@ def get_package_information(package_name):
return "error: package '%s' not found!\n" % package_name
else:
-
\ No newline at end of file
+# NOTE : ICON ON THE BACK
+def get_current_installed():
+ logger.debug(
+ "Get currently installed packages"
+ )
+ path = base_dir + "/cache/installed.lst"
+
+ query_str = [
+ "pacman",
+ "-Q",
+ ]
+
+ subprocess_query = subprocess.Popen(
+ query_str,
+ shell=False,
+ stdout=subprocess.PIPE,
+ )
+
+ out, err = subprocess_query.communicate(timeout=process_timeout)
+
+ # added validation on process result
+ if subprocess_query.returncode == 0:
+ file = open(path, "w")
+ for line in out.decode("utf-8"):
+ file.write(line)
+ file.close()
+ else:
+ logger.warning("Failed to run %s" % query_str)
\ No newline at end of file
From c9ba799fb90a6e5dd112d23e59ab75e89a521184 Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 17:34:17 +0530
Subject: [PATCH 02/22] add function #query_pkg
---
blackbox/Functions.py | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index 1a1e1e3..10ec4f0 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -1201,4 +1201,27 @@ def get_current_installed():
file.write(line)
file.close()
else:
- logger.warning("Failed to run %s" % query_str)
\ No newline at end of file
+ logger.warning("Failed to run %s" % query_str)
+
+def query_pkg(package):
+ try:
+ package = package.strip()
+ path = base_dir + "/cache/installed.lst"
+
+ pacman_localdb = base_dir + "/cache/pacman-localdb"
+
+ if os.path.exists(path):
+ if is_file_stale(path, 0, 0, 30):
+ get_current_installed()
+ else:
+ get_current_installed()
+ with open(path, "r") as f:
+ pkg = package.strip("\n")
+ for line in f:
+ installed = line.split(" ")
+ if pkg == installed[0]:
+ return True
+ # file.close()
+ return False
+ except Exception as e:
+ logger.error("Exception in LOC1206: %s " % e)
From 4b8ceb7a8d3e79168eab2178b23e05a73c287590 Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 17:37:40 +0530
Subject: [PATCH 03/22] creat #cache function
---
blackbox/Functions.py | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index 10ec4f0..5c63d32 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -1225,3 +1225,45 @@ def query_pkg(package):
return False
except Exception as e:
logger.error("Exception in LOC1206: %s " % e)
+
+def cache(package, path_dir_cache):
+ try:
+ pkg = package.strip()
+ query_str = [
+ "pacman",
+ "-Si",
+ pkg,
+ " --noconfirm",
+ ]
+ process = subprocess.Popen(
+ query_str, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+ )
+ out, err = process.communicate()
+ if process.returncode == 0:
+ # out, err = process.communicate()
+
+ output = out.decode("utf-8")
+
+ if len(output) > 0:
+ split = output.splitlines()
+ desc = str(split[3]) # Ref: LOC:963
+ description = desc[18:] # Ref: LOC:964
+ filename = path_dir_cache + pkg
+
+ file = open(filename, "w")
+ file.write(description)
+ file.close()
+
+ return description
+
+ if process.returncode != 0:
+ exceptions = [
+ "cached-package-goes-here"
+ ]
+ if pkg in exceptions:
+ description = file_lookup(pkg, path_dir_cache + "corrections/")
+ return description
+ return "No Description Found"
+
+ except Exception as e:
+ logger.error("Exception in cache(): %s " % e)
From 8268cfd3754d7ad327232f975d6e735ddcdd9246 Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 17:38:35 +0530
Subject: [PATCH 04/22] add #add_pacmanlog_queue function
---
blackbox/Functions.py | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index 5c63d32..9f471ed 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -1267,3 +1267,20 @@ def cache(package, path_dir_cache):
except Exception as e:
logger.error("Exception in cache(): %s " % e)
+
+def add_pacmanlog_queue(self):
+ try:
+ lines = []
+ with open(pacman_logfile, "r", encoding="utf-8") as f:
+ while True:
+ line = f.readline()
+ if line:
+ lines.append(line.encode("utf-8"))
+ self.pacmanlog_queue.put(lines)
+ else:
+ time.sleep(0.5)
+
+ except Exception as e:
+ logger.error("Exception in add_pacmanlog_queue() : %s" % e)
+ finally:
+ logger.debug("No new lines found inside the pacman log file")
From 3665d7f8a435a8d0c67ed6909824c74328d3cd6e Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 17:39:01 +0530
Subject: [PATCH 05/22] add #start_log_timer function
---
blackbox/Functions.py | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index 9f471ed..ccebd9c 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -1284,3 +1284,12 @@ def add_pacmanlog_queue(self):
logger.error("Exception in add_pacmanlog_queue() : %s" % e)
finally:
logger.debug("No new lines found inside the pacman log file")
+
+def start_log_timer(self, window_pacmanlog):
+ while True:
+ if window_pacmanlog.start_logtimer is False:
+ logger.debug("Stopping Pacman log monitoring timer")
+ return False
+
+ GLib.idle_add(update_textview_pacmanlog, self, priority=GLib.PRIORITY_DEFAULT)
+ time.sleep(2)
\ No newline at end of file
From d7e30c072f6d1497ac1373db1b55c0b33fe2fb6e Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 17:42:22 +0530
Subject: [PATCH 06/22] add #appned_po, #repo_exist, #install_snigdhaos_keyring
---
blackbox/Functions.py | 63 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 62 insertions(+), 1 deletion(-)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index ccebd9c..06016ac 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -1292,4 +1292,65 @@ def start_log_timer(self, window_pacmanlog):
return False
GLib.idle_add(update_textview_pacmanlog, self, priority=GLib.PRIORITY_DEFAULT)
- time.sleep(2)
\ No newline at end of file
+ time.sleep(2)
+
+# NOTE: SNIGDHA OS SPECIFIC #
+
+def append_repo(text):
+ """Append a new repo"""
+ try:
+ with open(pacman_conf, "a", encoding="utf-8") as f:
+ f.write("\n\n")
+ f.write(text)
+ except Exception as e:
+ logger.error("Exception in LOC1299: %s" % e)
+
+def repo_exist(value):
+ """check repo_exists"""
+ with open(pacman_conf, "r", encoding="utf-8") as f:
+ lines = f.readlines()
+ f.close()
+ for line in lines:
+ if value in line:
+ return True
+ return False
+
+def install_snigdhaos_keyring():
+ try:
+ keyring = base_dir + "/packages/snigdhaos-keyring/"
+ file = os.listdir(keyring)
+ cmd_str = [
+ "pacman",
+ "-U",
+ keyring + str(file).strip("[]'"),
+ "--noconfirm",
+ ]
+ logger.debug("%s" % " ".join(cmd_str))
+ with subprocess.Popen(
+ cmd_str,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ bufsize=1,
+ universal_newlines=True,
+ ) as process:
+ process.wait(process_timeout)
+ output = []
+ for line in process.stdout:
+ output.append(line)
+ if process.returncode == 0:
+ return 0
+ else:
+ if len(output) == 0:
+ output.append("Error: install of ArcoLinux keyring failed")
+ logger.error(" ".join(output))
+ result_err = {}
+ result_err["cmd_str"] = cmd_str
+ result_err["output"] = output
+ return result_err
+ except Exception as e:
+ logger.error("Exception in LOC1318: %s" % e)
+ result_err = {}
+ result_err["cmd_str"] = cmd_str
+ result_err["output"] = e
+ return result_err
+
From e7bfb9c58bfc67944e63c4c54468e86f522c0360 Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 17:44:06 +0530
Subject: [PATCH 07/22] add #remove_snigdhaos_keyring function
---
blackbox/Functions.py | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index 06016ac..1b978a8 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -1354,3 +1354,38 @@ def install_snigdhaos_keyring():
result_err["output"] = e
return result_err
+def remove_snigdhaos_keyring():
+ try:
+ cmd_str = [
+ "pacman",
+ "-Rdd",
+ "snigdhaos-keyring",
+ "--noconfirm"
+ ]
+ with subprocess.Popen(
+ cmd_str,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ bufsize=1,
+ universal_newlines=True,
+ ) as process:
+ process.wait(process_timeout)
+ output = []
+ for line in process.stdout:
+ output.append(line)
+ if process.returncode == 0:
+ return 0
+ else:
+ if len(output) == 0:
+ output.append("[Error] Removal of Snigdha OS keyring failed!")
+ logger.error(" ".join(output))
+ result_err = {}
+ result_err["cmd_str"] = cmd_str
+ result_err["output"] = output
+ return result_err
+ except Exception as e:
+ logger.error("Exception in LOC1357: %s" % e)
+ result_err = {}
+ result_err["cmd_str"] = cmd_str
+ result_err["output"] = e
+ return result_err
From eedd4350a56a546f6459163f7198d3f31126e517 Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 17:45:45 +0530
Subject: [PATCH 08/22] add #install_snigdhaos_mirrorlist
---
blackbox/Functions.py | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index 1b978a8..77e29ba 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -1389,3 +1389,42 @@ def remove_snigdhaos_keyring():
result_err["cmd_str"] = cmd_str
result_err["output"] = e
return result_err
+
+def install_snigdhaos_mirrorlist():
+ try:
+ mirrorlist = base_dir + "/packages/snigdhaos-mirrorlist/"
+ file = os.listdir(mirrorlist)
+ cmd_str = [
+ "pacman",
+ "-U",
+ mirrorlist + str(file).strip("[]'"),
+ "--noconfirm",
+ ]
+ logger.debug("%s" % " ".join(cmd_str))
+ with subprocess.Popen(
+ cmd_str,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ bufsize=1,
+ universal_newlines=True,
+ ) as process:
+ process.wait(process_timeout)
+ output = []
+ for line in process.stdout:
+ output.append(line)
+ if process.returncode == 0:
+ return 0
+ else:
+ if len(output) == 0:
+ output.append("[Error] install of Snigdha OS Mirrorlist failed")
+ logger.error(" ".join(output))
+ result_err = {}
+ result_err["cmd_str"] = cmd_str
+ result_err["output"] = output
+ return result_err
+ except Exception as e:
+ logger.error("Exception in LOC1393: %s" % e)
+ result_err = {}
+ result_err["cmd_str"] = cmd_str
+ result_err["output"] = output
+ return result_err
From 00db2d42b9a0befb7f76768c5c4e0fe4758a768d Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 17:47:37 +0530
Subject: [PATCH 09/22] add #remove_snigdhaos_mirrorlist
---
blackbox/Functions.py | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index 77e29ba..a16f5bf 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -1428,3 +1428,40 @@ def install_snigdhaos_mirrorlist():
result_err["cmd_str"] = cmd_str
result_err["output"] = output
return result_err
+
+def remove_snigdhaos_mirrorlist():
+ try:
+ cmd_str = [
+ "pacman",
+ "-Rdd",
+ "snigdhaos-mirrorlist",
+ "--noconfirm",
+ ]
+ logger.debug("%s" % " ".join(cmd_str))
+ with subprocess.Popen(
+ cmd_str,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ bufsize=1,
+ universal_newlines=True,
+ ) as process:
+ process.wait(process_timeout)
+ output = []
+ for line in process.stdout:
+ output.append(line)
+ if process.returncode == 0:
+ return 0
+ else:
+ if len(output) == 0:
+ output.append("[Error] Removal of Snigdha OS Mirrorlist failed")
+ logger.error(" ".join(output))
+ result_err = {}
+ result_err["cmd_str"] = cmd_str
+ result_err["output"] = output
+ return result_err
+ except Exception as e:
+ logger.error("Exception in LOC1432: %s" % e)
+ result_err = {}
+ result_err["cmd_str"] = cmd_str
+ result_err["output"] = e
+ return result_err
\ No newline at end of file
From 33fb4132afcfe19e602e26d9ed1ffcf6aa033bc4 Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 18:03:16 +0530
Subject: [PATCH 10/22] #add_snigdha_repos, #verify_snigdhaos_pacman_conf
---
blackbox/Functions.py | 103 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 102 insertions(+), 1 deletion(-)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index a16f5bf..98c2863 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -1464,4 +1464,105 @@ def remove_snigdhaos_mirrorlist():
result_err = {}
result_err["cmd_str"] = cmd_str
result_err["output"] = e
- return result_err
\ No newline at end of file
+ return result_err
+
+def add_snigdha_repos():
+ logger.info("Adding Snigdha OS Repos on %s" % distr)
+ try:
+ if verify_snigdhaos_pacman_conf() is False:
+ if os.path.exists(pacman_conf):
+ shutil.copy(
+ pacman_conf,
+ pacman_conf_backup,
+ )
+ logger.info("Reading from %s" % pacman_conf)
+ lines = []
+ with open(pacman_conf, "r", encoding="utf-8") as r:
+ lines = r.readlines()
+ if len(lines) > 0:
+ snigddhaos_core_found = False
+ snigdhaos_extra_found = False
+ for line in lines:
+ if "#" in line.strip():
+ if snigddhaos_core[0].replace("#", "") in line.strip():
+ snigddhaos_core_found = True
+ index = lines.index(line)
+ del lines[index]
+ lines.insert(index, snigddhaos_core[0])
+ index += 1
+ del lines[index]
+ lines.insert(index, snigddhaos_core[1])
+ index += 1
+ del lines[index]
+ lines.insert(index, snigddhaos_core[2])
+ if snigdhaos_extra[0].replace("#", "") in line.strip():
+ snigdhaos_extra_found = True
+ index = lines.index(line)
+ del lines[index]
+ lines.insert(index, snigdhaos_extra[0])
+ index += 1
+ del lines[index]
+ lines.insert(index, snigdhaos_extra[1])
+ index += 1
+ del lines[index]
+ lines.insert(index, snigdhaos_extra[2])
+ if line.strip() == snigddhaos_core[0]:
+ snigddhaos_core_found = True
+ if line.strip() == snigdhaos_extra[0]:
+ snigdhaos_extra_found = True
+ if snigddhaos_core_found is False:
+ lines.append("\n")
+ for snigdhaos_repo_line in snigddhaos_core:
+ lines.append(snigdhaos_repo_line)
+ if snigdhaos_extra_found is False:
+ lines.append("\n")
+ for snigdhaos_extra_found_line in snigdhaos_extra_found:
+ lines.append(snigdhaos_extra_found_line)
+ logger.info("[Add Snigdha OS repos] Writing to %s" % pacman_conf)
+ if len(lines) > 0:
+ with open(pacman_conf, "w", encoding="utf-8") as w:
+ for l in lines:
+ w.write(l.strip() + "\n")
+ w.flush()
+ return 0
+ else:
+ logger.error("Failed to process %s" % pacman_conf)
+ else:
+ logger.error("Failed to read %s" % pacman_conf)
+ else:
+ logger.info("Snigdha OS repos already setup inside pacman conf file")
+ return 0
+ except Exception as e:
+ logger.error("Exception in LOC1469: %s" % e)
+ return e
+
+def verify_snigdhaos_pacman_conf():
+ try:
+ lines = None
+ snigdhaos_core_setup = False
+ snigdhaos_extra_setup = False
+ with open(pacman_conf, "r") as r:
+ lines = r.readlines()
+ if lines is not None:
+ for line in lines:
+ if snigdhaos_repo[0] in line.strip():
+ if "#" not in line.strip():
+ snigdhaos_core_setup = True
+ else:
+ return False
+
+ if snigdhaos_extra[0] in line.strip():
+ if "#" not in line.strip():
+ snigdhaos_extra_setup = True
+ else:
+ return False
+ if (
+ snigdhaos_core_setup is True
+ and snigdhaos_extra_setup is True
+ ):
+ return True
+ else:
+ return False
+ except Exception as e:
+ logger.error("Exception in LOC1604: %s" % e)
+
From 20db8f9cad445982ee8d83b48b1013a91f9b7c59 Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 18:08:38 +0530
Subject: [PATCH 11/22] #get_package_information has been fixed where functions
was not calling()
---
blackbox/Functions.py | 172 ++++++++++++++++++++++++++++--------------
1 file changed, 116 insertions(+), 56 deletions(-)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index 98c2863..0323acb 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -1084,14 +1084,14 @@ def get_package_files(package_name):
"Exception in LOC1161: %s" % e
)
+
+# NOTE : Fixed where functions were not mutable and uable to call.
def get_package_information(package_name):
- logger.info(
- "Fetching Package Information: %s" % package_name
- )
+ logger.info("Fetching Information: %s" % package_name)
try:
pkg_name = "Unknown"
pkg_version = "Unknown"
- pkg_repository = "Unknown / Pacman Misconfig!"
+ pkg_repository = "Unknown / pacman mirrorlist not configured"
pkg_description = "Unknown"
pkg_arch = "Unknown"
pkg_url = "Unknown"
@@ -1101,17 +1101,9 @@ def get_package_information(package_name):
pkg_installed_size = "Unknown"
pkg_build_date = "Unknown"
pkg_packager = "Unknown"
- pkg_metadata = {}
- query_local_cmd = [
- "pacman",
- "-Qi",
- package_name,
- ]
- query_remote_cmd = [
- "pacman",
- "-Si",
- package_name,
- ]
+ package_metadata = {}
+ query_local_cmd = ["pacman", "-Qi", package_name]
+ query_remote_cmd = ["pacman", "-Si", package_name]
process_query_remote = subprocess.run(
query_remote_cmd,
shell=False,
@@ -1120,59 +1112,127 @@ def get_package_information(package_name):
timeout=process_timeout,
)
if process_query_remote.returncode == 0:
- for line in process_query_remote.stdout.decode("UTF-8").splitlines():
- if "Name :" in line.strip():
+ for line in process_query_remote.stdout.decode("utf-8").splitlines():
+ if "Name :" in line.strip():
pkg_name = line.replace(" ", "").split("Name:")[1].strip()
- if "Version :" in line.strip():
+ if "Version :" in line.strip():
pkg_version = line.replace(" ", "").split("Version:")[1].strip()
- if "Repository :" in line.strip():
- pkg_repository = line.split("Repository:")[1].strip()
- if "Decription :" in line.strip():
- pkg_description = line.split("Decription:")[1].strip()
- if "Architecture :" in line.strip():
- pkg_arch = line.split("Architecture:")[1].strip()
- if "URL :" in line.strip():
- pkg_url = line.split("URL:")[1].strip()
- if "Depends On :" in line.strip():
- if line.split("Depends On :")[1].strip() != "None":
- pkg_depend_on_str = line.split("Depends On :")[1].strip()
- for pkg_dep in pkg_depend_on_str.split(" "):
+ if "Repository :" in line.strip():
+ pkg_repository = line.split("Repository :")[1].strip()
+ if "Description :" in line.strip():
+ pkg_description = line.split("Description :")[1].strip()
+ if "Architecture :" in line.strip():
+ pkg_arch = line.split("Architecture :")[1].strip()
+ if "URL :" in line.strip():
+ pkg_url = line.split("URL :")[1].strip()
+ if "Depends On :" in line.strip():
+ if line.split("Depends On :")[1].strip() != "None":
+ pkg_depends_on_str = line.split("Depends On :")[1].strip()
+ for pkg_dep in pkg_depends_on_str.split(" "):
pkg_depends_on.append((pkg_dep, None))
else:
pkg_depends_on = []
- if "Conflicts With :" in line.strip():
- if line.split("Conflicts With :")[1].strip() != "None":
- pkg_conflicts_with_str = line.split("Conflicts With :")[1].strip()
- for pkg_con in pkg_conflicts_with_str.split(" "):
+ if "Conflicts With :" in line.strip():
+ if line.split("Conflicts With :")[1].strip() != "None":
+ pkg_conflicts_with_str = line.split("Conflicts With :")[
+ 1
+ ].strip()
+ for pkg_con in pkg_conflicts_with_str.split(" "):
pkg_conflicts_with.append((pkg_con, None))
else:
pkg_conflicts_with = []
- if "Download Size :" in line.strip():
- pkg_download_size = line.split("Download Size:")[1].strip()
- if "Installed Size :" in line.strip():
- pkg_installed_size = line.split("Installed Size:")[1].strip()
- if "Build Date :" in line.strip():
- pkg_build_date = line.split("Build Date:")[1].strip()
+ if "Download Size :" in line.strip():
+ pkg_download_size = line.split("Download Size :")[1].strip()
+ if "Installed Size :" in line.strip():
+ pkg_installed_size = line.split("Installed Size :")[1].strip()
+ if "Build Date :" in line.strip():
+ pkg_build_date = line.split("Build Date :")[1].strip()
if "Packager :" in line.strip():
- pkg_packager = line.split("Packager:")[1].strip()
- pkg_metadata["name"] = pkg_name
- pkg_metadata["version"] = pkg_version
- pkg_metadata["repository"] = pkg_repository
- pkg_metadata["description"] = pkg_description
- pkg_metadata["arch"] = pkg_arch
- pkg_metadata["url"] = pkg_url
- pkg_metadata["depends_on"] = pkg_depends_on
- pkg_metadata["conflicts_with"] = pkg_conflicts_with
- pkg_metadata["download_size"] = pkg_download_size
- pkg_metadata["installed_size"] = pkg_installed_size
- pkg_metadata["build_date"] = pkg_build_date
- pkg_metadata["packager"] = pkg_packager
- return pkg_metadata
+ pkg_packager = line.split("Packager :")[1].strip()
+ package_metadata["name"] = pkg_name
+ package_metadata["version"] = pkg_version
+ package_metadata["repository"] = pkg_repository
+ package_metadata["description"] = pkg_description
+ package_metadata["arch"] = pkg_arch
+ package_metadata["url"] = pkg_url
+ package_metadata["depends_on"] = pkg_depends_on
+ package_metadata["conflicts_with"] = pkg_conflicts_with
+ package_metadata["download_size"] = pkg_download_size
+ package_metadata["installed_size"] = pkg_installed_size
+ package_metadata["build_date"] = pkg_build_date
+ package_metadata["packager"] = pkg_packager
+ return package_metadata
elif (
- "error: package '%s' not found!\n" % package_name in process_query_remote.stdout.decode("UTF-8")
+ "error: package '%s' was not found\n" % package_name
+ in process_query_remote.stdout.decode("utf-8")
):
- return "error: package '%s' not found!\n" % package_name
+ return "error: package '%s' was not found" % package_name
else:
+ process_query_local = subprocess.run(
+ query_local_cmd,
+ shell=False,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ timeout=process_timeout,
+ )
+ # NOTE: Added validation on process result
+ if process_query_local.returncode == 0:
+ for line in process_query_local.stdout.decode("utf-8").splitlines():
+ if "Name :" in line.strip():
+ pkg_name = line.replace(" ", "").split("Name:")[1].strip()
+ if "Version :" in line.strip():
+ pkg_version = line.replace(" ", "").split("Version:")[1].strip()
+ if "Repository :" in line.strip():
+ pkg_repository = line.split("Repository :")[1].strip()
+ if "Description :" in line.strip():
+ pkg_description = line.split("Description :")[1].strip()
+ if "Architecture :" in line.strip():
+ pkg_arch = line.split("Architecture :")[1].strip()
+ if "URL :" in line.strip():
+ pkg_url = line.split("URL :")[1].strip()
+ if "Depends On :" in line.strip():
+ if line.split("Depends On :")[1].strip() != "None":
+ pkg_depends_on_str = line.split("Depends On :")[
+ 1
+ ].strip()
+ for pkg_dep in pkg_depends_on_str.split(" "):
+ pkg_depends_on.append((pkg_dep, None))
+ else:
+ pkg_depends_on = []
+ if "Conflicts With :" in line.strip():
+ if line.split("Conflicts With :")[1].strip() != "None":
+ pkg_conflicts_with_str = line.split("Conflicts With :")[
+ 1
+ ].strip()
+ for pkg_con in pkg_conflicts_with_str.split(" "):
+ pkg_conflicts_with.append((pkg_con, None))
+ else:
+ pkg_conflicts_with = []
+ if "Download Size :" in line.strip():
+ pkg_download_size = line.split("Download Size :")[1].strip()
+ if "Installed Size :" in line.strip():
+ pkg_installed_size = line.split("Installed Size :")[1].strip()
+ if "Build Date :" in line.strip():
+ pkg_build_date = line.split("Build Date :")[1].strip()
+ if "Packager :" in line.strip():
+ pkg_packager = line.split("Packager :")[1].strip()
+ package_metadata["name"] = pkg_name
+ package_metadata["version"] = pkg_version
+ package_metadata["repository"] = pkg_repository
+ package_metadata["description"] = pkg_description
+ package_metadata["arch"] = pkg_arch
+ package_metadata["url"] = pkg_url
+ package_metadata["depends_on"] = pkg_depends_on
+ package_metadata["conflicts_with"] = pkg_conflicts_with
+ package_metadata["download_size"] = pkg_download_size
+ package_metadata["installed_size"] = pkg_installed_size
+ package_metadata["build_date"] = pkg_build_date
+ package_metadata["packager"] = pkg_packager
+ return package_metadata
+ else:
+ return None
+ except Exception as e:
+ logger.error("Exception in LOC1061: %s" % e)
# NOTE : ICON ON THE BACK
def get_current_installed():
From 0f8e07dd69f4311b434cdb9ab0f1e21091dd1d29 Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 18:09:40 +0530
Subject: [PATCH 12/22] #corrected modules, removed unnecessary
---
blackbox/Functions.py | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index 0323acb..e1ba464 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -1,25 +1,23 @@
#!/bin/python
import os
-from os import makedirs
import sys
import psutil
-import gi
+import time
+import datetime
+from datetime import datetime, timedelta
import subprocess
+import threading
+import gi
import logging
from logging.handlers import TimedRotatingFileHandler
-from threading import Thread
-import datetime
-from datetime import datetime
-from datetime import timedelta
-from datetime import time
import shutil
-import Functions as fn
-
-from Settings import Settings
+from threading import Thread
from Package import Package
+from Settings import Settings
from ui.MessageDialog import MessageDialog
-from ui.GUI import GUI
+from distro import id
+from os import makedirs
gi.require_version("Gtk" "3.0") # GTK 2.0 is dead!
from gi.repository import GLib, Gtk
From c69399d4096bd141f1adccb080bb819524d6e1e1 Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 18:11:19 +0530
Subject: [PATCH 13/22] # sorted modules
---
blackbox/Functions.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index e1ba464..a4cee10 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -1,14 +1,15 @@
#!/bin/python
import os
+from os import makedirs
import sys
import psutil
import time
import datetime
-from datetime import datetime, timedelta
+from datetime import datetime
+from datetime import timedelta
import subprocess
import threading
-import gi
import logging
from logging.handlers import TimedRotatingFileHandler
import shutil
@@ -17,8 +18,8 @@ from Package import Package
from Settings import Settings
from ui.MessageDialog import MessageDialog
from distro import id
-from os import makedirs
+import gi
gi.require_version("Gtk" "3.0") # GTK 2.0 is dead!
from gi.repository import GLib, Gtk
From 7bb06552a6773007dc2d4b0a14eb0983ad0ead4c Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 18:12:51 +0530
Subject: [PATCH 14/22] LOC84,
---
blackbox/Functions.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index a4cee10..4889747 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -80,7 +80,9 @@ def permissions(dst):
group = g.replace(")", "").strip() # NOTE: replace with nothing!
subprocess.call(["chown", "-R", sudo_username + ":" + group, dst], shell=False)
except Exception as e:
- logger.error(e)
+ logger.error(
+ "Exception occured in LOC68: %s" % e
+ )
# NOTE: Creating Log, Export and Config Directory:
try:
From f9032766daebcb46dc64cde5af2563324780682c Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 18:20:21 +0530
Subject: [PATCH 15/22] re organized some docs and referencing
---
blackbox/Functions.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index 4889747..19a1289 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -68,12 +68,14 @@ export_dir = "%s/blackbox-exports" % home
def permissions(dst):
try:
# NOTE : Use try-catch block so that we can trace any error!
+ # DOCS : https://docs.python.org/3/library/subprocess.html
groups = subprocess.run(
["sh", "-c", "id " + sudo_username],
shell=False,
- stdout=subprocess.PIPE, # NOTE: Standard Output
- stderr=subprocess.STDOUT, # NOTE: Standard Error Output
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
)
+ # DOCS : https://www.geeksforgeeks.org/python-strings-decode-method/
for i in groups.stdout.decode().split(" "):
if "gid" in i:
g = i.split("(")[1]
@@ -152,7 +154,7 @@ try:
logger.addHandler(tfh)
except Exception as e:
- print("[ERROR] Failed: %s" % e)
+ print("[ERROR] Exception in LOC109: %s" % e)
# NOTE : On app close create package file
def _on_close_create_package_file():
@@ -175,7 +177,7 @@ def _on_close_create_package_file():
for line in process.stdout:
f.write("%s" %line)
except Exception as e:
- logger.error("[ERROR] Exception: %s" % e)
+ logger.error("[ERROR] Exception in LOC158: %s" % e)
# NOTE: Global Functions
@@ -228,7 +230,7 @@ def sync_package_db():
return out
except Exception as e:
logger.error(
- "[ERROR] Exception: %s" % e
+ "[ERROR] Exception in LOC206: %s" % e
)
def sync_file_db():
@@ -257,7 +259,7 @@ def sync_file_db():
return out
except Exception as e:
logger.error(
- "[ERROR] Exception: %s" % e
+ "[ERROR] Exception in LOC234: %s" % e
)
# NOTE: Installation & Uninstallation Process
@@ -270,12 +272,12 @@ def start_subprocess(
widget
):
try:
+ # DOCS: https://www.knowledgehut.com/blog/programming/self-variabe-python-examples
self.switch_package_version.set_sensitive(False)
self.switch_snigdhaos_keyring.set_sensitive(False)
self.switch_snigdhaos_mirrorlist.set_sensitive(False)
-
+ # DOCS: https://irtfweb.ifa.hawaii.edu/SoftwareDocs/gtk20/gtk/gtkwidget.html
widget.set_sensitive(False)
-
process_stdout_lst = []
process_stdout_lst.append(
"Command = %s\n\n" % " ".join(cmd)
From 9db7fd6c6f96b48cb43fd46a97ea08eb51e1a9ca Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 18:27:13 +0530
Subject: [PATCH 16/22] add more references
---
blackbox/Functions.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index 19a1289..ba87960 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -1,7 +1,7 @@
#!/bin/python
import os
-from os import makedirs
+from os import makedirs # DOCS : https://docs.python.org/3/library/os.html#os.makedirs
import sys
import psutil
import time
@@ -10,7 +10,7 @@ from datetime import datetime
from datetime import timedelta
import subprocess
import threading
-import logging
+import logging # DOCS: https://docs.python.org/3/library/logging.html
from logging.handlers import TimedRotatingFileHandler
import shutil
from threading import Thread
@@ -87,21 +87,20 @@ def permissions(dst):
)
# NOTE: Creating Log, Export and Config Directory:
+# DOCS : https://python.land/deep-dives/python-try-except
try:
+ # DOCS : https://docs.python.org/3/library/os.path.html
if not os.path.exists(log_dir):
makedirs(log_dir)
if not os.path.exists(export_dir):
makedirs(export_dir)
if not os.path.exists(config_dir):
makedirs(config_dir)
-
permissions(export_dir)
permissions(config_dir)
-
print("[INFO] Log Directory: %s" % log_dir)
print("[INFO] Export Directory: %s" % export_dir)
print("[INFO] Config Directory: %s" % config_dir)
-
except os.error as oserror:
print("[ERROR] Exception: %s" % oserror)
sys.exit(1)
From f56f3c9010e445c0dcbae986b6d02def2a166710 Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 18:29:54 +0530
Subject: [PATCH 17/22] add references
---
blackbox/Functions.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index ba87960..8b2e821 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -10,14 +10,14 @@ from datetime import datetime
from datetime import timedelta
import subprocess
import threading
-import logging # DOCS: https://docs.python.org/3/library/logging.html
-from logging.handlers import TimedRotatingFileHandler
+import logging # DOCS : https://docs.python.org/3/library/logging.html
+from logging.handlers import TimedRotatingFileHandler # DOCS : https://docs.python.org/3/library/logging.handlers.html#timedrotatingfilehandler
import shutil
from threading import Thread
from Package import Package
from Settings import Settings
from ui.MessageDialog import MessageDialog
-from distro import id
+from distro import id # DOCS : https://github.com/python-distro/distro
import gi
gi.require_version("Gtk" "3.0") # GTK 2.0 is dead!
From 7613c4210f66734464e4b38e60b9ec47f44cc682 Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 18:32:28 +0530
Subject: [PATCH 18/22] create space for neces.
---
blackbox/Functions.py | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index 8b2e821..67088d5 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -271,11 +271,11 @@ def start_subprocess(
widget
):
try:
- # DOCS: https://www.knowledgehut.com/blog/programming/self-variabe-python-examples
+ # DOCS : https://www.knowledgehut.com/blog/programming/self-variabe-python-examples
self.switch_package_version.set_sensitive(False)
self.switch_snigdhaos_keyring.set_sensitive(False)
self.switch_snigdhaos_mirrorlist.set_sensitive(False)
- # DOCS: https://irtfweb.ifa.hawaii.edu/SoftwareDocs/gtk20/gtk/gtkwidget.html
+ # DOCS : https://irtfweb.ifa.hawaii.edu/SoftwareDocs/gtk20/gtk/gtkwidget.html
widget.set_sensitive(False)
process_stdout_lst = []
process_stdout_lst.append(
@@ -297,7 +297,7 @@ def start_subprocess(
line = (
"Pacman Processing: %s Package: %s \n\n Command: %s\n\n" % (action, pkg.name, " ".join(cmd))
)
- # DOC: https://docs.gtk.org/glib/const.PRIORITY_DEFAULT.html
+ # DOCS : https://docs.gtk.org/glib/const.PRIORITY_DEFAULT.html
GLib.idle_add(
update_progress_textview,
self,
@@ -405,15 +405,15 @@ def refresh_ui(
if content is not None:
for widget in content.get_children():
content.remove(widget)
- # DOCS: https://docs.gtk.org/gtk3/class.Label.html
+ # DOCS : https://docs.gtk.org/gtk3/class.Label.html
lbl_install = Gtk.Label(xalign=0, yalign=0)
- # DOCS: https://stackoverflow.com/questions/40072104/multi-color-text-in-one-gtk-label
+ # DOCS : https://stackoverflow.com/questions/40072104/multi-color-text-in-one-gtk-label
lbl_install.set_markup(
"Package %s installed." % pkg.name
)
content.add(lbl_install)
if self.timeout_id is not None:
- # DOCS: https://gtk-rs.org/gtk-rs-core/stable/0.14/docs/glib/source/fn.source_remove.html
+ # DOCS : https://gtk-rs.org/gtk-rs-core/stable/0.14/docs/glib/source/fn.source_remove.html
GLib.source_remove(self.timeout_id)
self.timeout_id = None
self.timeout_id = GLib.timeout_add(
@@ -441,7 +441,7 @@ def refresh_ui(
)
content.add(lbl_install)
if self.timeout_id is not None:
- # DOCS: https://gtk-rs.org/gtk-rs-core/stable/0.14/docs/glib/source/fn.source_remove.html
+ # DOCS : https://gtk-rs.org/gtk-rs-core/stable/0.14/docs/glib/source/fn.source_remove.html
GLib.source_remove(self.timeout_id)
self.timeout_id = None
self.timeout_id = GLib.timeout_add(
@@ -464,7 +464,7 @@ def refresh_ui(
result = message_dialog.run()
message_dialog.destroy()
elif progress_dialog is None or progress_dialog.pkg_dialog_closed is True:
- # DOCS: https://bbs.archlinux.org/viewtopic.php?id=48234
+ # DOCS : https://bbs.archlinux.org/viewtopic.php?id=48234
if (
"error: failed to init transaction (unable to lock database)\n" in process_stdout_lst
):
@@ -550,13 +550,13 @@ def refresh_ui(
for widget in content.get_children():
content.remove(widget)
lbl_install = Gtk.Label(xalign=0, yalign=0)
- # DOCS: https://stackoverflow.com/questions/40072104/multi-color-text-in-one-gtk-label
+ # DOCS : https://stackoverflow.com/questions/40072104/multi-color-text-in-one-gtk-label
lbl_install.set_markup(
"Package %s installed." % pkg.name
)
content.add(lbl_install)
if self.timeout_id is not None:
- # DOCS: https://gtk-rs.org/gtk-rs-core/stable/0.14/docs/glib/source/fn.source_remove.html
+ # DOCS : https://gtk-rs.org/gtk-rs-core/stable/0.14/docs/glib/source/fn.source_remove.html
GLib.source_remove(self.timeout_id)
self.timeout_id = None
self.timeout_id = GLib.timeout_add(
@@ -581,13 +581,13 @@ def refresh_ui(
for widget in content.get_children():
content.remove(widget)
lbl_install = Gtk.Label(xalign=0, yalign=0)
- # DOCS: https://stackoverflow.com/questions/40072104/multi-color-text-in-one-gtk-label
+ # DOCS : https://stackoverflow.com/questions/40072104/multi-color-text-in-one-gtk-label
lbl_install.set_markup(
"Package %s uninstallation failed!" % pkg.name
)
content.add(lbl_install)
if self.timeout_id is not None:
- # DOCS: https://gtk-rs.org/gtk-rs-core/stable/0.14/docs/glib/source/fn.source_remove.html
+ # DOCS : https://gtk-rs.org/gtk-rs-core/stable/0.14/docs/glib/source/fn.source_remove.html
GLib.source_remove(self.timeout_id)
self.timeout_id = None
self.timeout_id = GLib.timeout_add(
@@ -635,11 +635,11 @@ def update_progress_textview(
and self.in_progress is True
):
buffer = progress_dialog.package_progress_textview.get_buffer()
- # Docs: https://docs.python.org/3/library/asyncio-protocol.html#buffered-streaming-protocols
+ # DOCS : https://docs.python.org/3/library/asyncio-protocol.html#buffered-streaming-protocols
if len(line) > 0 or buffer is None:
buffer.insert(buffer.get_end_iter(), "%s" % line, len("%s" % line))
text_mark_end = buffer.create_mark("\nend", buffer.get_end_iter(), False)
- # DOCS: https://lazka.github.io/pgi-docs/#Gtk-4.0/classes/TextView.html#Gtk.TextView.scroll_mark_onscreen
+ # DOCS : https://lazka.github.io/pgi-docs/#Gtk-4.0/classes/TextView.html#Gtk.TextView.scroll_mark_onscreen
progress_dialog.package_progress_textview.scroll_mark_onscreen(
text_mark_end
)
From 83834d35488f5e50a797b5c832a87fd45abfdc12 Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 18:42:11 +0530
Subject: [PATCH 19/22] cleanup for extra lines, enhanced docs references!
---
blackbox/Functions.py | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/blackbox/Functions.py b/blackbox/Functions.py
index 67088d5..05477eb 100644
--- a/blackbox/Functions.py
+++ b/blackbox/Functions.py
@@ -7,7 +7,7 @@ import psutil
import time
import datetime
from datetime import datetime
-from datetime import timedelta
+from datetime import timedelta # DOCS : https://www.freecodecamp.org/news/how-to-use-timedelta-objects-in-python/
import subprocess
import threading
import logging # DOCS : https://docs.python.org/3/library/logging.html
@@ -19,8 +19,8 @@ from Settings import Settings
from ui.MessageDialog import MessageDialog
from distro import id # DOCS : https://github.com/python-distro/distro
-import gi
-gi.require_version("Gtk" "3.0") # GTK 2.0 is dead!
+import gi # DOCS : https://askubuntu.com/questions/80448/what-would-cause-the-gi-module-to-be-missing-from-python
+gi.require_version("Gtk" "3.0")
from gi.repository import GLib, Gtk
# NOTE: Base Directory
@@ -91,7 +91,7 @@ def permissions(dst):
try:
# DOCS : https://docs.python.org/3/library/os.path.html
if not os.path.exists(log_dir):
- makedirs(log_dir)
+ makedirs(log_dir) # REF : LOC 4
if not os.path.exists(export_dir):
makedirs(export_dir)
if not os.path.exists(config_dir):
@@ -101,6 +101,7 @@ try:
print("[INFO] Log Directory: %s" % log_dir)
print("[INFO] Export Directory: %s" % export_dir)
print("[INFO] Config Directory: %s" % config_dir)
+# DOCS : https://www.geeksforgeeks.org/handling-oserror-exception-in-python/
except os.error as oserror:
print("[ERROR] Exception: %s" % oserror)
sys.exit(1)
@@ -139,22 +140,17 @@ try:
logger.setLevel(logging.INFO)
ch.setLevel(logging.INFO)
tfh.setLevel(level=logging.INFO)
- # NOTE: Docs -> https://docs.python.org/3/library/logging.handlers.html#timedrotatingfilehandler
+ # DOCS : https://docs.python.org/3/library/logging.handlers.html#timedrotatingfilehandler
formatter = logging.Formatter(
"%(asctime)s:%(levelname)s > %(message)s",
"%Y-%m-%d %H:%M:%S"
)
- # NOTE : Call formatter to ch & tfh
ch.setFormatter(formatter)
tfh.setFormatter(formatter)
- # NOTE: Append ch to logger
logger.addHandler(ch)
- # NOTE: Append File Handler to logger
logger.addHandler(tfh)
-
except Exception as e:
print("[ERROR] Exception in LOC109: %s" % e)
-
# NOTE : On app close create package file
def _on_close_create_package_file():
try:
@@ -179,7 +175,6 @@ def _on_close_create_package_file():
logger.error("[ERROR] Exception in LOC158: %s" % e)
# NOTE: Global Functions
-
def _get_position(lists, value):
data = [
string for string in lists if value in string
@@ -418,7 +413,7 @@ def refresh_ui(
self.timeout_id = None
self.timeout_id = GLib.timeout_add(
100,
- reveal_infobar,
+ reveal_infobar, # LOC : 618
self,
progress_dialog,
)
From b1f0a8a2696b3f8017ca3fd74464083f67730171 Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 18:50:51 +0530
Subject: [PATCH 20/22] re organized #About?
---
blackbox/ui/AboutDialog.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/blackbox/ui/AboutDialog.py b/blackbox/ui/AboutDialog.py
index 3c7d7b9..788ac5c 100644
--- a/blackbox/ui/AboutDialog.py
+++ b/blackbox/ui/AboutDialog.py
@@ -1,16 +1,15 @@
+#!/bin/python
+
# This class stores static information about the app, and is displayed in the about dialog
+
import os
+
import gi
-
from gi.repository import Gtk, Gdk, GdkPixbuf, Pango, GLib
-
gi.require_version("Gtk", "3.0")
base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
-# base_dir = os.path.dirname(os.path.realpath(__file__))
-
-
class AboutDialog(Gtk.Dialog):
def __init__(self):
Gtk.Dialog.__init__(self)
@@ -21,7 +20,7 @@ class AboutDialog(Gtk.Dialog):
app_secondary_message = "Install or remove software"
app_secondary_description = "Report issues to make it even better"
app_version = "pkgversion-pkgrelease"
- app_discord = "https://discord.gg/stBhS4taje"
+ app_discord = "#"
app_website = "https://snigdhaos.org"
app_github = "https://github.com/Snigdha-OS/snigdhaos-blackbox"
app_authors = []
From c1234a93e990d3fb1e5d6b8f34f6df484c080949 Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 18:52:36 +0530
Subject: [PATCH 21/22] removed extralines
---
blackbox/ui/AppFrameGUI.py | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/blackbox/ui/AppFrameGUI.py b/blackbox/ui/AppFrameGUI.py
index c67d9d3..0a00c4a 100644
--- a/blackbox/ui/AppFrameGUI.py
+++ b/blackbox/ui/AppFrameGUI.py
@@ -1,9 +1,9 @@
#!/bin/python
+
from socket import TIPC_ADDR_NAME
from urllib.parse import scheme_chars
import Functions as fn
-
class AppFrameGUI:
def build_ui_frame(self, Gtk, vbox_stack, category, packages_list):
try:
@@ -51,23 +51,16 @@ class AppFrameGUI:
"""
Store a list of unique sub-categories
e.g.
-
- category --> applications
+ category --> applications
sub category --> Accessories
sub category --> Conky
-
"""
-
sub_catlabels = []
-
# store unique subcategory names into a dictionary
-
for package in packages_list:
subcats[package.subcategory] = package
-
# we now iterate across the dictionary keys
# each Stack has an associated subcategory
-
for subcat in subcats.keys():
vbox_stacks.append(
Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
@@ -77,7 +70,6 @@ class AppFrameGUI:
vbox_stacknames.append(subcat)
# iterate across a list of packages
-
for package in packages_list:
if package.subcategory == subcat:
page = vbox_stacks.pop()
@@ -100,7 +92,6 @@ class AppFrameGUI:
page.pack_start(lbl_padding_page1, False, False, 0)
grid = Gtk.Grid()
-
grid.insert_row(index)
lbl_sep1 = Gtk.Label(xalign=0, yalign=0)
@@ -123,7 +114,6 @@ class AppFrameGUI:
Changing the switch using set_active(bool), and using the signal notify::active
caused a never-ending loop which would call app_toggle.
-
"""
switch.set_state(fn.query_pkg(package.name))
switch.connect(
@@ -133,7 +123,6 @@ class AppFrameGUI:
)
# add switch widget to grid
-
# attach_next_to(child, sibling, side, width, height)
grid.attach_next_to(
@@ -141,7 +130,6 @@ class AppFrameGUI:
)
# add space seperator next to switch
-
lbl_sep_switch = Gtk.Label(xalign=0, yalign=0)
lbl_sep_switch.set_text(sep_text)
@@ -150,7 +138,6 @@ class AppFrameGUI:
)
###### switch widget ends ######
-
###### pkg name label widget starts ######
lbl_sep_package1 = Gtk.Label(xalign=0, yalign=0)
From 561b1b01598c69b029f63ca7dcf6822881cd5355 Mon Sep 17 00:00:00 2001
From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com>
Date: Wed, 24 Apr 2024 18:55:29 +0530
Subject: [PATCH 22/22] typo fixed
---
blackbox/ui/GUI.py | 29 ++++++-----------------------
1 file changed, 6 insertions(+), 23 deletions(-)
diff --git a/blackbox/ui/GUI.py b/blackbox/ui/GUI.py
index 955cb98..25e3b6a 100644
--- a/blackbox/ui/GUI.py
+++ b/blackbox/ui/GUI.py
@@ -1,7 +1,5 @@
#!/bin/python
-# NOTE : We apply python system wide !
-
import Functions as fn
from ui.AppFrameGUI import AppFrameGUI
from multiprocessing import cpu_count
@@ -9,8 +7,6 @@ from queue import Queue
from threading import Thread
base_dir = fn.os.path.abspath(fn.os.path.join(fn.os.path.dirname(__file__), ".."))
-# base_dir = fn.os.path.dirname(fn.os.path.realpath(__file__))
-
class GUI_Worker(Thread):
def __init__(self, queue):
@@ -21,14 +17,10 @@ class GUI_Worker(Thread):
while True:
# pull what we need from the queue so we can process properly.
items = self.queue.get()
-
try:
# make sure we have the required number of items on the queue
if items is not None:
- # self, Gtk, vboxStack1, category, package_file = items
-
self, Gtk, vbox_stack, category, packages = items
-
AppFrameGUI.build_ui_frame(
self,
Gtk,
@@ -38,7 +30,7 @@ class GUI_Worker(Thread):
)
except Exception as e:
- fn.logger.error("Exception in GUI_Worker(): %s" % e)
+ fn.logger.error("Exception in LOC11: %s" % e)
finally:
if items is None:
fn.logger.debug("Stopping GUI Worker thread")
@@ -46,7 +38,6 @@ class GUI_Worker(Thread):
return False
self.queue.task_done()
-
class GUI:
def setup_gui_search(
self,
@@ -70,16 +61,8 @@ class GUI:
# lets quickly create the latest installed list.
fn.get_current_installed()
- # =======================================================
- # HeaderBar
- # =======================================================
-
setup_headerbar(self, Gtk, settings)
- # =======================================================
- # App Notifications
- # =======================================================
-
hbox0 = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=10)
self.notification_revealer = Gtk.Revealer()
@@ -113,7 +96,7 @@ class GUI:
# PREP WORK
# ==========================================================
- # This section sets up the tabs, and the array for dealing with the tab content
+
# ==========================================================
# GENERATE STACK
@@ -190,7 +173,7 @@ class GUI:
ivbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=10)
pixbuf = GdkPixbuf.Pixbuf().new_from_file_at_size(
- os.path.join(base_dir, "images/sofirem.png"), 45, 45
+ os.path.join(base_dir, "images/blackbox.png"), 45, 45
)
image = Gtk.Image().new_from_pixbuf(pixbuf)
@@ -399,7 +382,7 @@ class GUI:
ivbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=10)
pixbuf = GdkPixbuf.Pixbuf().new_from_file_at_size(
- os.path.join(base_dir, "images/sofirem.png"), 45, 45
+ os.path.join(base_dir, "images/blackbox.png"), 45, 45
)
image = Gtk.Image().new_from_pixbuf(pixbuf)
@@ -465,7 +448,7 @@ class GUI:
# setup headerbar including popover settings
def setup_headerbar(self, Gtk, settings):
try:
- header_bar_title = "Sofirem"
+ header_bar_title = "BlackBox"
headerbar = Gtk.HeaderBar()
headerbar.set_title(header_bar_title)
headerbar.set_show_close_button(True)
@@ -573,7 +556,7 @@ def setup_headerbar(self, Gtk, settings):
modelbtn_about_app.connect("clicked", self.on_about_app_clicked)
modelbtn_about_app.set_name("modelbtn_popover")
modelbtn_about_app.props.centered = False
- modelbtn_about_app.props.text = "About Sofirem"
+ modelbtn_about_app.props.text = "About BlackBox"
# button to show iso package lists window
# modelbtn_iso_packages_list = Gtk.ModelButton()