1
0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-19 01:27:40 +00:00

Refactor subprocess calls

This commit is contained in:
Ozzieisaacs
2019-02-03 18:32:27 +01:00
parent 7f34073955
commit 36229076f7
5 changed files with 71 additions and 28 deletions

View File

@@ -22,7 +22,6 @@
import db
import ub
from flask import current_app as app
# import logging
from tempfile import gettempdir
import sys
import os
@@ -36,18 +35,15 @@ from flask_babel import gettext as _
from flask_login import current_user
from babel.dates import format_datetime
from datetime import datetime
# import threading
import shutil
import requests
# import zipfile
try:
import gdriveutils as gd
except ImportError:
pass
import web
# import server
import random
import subprocess
from subproc_wrapper import process_open
try:
import unidecode
@@ -496,7 +492,7 @@ def check_unrar(unrarLocation):
try:
if sys.version_info < (3, 0):
unrarLocation = unrarLocation.encode(sys.getfilesystemencoding())
p = subprocess.Popen(unrarLocation, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
p = process_open(unrarLocation)
p.wait()
for lines in p.stdout.readlines():
if isinstance(lines, bytes):