applications/kernel-manager
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dev comparison

Browse source
This commit is contained in:
Erik Dubois 2024-09-01 08:06:11 +02:00
parent 14531bc829
commit 53bba1daba
3 changed files with 90 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

51
usr/share/archlinux-kernel-manager/libs/functions.py
View file

@ -450,7 +450,8 @@ def install_archive_kernel(self):
wait_for_pacman_process() wait_for_pacman_process()
logger.info("Running %s" % install_cmd_str) if logger.getEffectiveLevel() == 10:
logger.debug("Running %s" % install_cmd_str)
event = "%s [INFO]: Running %s\n" % ( event = "%s [INFO]: Running %s\n" % (
datetime.datetime.now().strftime("%Y-%m-%d-%H-%M-%S"), datetime.datetime.now().strftime("%Y-%m-%d-%H-%M-%S"),
@ -550,8 +551,11 @@ def install_archive_kernel(self):
def refresh_cache(self): def refresh_cache(self):
cached_kernels_list.clear()
if os.path.exists(cache_file): if os.path.exists(cache_file):
os.remove(cache_file) os.remove(cache_file)
get_official_kernels(self) get_official_kernels(self)
write_cache() write_cache()
@ -559,6 +563,7 @@ def refresh_cache(self):
def read_cache(self): def read_cache(self):
try: try:
self.timestamp = None self.timestamp = None
with open(cache_file, "rb") as f: with open(cache_file, "rb") as f:
data = tomlkit.load(f) data = tomlkit.load(f)
@ -762,7 +767,11 @@ def get_response(session, linux_kernel, response_queue, response_content):
) )
if response.status_code == 200: if response.status_code == 200:
logger.debug("Response is 200") if logger.getEffectiveLevel() == 10:
logger.debug(
"Response code for %s/packages/l/%s = 200 (OK)"
% (archlinux_mirror_archive_url, linux_kernel)
)
if response.text is not None: if response.text is not None:
response_content[linux_kernel] = response.text response_content[linux_kernel] = response.text
response_queue.put(response_content) response_queue.put(response_content)
@ -805,6 +814,8 @@ def get_official_kernels(self):
write_cache() write_cache()
read_cache(self) read_cache(self)
# self.queue_kernels = Queue()
self.queue_kernels.put(cached_kernels_list) self.queue_kernels.put(cached_kernels_list)
else: else:
@ -846,7 +857,10 @@ def is_thread_alive(thread_name):
# print all threads # print all threads
def print_all_threads(): def print_all_threads():
for thread in threading.enumerate(): for thread in threading.enumerate():
logger.info("Thread = %s and state is %s" % (thread.name, thread.is_alive())) if logger.getEffectiveLevel() == 10:
logger.debug(
"Thread = %s and state is %s" % (thread.name, thread.is_alive())
)
# ===================================================== # =====================================================
@ -900,7 +914,9 @@ def check_kernel_installed(name):
try: try:
logger.info("Checking kernel package %s is installed" % name) logger.info("Checking kernel package %s is installed" % name)
check_cmd_str = ["pacman", "-Q", name] check_cmd_str = ["pacman", "-Q", name]
logger.debug("Running cmd = %s" % check_cmd_str) if logger.getEffectiveLevel() == 10:
logger.debug("Running cmd = %s" % check_cmd_str)
process_kernel_query = subprocess.Popen( process_kernel_query = subprocess.Popen(
check_cmd_str, check_cmd_str,
shell=False, shell=False,
@ -983,8 +999,6 @@ def uninstall(self):
wait_for_pacman_process() wait_for_pacman_process()
logger.info("Running %s" % uninstall_cmd_str)
event = "%s [INFO]: Running %s\n" % ( event = "%s [INFO]: Running %s\n" % (
datetime.datetime.now().strftime("%Y-%m-%d-%H-%M-%S"), datetime.datetime.now().strftime("%Y-%m-%d-%H-%M-%S"),
" ".join(uninstall_cmd_str), " ".join(uninstall_cmd_str),
@ -1180,8 +1194,8 @@ def install_community_kernel(self):
"--noconfirm", "--noconfirm",
"--needed", "--needed",
] ]
if logger.getEffectiveLevel() == 10:
logger.info("Running %s" % install_cmd_str) logger.debug("Running %s" % install_cmd_str)
event = "%s [INFO]: Running %s\n" % ( event = "%s [INFO]: Running %s\n" % (
datetime.datetime.now().strftime("%Y-%m-%d-%H-%M-%S"), datetime.datetime.now().strftime("%Y-%m-%d-%H-%M-%S"),
@ -1479,6 +1493,9 @@ def sync_package_db():
out, err = process.communicate(timeout=600) out, err = process.communicate(timeout=600)
if logger.getEffectiveLevel() == 10:
print(out.decode("utf-8"))
if process.returncode == 0: if process.returncode == 0:
return None return None
else: else:
@ -1492,7 +1509,9 @@ def get_boot_loader():
try: try:
logger.info("Getting bootloader") logger.info("Getting bootloader")
cmd = ["bootctl", "status"] cmd = ["bootctl", "status"]
logger.debug("Running %s" % " ".join(cmd)) if logger.getEffectiveLevel() == 10:
logger.debug("Running %s" % " ".join(cmd))
process = subprocess.run( process = subprocess.run(
cmd, cmd,
shell=False, shell=False,
@ -1550,7 +1569,9 @@ def get_kernel_modules_version(kernel, db):
# pacman_kernel_version = None # pacman_kernel_version = None
kernel_modules_path = None kernel_modules_path = None
try: try:
logger.debug("Running %s" % " ".join(cmd)) if logger.getEffectiveLevel() == 10:
logger.debug("Running %s" % " ".join(cmd))
process = subprocess.run( process = subprocess.run(
cmd, cmd,
shell=False, shell=False,
@ -1581,13 +1602,15 @@ def get_kernel_modules_version(kernel, db):
return None return None
except Exception as e: except Exception as e:
logger.error("Exception in get_kernel_version(): %s" % e) logger.error("Exception in get_kernel_modules_version(): %s" % e)
def run_process(self): def run_process(self):
error = False error = False
self.stdout_lines = [] self.stdout_lines = []
logger.debug("Running process = %s" % " ".join(self.cmd)) if logger.getEffectiveLevel() == 10:
logger.debug("Running process = %s" % " ".join(self.cmd))
event = "%s [INFO]: Running %s\n" % ( event = "%s [INFO]: Running %s\n" % (
datetime.datetime.now().strftime("%Y-%m-%d-%H-%M-%S"), datetime.datetime.now().strftime("%Y-%m-%d-%H-%M-%S"),
" ".join(self.cmd), " ".join(self.cmd),
@ -1829,7 +1852,9 @@ def update_bootloader(self):
if cmd is not None: if cmd is not None:
self.stdout_lines = [] self.stdout_lines = []
logger.info("Running %s" % " ".join(cmd)) if logger.getEffectiveLevel() == 10:
logger.debug("Running %s" % " ".join(cmd))
with subprocess.Popen( with subprocess.Popen(
cmd, cmd,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,

70
usr/share/archlinux-kernel-manager/ui/ManagerGUI.py
View file

@ -316,15 +316,29 @@ class ManagerGUI(Gtk.ApplicationWindow):
# keep splash screen open, until main gui is loaded # keep splash screen open, until main gui is loaded
def wait_for_gui_load(self): def wait_for_gui_load(self):
while True: while True:
if fn.logger.getEffectiveLevel() == 10:
fn.logger.debug("Waiting for GUI to load ..")
# fn.time.sleep(0.2) # fn.time.sleep(0.2)
status = self.queue_load_progress.get() status = self.queue_load_progress.get()
try:
if status == 1: if fn.logger.getEffectiveLevel() == 10:
GLib.idle_add( fn.logger.debug("Status = %s" % status)
self.splash_screen.destroy,
priority=GLib.PRIORITY_DEFAULT, if status == 1:
) if fn.logger.getEffectiveLevel() == 10:
break fn.logger.debug("Destroying splashscreen")
GLib.idle_add(
self.splash_screen.destroy,
priority=GLib.PRIORITY_DEFAULT,
)
break
except Exception as e:
fn.logger.error("Exception in wait_for_gui_load(): %s" % e)
finally:
self.queue_load_progress.task_done()
def on_settings(self, action, param, fn): def on_settings(self, action, param, fn):
self.open_settings(fn) self.open_settings(fn)
@ -342,7 +356,8 @@ class ManagerGUI(Gtk.ApplicationWindow):
).start() ).start()
def refresh_ui(self): def refresh_ui(self):
fn.logger.debug("Refreshing UI") if fn.logger.getEffectiveLevel() == 10:
fn.logger.debug("Refreshing UI")
self.label_notify_revealer.set_text("Refreshing UI started") self.label_notify_revealer.set_text("Refreshing UI started")
GLib.idle_add( GLib.idle_add(
@ -366,8 +381,8 @@ class ManagerGUI(Gtk.ApplicationWindow):
if self.pacman_db_sync() is False: if self.pacman_db_sync() is False:
fn.logger.error("Pacman DB synchronization failed") fn.logger.error("Pacman DB synchronization failed")
else: else:
if fn.logger.getEffectiveLevel() == 10:
fn.logger.debug("Adding community kernels to UI") fn.logger.debug("Adding community kernels to UI")
try: try:
thread_get_community_kernels = fn.Thread( thread_get_community_kernels = fn.Thread(
@ -424,12 +439,14 @@ class ManagerGUI(Gtk.ApplicationWindow):
) )
while self.default_context.pending(): while self.default_context.pending():
if fn.logger.getEffectiveLevel() == 10:
fn.logger.debug("Waiting for UI loop")
fn.time.sleep(0.3) fn.time.sleep(0.3)
self.default_context.iteration(False) self.default_context.iteration(False)
# fn.time.sleep(0.5) # fn.time.sleep(0.5)
if fn.logger.getEffectiveLevel() == 10:
fn.logger.debug("Refresh UI completed") fn.logger.debug("Refresh UI completed")
self.label_notify_revealer.set_text("Refreshing UI completed") self.label_notify_revealer.set_text("Refreshing UI completed")
GLib.idle_add( GLib.idle_add(
@ -446,6 +463,7 @@ class ManagerGUI(Gtk.ApplicationWindow):
fn.logger.info("Application quit") fn.logger.info("Application quit")
def load_kernels_gui(self): def load_kernels_gui(self):
self.queue_load_progress.put(0)
hbox_sep = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=10) hbox_sep = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=10)
hsep = Gtk.Separator(orientation=Gtk.Orientation.VERTICAL) hsep = Gtk.Separator(orientation=Gtk.Orientation.VERTICAL)
hbox_sep.append(hsep) hbox_sep.append(hsep)
@ -453,6 +471,7 @@ class ManagerGUI(Gtk.ApplicationWindow):
# handle error here with message # handle error here with message
if self.official_kernels is None: if self.official_kernels is None:
fn.logger.error("Failed to retrieve kernel list") fn.logger.error("Failed to retrieve kernel list")
self.queue_load_progress.put(1)
stack_sidebar = Gtk.StackSidebar() stack_sidebar = Gtk.StackSidebar()
stack_sidebar.set_name("stack_sidebar") stack_sidebar.set_name("stack_sidebar")
@ -497,8 +516,10 @@ class ManagerGUI(Gtk.ApplicationWindow):
fn.logger.info("Creating kernel UI") fn.logger.info("Creating kernel UI")
# add official kernel flowbox # add official kernel flowbox
if fn.logger.getEffectiveLevel() == 10:
fn.logger.debug("Adding official kernels to UI")
fn.logger.debug("Adding official kernels to UI") self.queue_load_progress.put(0)
self.kernel_stack.add_official_kernels_to_stack(reload=False) self.kernel_stack.add_official_kernels_to_stack(reload=False)
@ -509,9 +530,10 @@ class ManagerGUI(Gtk.ApplicationWindow):
if self.pacman_db_sync() is False: if self.pacman_db_sync() is False:
fn.logger.error("Pacman DB synchronization failed") fn.logger.error("Pacman DB synchronization failed")
else:
fn.logger.debug("Adding community kernels to UI") else:
if fn.logger.getEffectiveLevel() == 10:
fn.logger.debug("Adding community kernels to UI")
try: try:
thread_get_community_kernels = fn.Thread( thread_get_community_kernels = fn.Thread(
@ -531,13 +553,21 @@ class ManagerGUI(Gtk.ApplicationWindow):
self.kernel_stack.add_community_kernels_to_stack(reload=False) self.kernel_stack.add_community_kernels_to_stack(reload=False)
while self.default_context.pending(): if fn.logger.getEffectiveLevel() == 10:
fn.logger.debug("Sending signal to destroy splashscreen")
self.default_context.iteration(True)
fn.time.sleep(0.3)
# signal to destroy splash screen
self.queue_load_progress.put(1) self.queue_load_progress.put(1)
fn.logger.debug("Adding installed kernels to UI") if fn.logger.getEffectiveLevel() == 10:
fn.logger.debug("Adding installed kernels to UI")
self.kernel_stack.add_installed_kernels_to_stack(reload=False) self.kernel_stack.add_installed_kernels_to_stack(reload=False)
fn.logger.info("Application started")
# while self.default_context.pending():
# if fn.logger.getEffectiveLevel() == 10:
# fn.logger.debug("Waiting for UI loop")
# self.default_context.iteration(False)
# fn.time.sleep(0.3)

11
usr/share/archlinux-kernel-manager/ui/SettingsWindow.py
View file

@ -600,12 +600,13 @@ class SettingsWindow(Gtk.Window):
while True: while True:
if len(fn.fetched_kernels_dict) > 0: if len(fn.fetched_kernels_dict) > 0:
self.manager_gui.official_kernels = self.queue_kernels.get() self.manager_gui.official_kernels = self.queue_kernels.get()
self.queue_kernels.task_done() self.queue_kernels.task_done()
self.refreshed = True self.refreshed = True
if self.manager_gui.official_kernels is not None: if self.manager_gui.official_kernels is not None:
switch.set_sensitive(False) switch.set_sensitive(False)
self.update_official_list() self.update_official_list()
self.update_community_list()
self.update_timestamp() self.update_timestamp()
self.label_cache_update_status.set_markup( self.label_cache_update_status.set_markup(
"<b>Cache refresh completed</b>" "<b>Cache refresh completed</b>"
@ -667,14 +668,6 @@ class SettingsWindow(Gtk.Window):
True, True,
) )
def update_community_list(self):
self.manager_gui.installed_kernels = fn.get_installed_kernels()
GLib.idle_add(
self.manager_gui.kernel_stack.add_community_kernels_to_stack,
True,
)
def on_close_clicked(self, widget): def on_close_clicked(self, widget):
self.destroy() self.destroy()