rewrite the print statements in a more concise and professional wayv6.2403.0

1 files changed, 65 insertions, 77 deletions

diff --git a/src/backend/instpkgsrc.py b/src/backend/instpkgsrc.py
index 26e5132..68f10b3 100644
--- a/src/backend/instpkgsrc.py
+++ b/src/backend/instpkgsrc.py
@@ -49,8 +49,7 @@ signal.signal(signal.SIGINT, sigint_handler)
 
 def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
     if not sisyphus.checkenv.root():
-        print(sisyphus.getclr.bright_red +
-              "\nYou need root permissions to do this!\n" + sisyphus.getclr.reset)
+        print(f"{sisyphus.getclr.bright_red}\nRoot permissions are required for this operation.\n{sisyphus.getclr.reset}")
         sys.exit()
     else:
         if gfx_ui:
@@ -92,38 +91,29 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
                 p_exe.kill()
             sys.exit()
         if gfx_ui:
-            print("\nCannot proceed!\n")
-            print(
-                "Apply the above changes to your portage configuration files and try again!")
-
+            print("\nCannot proceed!\nPlease apply the above changes to your portage configuration files and try again.")
             for i in range(9, 0, -1):
                 print(f"Killing application in : {i} seconds!")
                 time.sleep(1)
 
             sys.exit(app.exec_())  # kill GUI window
         else:
-            print(sisyphus.getclr.bright_red +
-                  "\nCannot proceed!\n" + sisyphus.getclr.reset)
-            print(sisyphus.getclr.bright_yellow +
-                  "Apply the above changes to your portage configuration files and try again!" + sisyphus.getclr.reset)
+            print(f"{sisyphus.getclr.bright_red}\nCannot proceed!\n{sisyphus.getclr.reset}{sisyphus.getclr.bright_yellow}Please apply the above changes to your portage configuration files and try again!{sisyphus.getclr.reset}")
             sys.exit()
     else:
         if len(bin_list) == 0 and len(src_list) == 0:
-            print(sisyphus.getclr.bright_red +
-                  "\nNo package found!\n" + sisyphus.getclr.reset)
-            sys.exit()
-
+            print(f"{sisyphus.getclr.bright_red}\nOne or more of the selected packages cannot be located for installation.\n{sisyphus.getclr.reset}")
         if ebuild:  # ebuild mode
             if len(bin_list) == 0 and len(src_list) != 0:  # source mode, ignore aliens
-                print("\n" + sisyphus.getclr.green +
-                      "These are the source packages that would be merged, in order:" + sisyphus.getclr.reset + "\n")
-                print("\n" + sisyphus.getclr.green +
-                      ", ".join(src_list) + sisyphus.getclr.reset + "\n")
-                print("\n" + sisyphus.getclr.bright_white + "Total:" + " " + str(
-                    len(src_list)) + " " + "source package(s)" + sisyphus.getclr.reset + "\n")
+                print(
+                    f"\n{sisyphus.getclr.green}These are the source packages that would be merged, in order:{sisyphus.getclr.reset}\n")
+                print(
+                    f"\n{sisyphus.getclr.green}{', '.join(src_list)}{sisyphus.getclr.reset}\n")
+                print(
+                    f"\n{sisyphus.getclr.bright_white}Total: {len(src_list)} source package(s){sisyphus.getclr.reset}\n")
                 while True:
-                    user_input = input(sisyphus.getclr.bright_white + "Would you like to proceed?" + sisyphus.getclr.reset + " " +
-                                       "[" + sisyphus.getclr.bright_green + "Yes" + sisyphus.getclr.reset + "/" + sisyphus.getclr.bright_red + "No" + sisyphus.getclr.reset + "]" + " ")
+                    user_input = input(
+                        f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ")
                     if user_input.lower() in ['yes', 'y', '']:
                         p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--with-bdeps=y', '--misspell-suggestion=n',
                                                  '--fuzzy-search=n'] + (['--oneshot'] if oneshot else []) + list(pkgname))
@@ -157,26 +147,26 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
                     elif user_input.lower() in ['no', 'n']:
                         break
                     else:
-                        print("\nSorry, response" + " " + "'" +
-                              user_input + "'" + " " + "not understood.\n")
+                        print(
+                            f"\nApologies, the response '{user_input}' was not recognized.\n")
                         continue
             elif len(bin_list) != 0 and len(src_list) != 0:  # hybrid mode, ignore aliens
