jyapayne/Electrify
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Attempted to fix no output for windows.

Browse source
This commit is contained in:
Joey Payne 2015-11-10 13:45:02 -07:00
commit cf1c55d30f
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
command_line.py
View file

@ -48,6 +48,8 @@ except ImportError:
from configobj import ConfigObj from configobj import ConfigObj
COMMAND_LINE = True
inside_packed_exe = getattr(sys, 'frozen', '') inside_packed_exe = getattr(sys, 'frozen', '')
if inside_packed_exe: if inside_packed_exe:
@ -498,7 +500,7 @@ class CommandBase(object):
@extract_error.setter @extract_error.setter
def extract_error(self, value): def extract_error(self, value):
if value is not None and not self.quiet and not inside_packed_exe: if value is not None and not self.quiet and COMMAND_LINE:
self._extract_error = unicode(value) self._extract_error = unicode(value)
sys.stderr.write(u'\r{}'.format(self._extract_error)) sys.stderr.write(u'\r{}'.format(self._extract_error))
sys.stderr.flush() sys.stderr.flush()
@ -509,7 +511,7 @@ class CommandBase(object):
@output_err.setter @output_err.setter
def output_err(self, value): def output_err(self, value):
if value is not None and not self.quiet and not inside_packed_exe: if value is not None and not self.quiet and COMMAND_LINE:
self._output_err = unicode(value) self._output_err = unicode(value)
sys.stderr.write(u'\r{}'.format(self._output_err)) sys.stderr.write(u'\r{}'.format(self._output_err))
sys.stderr.flush() sys.stderr.flush()
@ -520,7 +522,7 @@ class CommandBase(object):
@progress_text.setter @progress_text.setter
def progress_text(self, value): def progress_text(self, value):
if value is not None and not self.quiet and not inside_packed_exe: if value is not None and not self.quiet and COMMAND_LINE:
self._progress_text = unicode(value) self._progress_text = unicode(value)
sys.stdout.write(u'\r{}'.format(self._progress_text)) sys.stdout.write(u'\r{}'.format(self._progress_text))
sys.stdout.flush() sys.stdout.flush()

2
main.py
View file

@ -21,6 +21,8 @@ from command_line import __version__ as __gui_version__
from utils import get_data_path, get_data_file_path from utils import get_data_path, get_data_file_path
import utils import utils
COMMAND_LINE = False
MAX_RECENT = 10 MAX_RECENT = 10
def url_exists(path): def url_exists(path):