mirror of
https://github.com/mbusb/multibootusb
synced 2024-11-01 15:40:16 +00:00
commit
1e384a27a2
@ -47,20 +47,12 @@ def extract_iso(src, dst, pattern=None, suppress_out=True):
|
|||||||
if pattern is None:
|
if pattern is None:
|
||||||
_cmd = _7zip + cli_option + ' x -y -o' + gen.quote(dst) + ' ' + gen.quote(src) + suppress_out
|
_cmd = _7zip + cli_option + ' x -y -o' + gen.quote(dst) + ' ' + gen.quote(src) + suppress_out
|
||||||
else:
|
else:
|
||||||
_cmd = _7zip + ' -y x ' + gen.quote(src) + ' -o' + dst + ' ' + gen.quote(pattern) + ' -r' + suppress_out
|
_cmd = _7zip + ' x -y ' + gen.quote(src) + ' -o' + dst + ' ' + gen.quote(pattern) + ' -r' + suppress_out
|
||||||
gen.log('Executing ==> ' + _cmd)
|
gen.log('Executing ==> ' + _cmd)
|
||||||
_7zip_process = subprocess.Popen(_cmd, universal_newlines=True, stdin=subprocess.PIPE, stderr=subprocess.PIPE,
|
|
||||||
stdout=subprocess.PIPE, shell=True)
|
|
||||||
config.status_text = 'Status: Extracting ' + os.path.basename(src).strip()
|
config.status_text = 'Status: Extracting ' + os.path.basename(src).strip()
|
||||||
while True:
|
with open(os.devnull, 'w') as devnull:
|
||||||
line = _7zip_process.stdout.readline()
|
subprocess.call(_cmd, stdin=devnull, stdout=devnull, stderr=devnull, shell=True)
|
||||||
# gen.log(line)
|
|
||||||
if line.startswith('- '):
|
|
||||||
config.status_text = 'Status: Extracting ' + line[2:].strip()
|
|
||||||
elif platform.system() == 'Linux': # line.startswith('Extracting'): # Under Linux it prints directly all the process (may be due to version diff).
|
|
||||||
config.status_text = 'Status: ' + line.strip()
|
|
||||||
if line == '' and _7zip_process.poll() != None:
|
|
||||||
break
|
|
||||||
|
|
||||||
|
|
||||||
def list_iso(iso_link, suppress_out=True):
|
def list_iso(iso_link, suppress_out=True):
|
||||||
|
@ -48,10 +48,11 @@ def dd_linux():
|
|||||||
).start()
|
).start()
|
||||||
|
|
||||||
while dd_process.poll() is None:
|
while dd_process.poll() is None:
|
||||||
time.sleep(1) # If this time delay is not given, the Popen does not execute the actual command
|
time.sleep(0.1) # If this time delay is not given, the Popen does not execute the actual command
|
||||||
dd_process.send_signal(signal.SIGUSR1)
|
dd_process.send_signal(signal.SIGUSR1)
|
||||||
dd_process.stderr.flush()
|
dd_process.stderr.flush()
|
||||||
while True:
|
while True:
|
||||||
|
time.sleep(0.1)
|
||||||
out_error = dd_process.stderr.readline().decode()
|
out_error = dd_process.stderr.readline().decode()
|
||||||
if out_error:
|
if out_error:
|
||||||
if 'bytes' in out_error:
|
if 'bytes' in out_error:
|
||||||
|
@ -12,6 +12,7 @@ import sys
|
|||||||
import platform
|
import platform
|
||||||
import threading
|
import threading
|
||||||
import subprocess
|
import subprocess
|
||||||
|
import time
|
||||||
from .usb import *
|
from .usb import *
|
||||||
from .gen import *
|
from .gen import *
|
||||||
# from .iso import *
|
# from .iso import *
|
||||||
@ -146,6 +147,7 @@ def install_progress():
|
|||||||
percentage = 100
|
percentage = 100
|
||||||
config.percentage = percentage
|
config.percentage = percentage
|
||||||
pbar.update(percentage)
|
pbar.update(percentage)
|
||||||
|
time.sleep(0.1)
|
||||||
|
|
||||||
|
|
||||||
def install_patch():
|
def install_patch():
|
||||||
|
Loading…
Reference in New Issue
Block a user