-                print("\n" + sisyphus.getclr.green +
-                      "These are the binary packages that would be merged, in order:" + sisyphus.getclr.reset + "\n")
-                print("\n" + sisyphus.getclr.magenta +
-                      ", ".join(bin_list) + sisyphus.getclr.reset + "\n")
-                print("\n" + sisyphus.getclr.bright_white + "Total:" + " " + str(
-                    len(bin_list)) + " " + "binary package(s)" + sisyphus.getclr.reset + "\n")
-
-                print("\n" + sisyphus.getclr.green +
-                      "These are the source packages that would be merged, in order:" + sisyphus.getclr.reset + "\n")
-                print("\n" + sisyphus.getclr.green +
-                      ", ".join(src_list) + sisyphus.getclr.reset + "\n")
-                print("\n" + sisyphus.getclr.bright_white + "Total:" + " " + str(
-                    len(src_list)) + " " + "source package(s)" + sisyphus.getclr.reset + "\n")
+                print(
+                    f"\n{sisyphus.getclr.green}These are the binary packages that would be merged, in order:{sisyphus.getclr.reset}\n")
+                print(
+                    f"\n{sisyphus.getclr.magenta}{', '.join(bin_list)}{sisyphus.getclr.reset}\n")
+                print(
+                    f"\n{sisyphus.getclr.bright_white}Total: {len(bin_list)} binary package(s){sisyphus.getclr.reset}\n")
+
+                print(
+                    f"\n{sisyphus.getclr.green}These are the source packages that would be merged, in order:{sisyphus.getclr.reset}\n")
+                print(
+                    f"\n{sisyphus.getclr.green}{', '.join(src_list)}{sisyphus.getclr.reset}\n")
+                print(
+                    f"\n{sisyphus.getclr.bright_white}Total: {len(src_list)} source package(s){sisyphus.getclr.reset}\n")
                 while True:
