we want realtime output in these, so bring back io.TextIOWrapper

6 files changed, 73 insertions, 69 deletions

diff --git a/src/backend/autoRemoveAll.py b/src/backend/autoRemoveAll.py
index 3165e4b..191c10e 100644
--- a/src/backend/autoRemoveAll.py
+++ b/src/backend/autoRemoveAll.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python3
 
 import atexit
+import io
 import subprocess
 import sys
 import sisyphus.checkEnvironment
@@ -17,11 +18,11 @@ def start():
 
 def startqt():
     portageExec = subprocess.Popen(['emerge', '--depclean'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    stdout, stderr = portageExec.communicate()
     # kill portage if the program dies or it's terminated by the user
     atexit.register(sisyphus.killPortage.start, portageExec)
 
-    for portageOutput in stdout.decode('ascii').splitlines():
-        print(portageOutput)
+    for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+        print(portageOutput.rstrip())
 
+    portageExec.wait()
     sisyphus.syncDatabase.syncLocal()
diff --git a/src/backend/installPkg.py b/src/backend/installPkg.py
index 7b98fc4..e9373da 100644
--- a/src/backend/installPkg.py
+++ b/src/backend/installPkg.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python3
 
 import atexit
+import io
 import os
 import shutil
 import subprocess
@@ -42,13 +43,12 @@ def start(pkgname):
                                 os.remove(binary.rstrip().split("/")[1])
 
                         portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                        stdout, stderr = portageExec.communicate()
-
-                        for portageOutput in stdout.decode('ascii').splitlines():
-                            if not "These are the packages that would be merged, in order:" in portageOutput:
-                                if not "Calculating dependencies" in portageOutput:
-                                    print(portageOutput)
+                        for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+                            if not "These are the packages that would be merged, in order:" in portageOutput.rstrip():
+                                if not "Calculating dependencies" in portageOutput.rstrip():
+                                    print(portageOutput.rstrip())
 
+                        portageExec.wait()
                         sisyphus.syncDatabase.syncLocal()
                     else:
                         sys.exit("\n" + "Ok; Quitting." + "\n")
@@ -83,13 +83,13 @@ def startqt(pkgname):
             os.remove(binary.rstrip().split("/")[1])
 
     portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    stdout, stderr = portageExec.communicate()
     # kill portage if the program dies or it's terminated by the user
     atexit.register(sisyphus.killPortage.start, portageExec)
 
-    for portageOutput in stdout.decode('ascii').splitlines():
-        if not "These are the packages that would be merged, in order:" in portageOutput:
-            if not "Calculating dependencies" in portageOutput:
-                print(portageOutput)
+    for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+        if not "These are the packages that would be merged, in order:" in portageOutput.rstrip():
+            if not "Calculating dependencies" in portageOutput.rstrip():
+                print(portageOutput.rstrip())
 
+    portageExec.wait()
     sisyphus.syncDatabase.syncLocal()
diff --git a/src/backend/installSrc.py b/src/backend/installSrc.py
index 420b4d5..d5fc92b 100644
--- a/src/backend/installSrc.py
+++ b/src/backend/installSrc.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python3
 
 import os
+import io
 import shutil
 import subprocess
 import sys
@@ -40,13 +41,13 @@ def start(pkgname):
                                 os.remove(binary.rstrip().split("/")[1])
 
                         portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                        stdout, stderr = portageExec.communicate()
 
-                        for portageOutput in stdout.decode('ascii').splitlines():
-                            if not "These are the packages that would be merged, in order:" in portageOutput:
-                                if not "Calculating dependencies" in portageOutput:
-                                    print(portageOutput)
+                        for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+                            if not "These are the packages that would be merged, in order:" in portageOutput.rstrip():
+                                if not "Calculating dependencies" in portageOutput.rstrip():
+                                    print(portageOutput.rstrip())
 
+                        portageExec.wait()
                         sisyphus.syncDatabase.syncLocal()
                     else:
                         sys.exit("\n" + "Ok; Quitting." + "\n")
@@ -73,13 +74,13 @@ def start(pkgname):
                                 os.remove(binary.rstrip().split("/")[1])
 
                         portageExec = subprocess.Popen(['emerge', '--usepkg', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                        stdout, stderr = portageExec.communicate()
 
-                        for portageOutput in stdout.decode('ascii').splitlines():
-                            if not "These are the packages that would be merged, in order:" in portageOutput:
-                                if not "Calculating dependencies" in portageOutput:
-                                    print(portageOutput)
+                        for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+                            if not "These are the packages that would be merged, in order:" in portageOutput.rstrip():
+                                if not "Calculating dependencies" in portageOutput.rstrip():
+                                    print(portageOutput.rstrip())
 
+                        portageExec.wait()
                         sisyphus.syncDatabase.syncLocal()
                     else:
                         sys.exit("\n" + "Ok; Quitting." + "\n")
@@ -87,26 +88,26 @@ def start(pkgname):
                     print("\n" + "These are the source packages that would be merged, in order:" + "\n\n"  + "  ".join(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n")
                     if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
                         portageExec = subprocess.Popen(['emerge', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                        stdout, stderr = portageExec.communicate()
 
-                        for portageOutput in stdout.decode('ascii').splitlines():
-                            if not "These are the packages that would be merged, in order:" in portageOutput:
-                                if not "Calculating dependencies" in portageOutput:
-                                    print(portageOutput)
+                        for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+                            if not "These are the packages that would be merged, in order:" in portageOutput.rstrip():
+                                if not "Calculating dependencies" in portageOutput.rstrip():
+                                    print(portageOutput.rstrip())
 
+                        portageExec.wait()
                         sisyphus.syncDatabase.syncLocal()
                     else:
                         sys.exit("\n" + "Ok; Quitting." + "\n")
         else:
             portageExec = subprocess.Popen(['emerge', '--quiet', '--pretend', '--getbinpkg', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            stdout, stderr = portageExec.communicate()
 
-            for portageOutput in stdout.decode('ascii').splitlines():
-                if not "Local copy of remote index is up-to-date and will be used." in portageOutput:
-                    if not "ebuild" in portageOutput:
-                        if not "binary" in portageOutput:
-                            print(portageOutput)
+            for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+                if not "Local copy of remote index is up-to-date and will be used." in portageOutput.rstrip():
+                    if not "ebuild" in portageOutput.rstrip():
+                        if not "binary" in portageOutput.rstrip():
+                            print(portageOutput.rstrip())
 
+            portageExec.wait()
             sys.exit("\n" + "Cannot proceed; Apply the above changes to your portage configuration files and try again; Quitting." + "\n")
     else:
         sys.exit("\nYou need root permissions to do this, exiting!\n")
diff --git a/src/backend/uninstallAll.py b/src/backend/uninstallAll.py
index ca25628..c3802c5 100644
--- a/src/backend/uninstallAll.py
+++ b/src/backend/uninstallAll.py
@@ -17,11 +17,11 @@ def start(pkgname):
 
 def startqt(pkgname):
     portageExec = subprocess.Popen(['emerge', '--depclean'] + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    stdout, stderr = portageExec.communicate()
     # kill portage if the program dies or it's terminated by the user
     atexit.register(sisyphus.killPortage.start, portageExec)
 
-    for portageOutput in stdout.decode('ascii').splitlines():
-        print(portageOutput)
+    for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+        print(portageOutput.rstrip())
 
+    portageExec.wait()
     sisyphus.syncDatabase.syncLocal()
diff --git a/src/backend/upgradePkg.py b/src/backend/upgradePkg.py
index 293dc66..d284402 100644
--- a/src/backend/upgradePkg.py
+++ b/src/backend/upgradePkg.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python3
 
 import atexit
+import io
 import os
 import shutil
 import subprocess
@@ -42,13 +43,13 @@ def start():
                                 os.remove(binary.rstrip().split("/")[1])
 
                         portageExec = subprocess.Popen(['emerge', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                        stdout, stderr = portageExec.communicate()
 
-                        for portageOutput in stdout.decode('ascii').splitlines():
-                            if not "These are the packages that would be merged, in order:" in portageOutput:
-                                if not "Calculating dependencies" in portageOutput:
-                                    print(portageOutput)
+                        for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+                            if not "These are the packages that would be merged, in order:" in portageOutput.rstrip():
+                                if not "Calculating dependencies" in portageOutput.rstrip():
+                                    print(portageOutput.rstrip())
 
+                        portageExec.wait()
                         sisyphus.syncDatabase.syncLocal()
                     else:
                         sys.exit("\n" + "Ok; Quitting." + "\n")
@@ -87,15 +88,15 @@ def startqt():
                     os.remove(binary.rstrip().split("/")[1])
 
             portageExec = subprocess.Popen(['emerge', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            stdout, stderr = portageExec.communicate()
             # kill portage if the program dies or it's terminated by the user
             atexit.register(sisyphus.killPortage.start, portageExec)
 
-            for portageOutput in stdout.decode('ascii').splitlines():
-                if not "These are the packages that would be merged, in order:" in portageOutput:
-                    if not "Calculating dependencies" in portageOutput:
-                        print(portageOutput)
+            for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+                if not "These are the packages that would be merged, in order:" in portageOutput.rstrip():
+                    if not "Calculating dependencies" in portageOutput.rstrip():
+                        print(portageOutput.rstrip())
 
+            portageExec.wait()
             sisyphus.syncDatabase.syncLocal()
         else:
             print("\n" + "No package upgrades found; Quitting." + "\n")
diff --git a/src/backend/upgradeSrc.py b/src/backend/upgradeSrc.py
index e378a8a..9badd95 100644
--- a/src/backend/upgradeSrc.py
+++ b/src/backend/upgradeSrc.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python3
 
 import os
+import io
 import shutil
 import subprocess
 import sys
@@ -40,13 +41,13 @@ def start():
                                 os.remove(binary.rstrip().split("/")[1])
 
                         portageExec = subprocess.Popen(['emerge', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                        stdout, stderr = portageExec.communicate()
 
-                        for portageOutput in stdout.decode('ascii').splitlines():
-                            if not "These are the packages that would be merged, in order:" in portageOutput:
-                                if not "Calculating dependencies" in portageOutput:
-                                    print(portageOutput)
+                        for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+                            if not "These are the packages that would be merged, in order:" in portageOutput.rstrip():
+                                if not "Calculating dependencies" in portageOutput.rstrip():
+                                    print(portageOutput.rstrip())
 
+                        portageExec.wait()
                         sisyphus.syncDatabase.syncLocal()
                     else:
                         sys.exit("\n" + "Ok; Quitting." + "\n")
@@ -73,13 +74,13 @@ def start():
                                 os.remove(binary.rstrip().split("/")[1])
 
                         portageExec = subprocess.Popen(['emerge', '--update', '--deep', '--newuse', '--usepkg', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                        stdout, stderr = portageExec.communicate()
 
-                        for portageOutput in stdout.decode('ascii').splitlines():
-                            if not "These are the packages that would be merged, in order:" in portageOutput:
-                                if not "Calculating dependencies" in portageOutput:
-                                    print(portageOutput)
+                        for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+                            if not "These are the packages that would be merged, in order:" in portageOutput.rstrip():
+                                if not "Calculating dependencies" in portageOutput.rstrip():
+                                    print(portageOutput.rstrip())
 
+                        portageExec.wait()
                         sisyphus.syncDatabase.syncLocal()
                     else:
                         sys.exit("\n" + "Ok; Quitting." + "\n")
@@ -87,26 +88,26 @@ def start():
                     print("\n" + "These are the source packages that would be merged, in order:" + "\n\n"  + "  ".join(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n")
                     if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
                         portageExec = subprocess.Popen(['emerge', '--update', '--deep', '--newuse', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                        stdout, stderr = portageExec.communicate()
 
-                        for portageOutput in stdout.decode('ascii').splitlines():
-                            if not "These are the packages that would be merged, in order:" in portageOutput:
-                                if not "Calculating dependencies" in portageOutput:
-                                    print(portageOutput)
+                        for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+                            if not "These are the packages that would be merged, in order:" in portageOutput.rstrip():
+                                if not "Calculating dependencies" in portageOutput.rstrip():
+                                    print(portageOutput.rstrip())
 
+                        portageExec.wait()
                         sisyphus.syncDatabase.syncLocal()
                     else:
                         sys.exit("\n" + "Ok; Quitting." + "\n")
         else:
             portageExec = subprocess.Popen(['emerge', '--quiet', '--update', '--deep', '--newuse', '--pretend', '--getbinpkg', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            stdout, stderr = portageExec.communicate()
 
-            for portageOutput in stdout.decode('ascii').splitlines():
-                if not "Local copy of remote index is up-to-date and will be used." in portageOutput:
-                    if not "ebuild" in portageOutput:
-                        if not "binary" in portageOutput:
-                            print(portageOutput)
+            for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+                if not "Local copy of remote index is up-to-date and will be used." in portageOutput.rstrip():
+                    if not "ebuild" in portageOutput.rstrip():
+                        if not "binary" in portageOutput.rstrip():
+                            print(portageOutput.rstrip())
 
+            portageExec.wait()
             sys.exit("\n" + "Cannot proceed; Apply the above changes to your portage configuration files and try again; Quitting." + "\n")
     else:
         sys.exit("\nYou need root permissions to do this, exiting!\n")