diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py
index adb5d27..8448903 100644
--- a/kindlecomicconverter/KCC_gui.py
+++ b/kindlecomicconverter/KCC_gui.py
@@ -28,7 +28,7 @@ import requests
# noinspection PyUnresolvedReferences
from PyQt5 import QtGui, QtCore, QtWidgets, QtNetwork
from xml.sax.saxutils import escape
-from psutil import Popen, Process
+from psutil import Process
from copy import copy
from distutils.version import StrictVersion
from raven import Client
@@ -835,26 +835,21 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
os.chmod('/usr/local/bin/kindlegen', 0o755)
except Exception:
pass
- kindleGenExitCode = Popen('kindlegen -locale en', stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
- kindleGenExitCode.communicate()
- if kindleGenExitCode.returncode == 0:
+ try:
+ versionCheck = subprocess.run(['kindlegen', '-locale', 'en'], stdout=PIPE, stderr=STDOUT, encoding='UTF-8')
self.kindleGen = True
- versionCheck = Popen('kindlegen -locale en', stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
- for line in versionCheck.stdout:
- line = line.decode("utf-8")
+ for line in versionCheck.stdout.splitlines():
if 'Amazon kindlegen' in line:
versionCheck = line.split('V')[1].split(' ')[0]
if StrictVersion(versionCheck) < StrictVersion('2.9'):
self.addMessage('Your KindleGen'
' is outdated! MOBI conversion might fail.', 'warning')
break
- else:
+ except FileNotFoundError:
self.kindleGen = False
if startup:
self.display_kindlegen_missing()
-
-
def __init__(self, kccapp, kccwindow):
global APP, MW, GUI
APP = kccapp
@@ -1029,11 +1024,10 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
self.addMessage('Since you are a new user of KCC please see few '
'important tips.',
'info')
- process = Popen('7z', stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
- process.communicate()
- if process.returncode == 0 or process.returncode == 7:
+ try:
+ subprocess.run(['7z'], stdout=PIPE, stderr=STDOUT)
self.sevenzip = True
- else:
+ except FileNotFoundError:
self.sevenzip = False
self.addMessage('Install 7z (link)'
' to enable CBZ/CBR/ZIP/etc processing.', 'warning')
diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py
index 78410b9..1279188 100755
--- a/kindlecomicconverter/comic2ebook.py
+++ b/kindlecomicconverter/comic2ebook.py
@@ -38,7 +38,7 @@ from natsort import os_sorted
from slugify import slugify as slugify_ext
from PIL import Image
from subprocess import STDOUT, PIPE
-from psutil import Popen, virtual_memory, disk_usage
+from psutil import virtual_memory, disk_usage
from html import escape as hescape
try:
from PyQt5 import QtCore
@@ -1103,15 +1103,15 @@ def checkTools(source):
source = source.upper()
if source.endswith('.CB7') or source.endswith('.7Z') or source.endswith('.RAR') or source.endswith('.CBR') or \
source.endswith('.ZIP') or source.endswith('.CBZ'):
- process = Popen('7z', stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
- process.communicate()
- if process.returncode != 0 and process.returncode != 7:
+ try:
+ subprocess.run(['7z'], stdout=PIPE, stderr=STDOUT)
+ except FileNotFoundError:
print('ERROR: 7z is missing!')
sys.exit(1)
if options.format == 'MOBI':
- kindleGenExitCode = Popen('kindlegen -locale en', stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
- kindleGenExitCode.communicate()
- if kindleGenExitCode.returncode != 0:
+ try:
+ subprocess.run(['kindlegen', '-locale', 'en'], stdout=PIPE, stderr=STDOUT)
+ except FileNotFoundError:
print('ERROR: KindleGen is missing!')
sys.exit(1)
@@ -1267,10 +1267,9 @@ def makeMOBIWorker(item):
kindlegenError = ''
try:
if os.path.getsize(item) < 629145600:
- output = Popen('kindlegen -dont_append_source -locale en "' + item + '"',
- stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
- for line in output.stdout:
- line = line.decode('utf-8')
+ output = subprocess.run(['kindlegen', '-dont_append_source', '-locale', 'en', item],
+ stdout=PIPE, stderr=STDOUT, encoding='UTF-8')
+ for line in output.stdout.splitlines():
# ERROR: Generic error
if "Error(" in line:
kindlegenErrorCode = 1
@@ -1281,7 +1280,6 @@ def makeMOBIWorker(item):
if kindlegenErrorCode > 0:
break
if ":I1036: Mobi file built successfully" in line:
- output.communicate()
break
else:
# ERROR: EPUB too big
diff --git a/kindlecomicconverter/comicarchive.py b/kindlecomicconverter/comicarchive.py
index 346f310..e8b215a 100644
--- a/kindlecomicconverter/comicarchive.py
+++ b/kindlecomicconverter/comicarchive.py
@@ -22,12 +22,13 @@ import os
import platform
import subprocess
import distro
-from psutil import Popen
from shutil import move
from subprocess import STDOUT, PIPE
from xml.dom.minidom import parseString
from xml.parsers.expat import ExpatError
+EXTRACTION_ERROR = 'Failed to extract archive. Try extracting file outside of KCC.'
+
class ComicArchive:
def __init__(self, filepath):
@@ -35,41 +36,35 @@ class ComicArchive:
self.type = None
if not os.path.isfile(self.filepath):
raise OSError('File not found.')
- process = Popen('7z l -y -p1 "' + self.filepath + '"', stderr=STDOUT, stdout=PIPE, stdin=PIPE, shell=True)
- for line in process.stdout:
+ process = subprocess.run(['7z', 'l', '-y', '-p1', self.filepath], stderr=STDOUT, stdout=PIPE)
+ for line in process.stdout.splitlines():
if b'Type =' in line:
self.type = line.rstrip().decode().split(' = ')[1].upper()
break
- process.communicate()
if process.returncode != 0 and distro.id() == 'fedora':
- process = Popen('unrar l -y -p1 "' + self.filepath + '"', stderr=STDOUT, stdout=PIPE, stdin=PIPE, shell=True)
- for line in process.stdout:
+ process = subprocess.run(['unrar', 'l', '-y', '-p1', self.filepath], stderr=STDOUT, stdout=PIPE)
+ for line in process.stdout.splitlines():
if b'Details: ' in line:
self.type = line.rstrip().decode().split(' ')[1].upper()
break
- process.communicate()
if process.returncode != 0:
- raise OSError(process.stdout.strip())
+ raise OSError(EXTRACTION_ERROR)
def extract(self, targetdir):
if not os.path.isdir(targetdir):
raise OSError('Target directory doesn\'t exist.')
- process = Popen('7z x -y -xr!__MACOSX -xr!.DS_Store -xr!thumbs.db -xr!Thumbs.db -o"' + targetdir + '" "' +
- self.filepath + '"', stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
- process.communicate()
+ process = subprocess.run(['7z', 'x', '-y', '-xr!__MACOSX', '-xr!.DS_Store', '-xr!thumbs.db', '-xr!Thumbs.db', '-o' + targetdir, self.filepath],
+ stdout=PIPE, stderr=STDOUT)
if process.returncode != 0 and distro.id() == 'fedora':
- process = Popen('unrar x -y -x__MACOSX -x.DS_Store -xthumbs.db -xThumbs.db "' + self.filepath + '" "' +
- targetdir + '"', stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
- process.communicate()
+ process = subprocess.run(['unrar', 'x', '-y', '-x__MACOSX', '-x.DS_Store', '-xthumbs.db', '-xThumbs.db', self.filepath, targetdir]
+ , stdout=PIPE, stderr=STDOUT)
if process.returncode != 0:
- raise OSError('Failed to extract archive.')
+ raise OSError(EXTRACTION_ERROR)
elif process.returncode != 0 and platform.system() == 'Darwin':
- process = subprocess.run(f"unar '{self.filepath}' -f -o '{targetdir}'",
- stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
- if process.returncode != 0:
- raise Exception(process.stdout.decode("utf-8"))
+ process = subprocess.run(['unar', self.filepath, '-f', '-o', targetdir],
+ stdout=PIPE, stderr=STDOUT)
elif process.returncode != 0:
- raise OSError('Failed to extract archive. Check if p7zip-rar is installed.')
+ raise OSError(EXTRACTION_ERROR)
tdir = os.listdir(targetdir)
if 'ComicInfo.xml' in tdir:
tdir.remove('ComicInfo.xml')
@@ -78,19 +73,17 @@ class ComicArchive:
def addFile(self, sourcefile):
if self.type in ['RAR', 'RAR5']:
raise NotImplementedError
- process = Popen('7z a -y "' + self.filepath + '" "' + sourcefile + '"',
- stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
- process.communicate()
+ process = subprocess.run(['7z', 'a', '-y', self.filepath, sourcefile],
+ stdout=PIPE, stderr=STDOUT)
if process.returncode != 0:
raise OSError('Failed to add the file.')
def extractMetadata(self):
- process = Popen('7z x -y -so "' + self.filepath + '" ComicInfo.xml',
- stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
- xml = process.communicate()
+ process = subprocess.run(['7z', 'x', '-y', '-so', self.filepath, 'ComicInfo.xml'],
+ stdout=PIPE, stderr=STDOUT)
if process.returncode != 0:
- raise OSError('Failed to extract archive.')
+ raise OSError(EXTRACTION_ERROR)
try:
- return parseString(xml[0])
+ return parseString(process.stdout)
except ExpatError:
return None