From 6d774a807a5fc98c8f4e7c3d35fd0f4a3882ebb7 Mon Sep 17 00:00:00 2001
From: Hussar <hussarhussar@protonmail.com>
Date: Thu, 1 Aug 2019 20:28:50 -0400
Subject: [PATCH] updates work!

---
 .README.md.swp | Bin 0 -> 12288 bytes
 .update.py.swp | Bin 16384 -> 24576 bytes
 rnd            |   9 +++++
 update.py      |  98 +++++++++++++++++++++++++++++++++++++++++--------
 4 files changed, 92 insertions(+), 15 deletions(-)
 create mode 100644 .README.md.swp
 create mode 100644 rnd

diff --git a/.README.md.swp b/.README.md.swp
new file mode 100644
index 0000000000000000000000000000000000000000..86d3767f19b8321f6e82b47dc6da24c1b72aaa4f
GIT binary patch
literal 12288
zcmeI2v2GMG5Qd%9gdli<At%w@ZVnVFN`Zt(Kv#qW$kCuE=iQsTb+T(4+naC=bQJIo
zwD2sHyaY830xHJ47jjAw(guyC(Q56P-{WuGtah^17yWHmPkMsJ4I%8i`}@h_orUEU
zAyidKU1J%SE*b@v%J_>s+O;>Qg6Xa^hnNSS)^;QVcC`s=tk9*;wjOM5Zza{}-)ii^
z1en033DjZSU0)j9yW3lhF`bp$aO>va(&6mL1egF5U;<2l2`~XBzyz4U)h7__f_O{E
zSezYYY4%(=_nf`*g9$JJCcp%k025#WOn?b60Vco%m;e*Ff&?V}Y5#Feh)40mpZ@=!
ze*b@47UJu5AwH9RBKt`8f$TlmZ*uxY_LJ;8*<-R8|AmYP6JP>NfC(@GCcp%k025#W
zOyEB!Fz^Vw#-awLeLy(^GX`I0)|ni=Ph72GY#c~G)p-IB3(Sw;M1=xuj7oA-Rkc<*
zHA92c6zvmVB3hCI38gW%nI?%G0gq9KW-gC9K7k?x>o?N$L>;N*RY;Uc_X<a8_=BzJ
z><^yqWKGAl*xT9M*#IiXa||9rfshx@=tGl1Fc9;Mb8TOCVyED9r)&TjTHo3^(xZ$h
zRb_O{#Z95N1|vD8L`bx@fUj-r?xvI}|9}&8;Ltks6sq)OZii;w9m_HiVmO2(^-&=1
z+glqBMW+J;FDEEOn!?Mz_UHmwm5174B;59m&r%_hwcQtkrllO7%v#DpQ6At`Wy=;V
zQVqJnbZaV^w6=`U<4Hn6XQWC07l?04<_YqsE@R$S=0}vxj1C>QPhgIX8hP-+xYot{
z6XR$mo08h;Y0s_#REE^BiEVa^xSMMMrOKQnn!zbU#h4&1xw%_1U!Xa`+~~Y5OF3=5
VqvWJkXBS0uU=uS%^*BdI`~hZsC~*J)

literal 0
HcmV?d00001

diff --git a/.update.py.swp b/.update.py.swp
index 655713c4010a8a9b86077f9069358c4c8e8066e4..14d46d14186bfeab2753ab6568158d347d7b4e27 100644
GIT binary patch
literal 24576
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

delta 896
zcmXZZT}V@59LMqhS!Zsp&25F0Vzo);*yb=ni`>==fo~g`S=5C@yQmO_ZZafjD>A8w
zUY@9KvQQ)JB8nri%TYuynp8BSP}qf(2-QUwL96IH@_`TMInOy9{^$2gWwcaEt4uT=
z=!ko^hBgb!B~n)(?Q3~j`PJz(Ns=Q|>6{f(Zr2+3ivKs#xqS5*!>&>1^(Q-Scyz}p
zt4LQlPxuV4djiRVL*yCmVGL)H!g0jWj7_M61K;c-uQ863Xonq(D@8K6fNlg4fEjZ(
zk!f7RQH0S7tBv_TFwO)95kqObPE@1Fxbv7n4hAmc5(W`O71rX1MdUGt5QL7mWg<7B
z&;}=7nnmuSA2nw3`>2cD$9{ORK!SO^M;f<q28Xc|>rjJV<etSNOyMe0NFsq4A_$`u
z+pqyTmNb!1$Y`1|8}XY|_aTc)@2*ncd)<bkc1&0CgH7s0)S?>e`%L07j&$|wD!(V7
zW*eGSPpH<|63S`G1;+L9Po+9Lm;25-83zMs!Ji6|-*|^foJI$#QKZm$%peB?7f~wz
z7`7t{FA9{LL#h0SNZ2XQ&!#}bX^fy9Z79<23k+i~*5eI@UO_L)k*BmfxQ!vi5J4Co
z{H4Ipc!ep9;5-s&!YWHx#Lea>2`u6ZvY5sLOkx7#7{vg3unWF2L(`XZV=l6>6uy<L
V&8ot0Qw_e=D!$KZJolcn`~&Qak4^vp

diff --git a/rnd b/rnd
new file mode 100644
index 0000000..2d36680
--- /dev/null
+++ b/rnd
@@ -0,0 +1,9 @@
+
+I have an async function and would like to use subprocess.Popen instead of subprocess.run() to avoid blocking the thread. Using the communicate() function blocks the thread, and I'm worried about using shell=True because a password is being passed. The current function gives me an `unsupported fileno` exception. Popen.stdin.write() causes the subprocess to hang forever as if it were never started. I can still use sudo in another terminal when this happens.
+
+
+        proc = subprocess.Popen(['sudo', '-S', 'apt-get', cmd, '-y'],
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.STDOUT,
+                                stdin=io.BytesIO(password.encode()))
+
diff --git a/update.py b/update.py
index bbbef46..f32868a 100755
--- a/update.py
+++ b/update.py
@@ -7,9 +7,10 @@ from PySide2.QtWidgets import (QApplication, QLabel,
                                QListWidgetItem, QGridLayout, QTextEdit,
                                QComboBox, QToolBar, QInputDialog, QAction,
                                QStackedWidget, QTextBrowser)
-from PySide2.QtCore import (Qt, QThread, Signal, QDir)
+from PySide2.QtCore import (Qt, QThread, Signal, QDir, QProcess,
+                            QCoreApplication)
 from PySide2.QtGui import (QIcon, QMovie)
-import sys, subprocess
+import sys, subprocess, trio, io
 
 class UpdatePrompt(QDialog):
 
@@ -59,9 +60,77 @@ class UpdatePrompt(QDialog):
         self.resize(450, 250)
         return
 
+    async def asetup(self, password):
+        async with trio.open_nursery() as nursery:
+            finishedState = trio.Event()
+            nursery.start_soon(self.upProc, password, 'update', finishedState)
+            #nursery.start_soon(self.KEAlive, finishedState)
+        return
+
+    async def upProc(self, password, cmd, finishedState):
+#        proc = subprocess.Popen(['sudo', '-S', 'apt-get', cmd, '-y'],
+#                                stdout=subprocess.PIPE,
+#                                stderr=subprocess.STDOUT,
+#                                stdin=subprocess.PIPE)
+
+        proc = await trio.open_process(['sudo', '-S', 'apt-get', cmd, '-y'],
+                       stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+                                       stderr=subprocess.STDOUT)
+        await proc.stdin.send_all((password + '\n').encode())
+
+        result = ''
+        while (proc.poll() == None):
+            QCoreApplication.processEvents()
+            await trio.sleep(0.1)
+            #a = await proc.stdout.receive_some()
+            #a = a.decode()
+            #print(a)
+            #result = result + a
+
+        #stdout = result.stdout.decode()
+        result = await self.pullOutput(proc)
+        self.appendToOutput(result)
+        proc.terminate()
+
+        if (cmd == 'update'):
+            await self.upProc(password, 'upgrade', finishedState)
+            finishedState.set()
+
+        return
+
+    async def pseudoSleep(self, intervals):
+        i = 0
+        return
+
+    async def pullOutput(self, proc):
+        x = await proc.stdout.receive_some()
+        x = x.decode()
+        result = ''
+        while (x != ''):
+            QCoreApplication.processEvents()
+            result = result + x
+            x = await proc.stdout.receive_some()
+            x = x.decode()
+        return result
+
+    async def KEAlive(self, finishedState):
+        while finishedState.is_set():
+            QCoreApplication.processEvents()
+            trio.sleep(0.1)
+        return
+
+        return
+
+    def appendToOutput(self, add):
+        currentText = self.outputBox.toPlainText()
+        self.outputBox.setText(currentText + 'Running updates\n' + add + '\n')
+        print (add)
+        return
+
     def pkgUpdates(self):
         self.centStack.setCurrentIndex(0)
         self.refreshIcon.start()
+        QCoreApplication.processEvents()
 
         password = self.inputBox.text()
 
@@ -69,20 +138,17 @@ class UpdatePrompt(QDialog):
             self.passError('The password field cannot be empty')
             return
 
-        password = password.encode()
-        result = subprocess.run(['sudo', '-S', 'apt-get', 'update'],
-                                stdout=subprocess.PIPE,
-                                stderr=subprocess.STDOUT, input=password)
-        stdout = result.stdout.decode()
-        currentText = self.outputBox.toPlainText()
-        self.outputBox.setText('Running updates\n' + stdout)
 
-        result = subprocess.run(['sudo', '-S', 'apt-get', 'upgrade', '-y'],
-                                stdout=subprocess.PIPE,
-                                stderr=subprocess.STDOUT, input=password)
-        stdout = result.stdout.decode()
-        currentText = self.outputBox.toPlainText()
-        self.outputBox.setText(currentText + '\nRunning upgrades\n' + stdout)
+       # password = password.encode()
+       # result = subprocess.run(['sudo', '-S', 'apt-get', 'update'],
+       #                         stdout=subprocess.PIPE,
+       #                         stderr=subprocess.STDOUT, input=password)
+       # result = subprocess.run(['sudo', '-S', 'apt-get', 'upgrade', '-y'],
+       #                         stdout=subprocess.PIPE,
+       #                         stderr=subprocess.STDOUT, input=password)
+       # stdout = result.stdout.decode()
+       # currentText = self.outputBox.toPlainText()
+       # self.outputBox.setText(currentText + '\nRunning upgrades\n' + stdout)
        # result = subprocess.run(['sudo', 'apt', 'upgrade', '-y'],
        #                         stdout=subprocess.PIPE,
        #                         stderr=subprocess.STDOUT, input=password)
@@ -90,7 +156,9 @@ class UpdatePrompt(QDialog):
        # self.outputBox.setText(currentText + '\n' + stdout)
 
         #self.refreshIcon.stop()
+        trio.run(self.asetup, password)
         self.centStack.setCurrentIndex(1)
+        self.refreshIcon.stop()
         return
 
     def passError(self, s):