-                    user_input = input(sisyphus.getclr.bright_white + "Would you like to proceed?" + sisyphus.getclr.reset + " " +
-                                       "[" + sisyphus.getclr.bright_green + "Yes" + sisyphus.getclr.reset + "/" + sisyphus.getclr.bright_red + "No" + sisyphus.getclr.reset + "]" + " ")
+                    user_input = input(
+                        f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ")
                     if user_input.lower() in ['yes', 'y', '']:
                         sisyphus.dlbinpkg.start(dl_world=False, gfx_ui=False)
                         os.chdir(sisyphus.getfs.p_cch_dir)
@@ -212,19 +202,19 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
                     elif user_input.lower() in ['no', 'n']:
                         break
                     else:
-                        print("\nSorry, response" + " " + "'" +
-                              user_input + "'" + " " + "not understood.\n")
+                        print(
+                            f"\nApologies, the response '{user_input}' was not recognized.\n")
                         continue
             elif len(bin_list) != 0 and len(src_list) == 0:  # binary mode, fallback
-                print("\n" + sisyphus.getclr.green +
-                      "These are the binary packages that would be merged, in order:" + sisyphus.getclr.reset + "\n")
-                print("\n" + sisyphus.getclr.magenta +
-                      ", ".join(bin_list) + sisyphus.getclr.reset + "\n")
-                print("\n" + sisyphus.getclr.bright_white + "Total:" + " " + str(
-                    len(bin_list)) + " " + "binary package(s)" + sisyphus.getclr.reset + "\n")
+                print(
+                    f"\n{sisyphus.getclr.green}These are the binary packages that would be merged, in order:{sisyphus.getclr.reset}\n")
+                print(
+                    f"\n{sisyphus.getclr.magenta}{', '.join(bin_list)}{sisyphus.getclr.reset}\n")
+                print(
+                    f"\n{sisyphus.getclr.bright_white}Total: {len(bin_list)} binary package(s){sisyphus.getclr.reset}\n")
                 while True:
-                    user_input = input(sisyphus.getclr.bright_white + "Would you like to proceed?" + sisyphus.getclr.reset + " " +
-                                       "[" + sisyphus.getclr.bright_green + "Yes" + sisyphus.getclr.reset + "/" + sisyphus.getclr.bright_red + "No" + sisyphus.getclr.reset + "]" + " ")
+                    user_input = input(
+                        f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ")
                     if user_input.lower() in ['yes', 'y', '']:
                         sisyphus.dlbinpkg.start(dl_world=False, gfx_ui=False)
                         os.chdir(sisyphus.getfs.p_cch_dir)
@@ -260,15 +250,15 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
                     elif user_input.lower() in ['no', 'n']:
                         break
                     else:
-                        print("\nSorry, response" + " " + "'" +
-                              user_input + "'" + " " + "not understood.\n")
+                        print(
+                            f"\nApologies, the response '{user_input}' was not recognized.\n")
                         continue
         else:  # non-ebuild mode
             if len(bin_list) == 0 and len(src_list) != 0:  # source mode (noop), catch aliens
                 if gfx_ui:
                     print("\nSource package(s) found in the mix!\n")
-                    print("Use sisyphus CLI:" + " " + "'" + "sisyphus install" +
-                          " " + " ".join(pkgname) + "--ebuild" + "'")
+                    print(
+                        f"Use the Sisyphus CLI command: 'sisyphus install {' '.join(pkgname)} --ebuild' to perform the install; Aborting.")
 
                     for i in range(9, 0, -1):
                         print(f"Killing application in : {i} seconds!")
@@ -276,16 +266,15 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
 
                     sys.exit(app.exec_())  # kill GUI window
                 else:
-                    print(sisyphus.getclr.bright_red +
-                          "\nSource package(s) found in the mix!\n" + sisyphus.getclr.reset)
-                    print(sisyphus.getclr.bright_yellow + "Use" + sisyphus.getclr.reset + " " +
-                          "'" + "sisyphus install" + " " + " ".join(pkgname) + " " + "--ebuild" + "'")
+                    print(
+                        f"{sisyphus.getclr.bright_red}\nSource package(s) found in the mix!\n{sisyphus.getclr.reset}")
+                    print(f"{sisyphus.getclr.bright_yellow}Use{sisyphus.getclr.reset} 'sisyphus install {' '.join(pkgname)} --ebuild' to perform the install; Aborting.")
                     sys.exit()
             elif len(bin_list) != 0 and len(src_list) != 0:  # hybrid mode (noop), catch aliens
                 if gfx_ui:
                     print("\nSource package(s) found in the mix!\n")
-                    print("Use sisyphus CLI:" + " " + "'" + "sisyphus install" +
-                          " " + " ".join(pkgname) + "--ebuild" + "'")
+                    print(
+                        f"Use the Sisyphus CLI command:: 'sisyphus install {' '.join(pkgname)} --ebuild' to perform the install; Aborting.")
 
                     for i in range(9, 0, -1):
                         print(f"Killing application in : {i} seconds!")
@@ -293,17 +282,16 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
 
                     sys.exit(app.exec_())  # kill GUI window
                 else:
-                    print(sisyphus.getclr.bright_red +
-                          "\nSource package(s) found in the mix!\n" + sisyphus.getclr.reset)
-                    print(sisyphus.getclr.bright_yellow + "Use" + sisyphus.getclr.reset + " " +
-                          "'" + "sisyphus install" + " " + " ".join(pkgname) + " " + "--ebuild" + "'")
-                sys.exit()
+                    print(
+                        f"{sisyphus.getclr.bright_red}\nSource package(s) found in the mix!\n{sisyphus.getclr.reset}")
+                    print(f"{sisyphus.getclr.bright_yellow}Use{sisyphus.getclr.reset} 'sisyphus install {' '.join(pkgname)} --ebuild' to perform the install; Aborting.")
+                    sys.exit()
             elif len(bin_list) != 0 and len(src_list) == 0:  # binary mode
                 if gfx_ui:
                     print(
-                        "\n" + "These are the binary packages that will be merged, in order:" + "\n")
-                    print("\n" + ", ".join(bin_list) + "\n\n" + "Total:" + " " +
-                          str(len(bin_list)) + " " + "binary package(s)" + "\n\n")
+                        "\nThese are the binary packages that will be merged, in order:\n")
+                    print(", ".join(bin_list) + "\n\nTotal: " +
+                          str(len(bin_list)) + " binary package(s)\n\n")
                     sisyphus.dlbinpkg.start(dl_world=False, gfx_ui=True)
                     os.chdir(sisyphus.getfs.p_cch_dir)
                     p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y',
@@ -317,15 +305,15 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
                     p_exe.wait()
                     sisyphus.syncdb.lcl_tbl()
                 else:
-                    print("\n" + sisyphus.getclr.green +
-                          "These are the binary packages that would be merged, in order:" + sisyphus.getclr.reset + "\n")
-                    print("\n" + sisyphus.getclr.magenta +
-                          ", ".join(bin_list) + sisyphus.getclr.reset + "\n")
-                    print("\n" + sisyphus.getclr.bright_white + "Total:" + " " + str(
-                        len(bin_list)) + " " + "binary package(s)" + sisyphus.getclr.reset + "\n")
+                    print(
+                        f"\n{sisyphus.getclr.green}These are the binary packages that would be merged, in order:{sisyphus.getclr.reset}\n")
+                    print(
+                        f"\n{sisyphus.getclr.magenta}{', '.join(bin_list)}{sisyphus.getclr.reset}\n")
+                    print(
+                        f"\n{sisyphus.getclr.bright_white}Total: {len(bin_list)} binary package(s){sisyphus.getclr.reset}\n")
                     while True:
-                        user_input = input(sisyphus.getclr.bright_white + "Would you like to proceed?" + sisyphus.getclr.reset + " " +
-                                           "[" + sisyphus.getclr.bright_green + "Yes" + sisyphus.getclr.reset + "/" + sisyphus.getclr.bright_red + "No" + sisyphus.getclr.reset + "]" + " ")
+                        user_input = input(
+                            f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ")
                         if user_input.lower() in ['yes', 'y', '']:
                             sisyphus.dlbinpkg.start(
                                 dl_world=False, gfx_ui=False)
@@ -362,6 +350,6 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
                         elif user_input.lower() in ['no', 'n']:
                             break
                         else:
-                            print("\nSorry, response" + " " + "'" +
-                                  user_input + "'" + " " + "not understood.\n")
+                            print(
+                                f"\nApologies, the response '{user_input}' was not recognized.\n")
                             continue