Added error checking functionality.
If anything is causing the export button not to function, the field will now be highlighted in red.
This commit is contained in:
parent
e011739b92
commit
5dc3fdd3ea
2 changed files with 86 additions and 6 deletions
|
|
@ -16,6 +16,8 @@ import tarfile
|
||||||
import zipfile
|
import zipfile
|
||||||
import traceback
|
import traceback
|
||||||
import subprocess
|
import subprocess
|
||||||
|
import logging
|
||||||
|
import plistlib
|
||||||
|
|
||||||
from distutils.version import LooseVersion
|
from distutils.version import LooseVersion
|
||||||
|
|
||||||
|
|
@ -27,8 +29,6 @@ try:
|
||||||
except ImportError:
|
except ImportError:
|
||||||
from StringIO import StringIO
|
from StringIO import StringIO
|
||||||
|
|
||||||
import plistlib
|
|
||||||
|
|
||||||
from configobj import ConfigObj
|
from configobj import ConfigObj
|
||||||
|
|
||||||
inside_packed_exe = getattr(sys, 'frozen', '')
|
inside_packed_exe = getattr(sys, 'frozen', '')
|
||||||
|
|
@ -40,6 +40,24 @@ DEFAULT_DOWNLOAD_PATH = os.path.join(CWD,
|
||||||
'files',
|
'files',
|
||||||
'downloads').replace('\\',
|
'downloads').replace('\\',
|
||||||
'\\\\')
|
'\\\\')
|
||||||
|
if __name__ != '__main__':
|
||||||
|
logging.basicConfig(
|
||||||
|
filename=os.path.join(CWD, 'files', 'error.log'),
|
||||||
|
format=("%(levelname) -10s %(asctime)s %(module)s.py: "
|
||||||
|
"%(lineno)s %(funcName)s - %(message)s"),
|
||||||
|
level=logging.DEBUG
|
||||||
|
)
|
||||||
|
logger = logging.getLogger('W2E logger')
|
||||||
|
|
||||||
|
|
||||||
|
def my_excepthook(type_, value, tback):
|
||||||
|
output_err = ''.join(traceback.format_exception(type_, value, tback))
|
||||||
|
logger.error('{}'.format(output_err))
|
||||||
|
sys.__excepthook__(type_, value, tback)
|
||||||
|
|
||||||
|
sys.excepthook = my_excepthook
|
||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
os.makedirs(DEFAULT_DOWNLOAD_PATH)
|
os.makedirs(DEFAULT_DOWNLOAD_PATH)
|
||||||
except:
|
except:
|
||||||
|
|
@ -227,6 +245,7 @@ class Setting(object):
|
||||||
class CommandBase(object):
|
class CommandBase(object):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.quiet = False
|
self.quiet = False
|
||||||
|
self.logger = None
|
||||||
self.output_package_json = True
|
self.output_package_json = True
|
||||||
self.settings = self.get_settings()
|
self.settings = self.get_settings()
|
||||||
self._project_dir = ''
|
self._project_dir = ''
|
||||||
|
|
@ -832,6 +851,10 @@ if __name__ == '__main__':
|
||||||
parser.add_argument('--quiet', dest='quiet', action='store_true',
|
parser.add_argument('--quiet', dest='quiet', action='store_true',
|
||||||
default=False,
|
default=False,
|
||||||
help='Silences output messages')
|
help='Silences output messages')
|
||||||
|
parser.add_argument('--verbose', dest='verbose', action='store_true',
|
||||||
|
default=False,
|
||||||
|
help=('Prints debug errors and messages instead '
|
||||||
|
'of logging to files/errors.log'))
|
||||||
parser.add_argument('--package-json',
|
parser.add_argument('--package-json',
|
||||||
dest='load_json',
|
dest='load_json',
|
||||||
nargs='?',
|
nargs='?',
|
||||||
|
|
@ -880,6 +903,24 @@ if __name__ == '__main__':
|
||||||
|
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
if args.verbose:
|
||||||
|
logging.basicConfig(
|
||||||
|
stream=sys.stdout,
|
||||||
|
format=("%(levelname) -10s %(asctime)s %(module)s.py: "
|
||||||
|
"%(lineno)s %(funcName)s - %(message)s"),
|
||||||
|
level=logging.DEBUG
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
logging.basicConfig(
|
||||||
|
filename=os.path.join(CWD, 'files', 'error.log'),
|
||||||
|
format=("%(levelname) -10s %(asctime)s %(module)s.py: "
|
||||||
|
"%(lineno)s %(funcName)s - %(message)s"),
|
||||||
|
level=logging.DEBUG
|
||||||
|
)
|
||||||
|
|
||||||
|
logger = logging.getLogger('CMD Logger')
|
||||||
|
command_base.logger = logger
|
||||||
|
|
||||||
if args.quiet:
|
if args.quiet:
|
||||||
command_base.quiet = True
|
command_base.quiet = True
|
||||||
|
|
||||||
|
|
|
||||||
47
main.py
47
main.py
|
|
@ -53,6 +53,7 @@ class MainWindow(QtGui.QWidget, CommandBase):
|
||||||
def __init__(self, width, height, parent=None):
|
def __init__(self, width, height, parent=None):
|
||||||
super(MainWindow, self).__init__(parent)
|
super(MainWindow, self).__init__(parent)
|
||||||
CommandBase.__init__(self)
|
CommandBase.__init__(self)
|
||||||
|
self.options_enabled = False
|
||||||
self.output_package_json = True
|
self.output_package_json = True
|
||||||
self.setWindowIcon(QtGui.QIcon(os.path.join(CWD, 'files',
|
self.setWindowIcon(QtGui.QIcon(os.path.join(CWD, 'files',
|
||||||
'images', 'icon.png')))
|
'images', 'icon.png')))
|
||||||
|
|
@ -115,6 +116,7 @@ class MainWindow(QtGui.QWidget, CommandBase):
|
||||||
self.win_settings_widget.setEnabled(is_enabled)
|
self.win_settings_widget.setEnabled(is_enabled)
|
||||||
self.ex_settings_widget.setEnabled(is_enabled)
|
self.ex_settings_widget.setEnabled(is_enabled)
|
||||||
self.dl_settings_widget.setEnabled(is_enabled)
|
self.dl_settings_widget.setEnabled(is_enabled)
|
||||||
|
self.options_enabled = is_enabled
|
||||||
|
|
||||||
def export(self, export_button, cancel_button):
|
def export(self, export_button, cancel_button):
|
||||||
self.get_files_to_download()
|
self.get_files_to_download()
|
||||||
|
|
@ -159,13 +161,23 @@ class MainWindow(QtGui.QWidget, CommandBase):
|
||||||
self.option_settings_enabled(True)
|
self.option_settings_enabled(True)
|
||||||
self.directory_chooser_widget.setEnabled(True)
|
self.directory_chooser_widget.setEnabled(True)
|
||||||
|
|
||||||
def required_settings_filled(self):
|
def required_settings_filled(self, ignore_options=False):
|
||||||
|
if not self.options_enabled and not ignore_options:
|
||||||
|
return False
|
||||||
|
|
||||||
proj_dir = self.project_dir()
|
proj_dir = self.project_dir()
|
||||||
out_dir = self.output_dir()
|
out_dir = self.output_dir()
|
||||||
|
|
||||||
|
valid_proj_dirs = False
|
||||||
|
|
||||||
if proj_dir and out_dir:
|
if proj_dir and out_dir:
|
||||||
if os.path.exists(proj_dir):
|
if os.path.exists(proj_dir):
|
||||||
valid_proj_dirs = True
|
valid_proj_dirs = True
|
||||||
|
self.input_line.setStyleSheet('')
|
||||||
|
self.input_line.setToolTip('')
|
||||||
|
else:
|
||||||
|
self.input_line.setStyleSheet('QLineEdit{border:3px solid rgba(238, 68, 83, 200); border-radius:5px;}')
|
||||||
|
self.input_line.setToolTip('The project directory does not exist.')
|
||||||
|
|
||||||
settings_valid = True
|
settings_valid = True
|
||||||
for sgroup in self.settings['setting_groups']:
|
for sgroup in self.settings['setting_groups']:
|
||||||
|
|
@ -174,24 +186,51 @@ class MainWindow(QtGui.QWidget, CommandBase):
|
||||||
str(setting.value))
|
str(setting.value))
|
||||||
|
|
||||||
if setting.required and not setting.value:
|
if setting.required and not setting.value:
|
||||||
return False
|
settings_valid = False
|
||||||
|
widget = self.find_child_by_name(setting.name)
|
||||||
|
if widget is not None:
|
||||||
|
widget.setStyleSheet('QLineEdit{border:3px solid rgba(238, 68, 83, 200); border-radius:5px;}')
|
||||||
|
widget.setToolTip('This setting is required.')
|
||||||
|
|
||||||
if (setting.type == 'file' and
|
if (setting.type == 'file' and
|
||||||
setting.value and
|
setting.value and
|
||||||
not os.path.exists(setting_path)):
|
not os.path.exists(setting_path)):
|
||||||
log(setting.value, "does not exist")
|
log(setting.value, "does not exist")
|
||||||
settings_valid = False
|
settings_valid = False
|
||||||
|
widget = self.find_child_by_name(setting.name)
|
||||||
|
if widget is not None:
|
||||||
|
widget.setStyleSheet('QLineEdit{border:3px solid rgba(238, 68, 83, 200); border-radius:5px;}')
|
||||||
|
widget.setToolTip('The file "{}" does not exist.'.format(os.path.join(self.project_dir(),setting.value)))
|
||||||
|
|
||||||
if (setting.type == 'folder' and
|
if (setting.type == 'folder' and
|
||||||
setting.value and
|
setting.value and
|
||||||
not os.path.exists(setting_path)):
|
not os.path.exists(setting_path)):
|
||||||
settings_valid = False
|
settings_valid = False
|
||||||
|
widget = self.find_child_by_name(setting.name)
|
||||||
|
if widget is not None:
|
||||||
|
widget.setStyleSheet('QLineEdit{border:3px solid rgba(238, 68, 83, 200); border-radius:5px;}')
|
||||||
|
widget.setToolTip('The folder "{}" does not exist'.format(os.path.join(self.project_dir(), setting.value)))
|
||||||
|
if settings_valid:
|
||||||
|
widget = self.find_child_by_name(setting.name)
|
||||||
|
widget.setStyleSheet('')
|
||||||
|
widget.setToolTip('')
|
||||||
|
|
||||||
export_chosen = False
|
export_chosen = False
|
||||||
for setting_name, setting in self.settings['export_settings'].items():
|
for setting_name, setting in self.settings['export_settings'].items():
|
||||||
if setting.value:
|
if setting.value:
|
||||||
export_chosen = True
|
export_chosen = True
|
||||||
|
|
||||||
|
for setting_name, setting in self.settings['export_settings'].items():
|
||||||
|
if not export_chosen:
|
||||||
|
widget = self.find_child_by_name(setting.name)
|
||||||
|
if widget is not None:
|
||||||
|
widget.setStyleSheet('QCheckBox{border:3px solid rgba(238, 68, 83, 200); border-radius:5px;}')
|
||||||
|
widget.setToolTip('At least one of these options should be selected.')
|
||||||
|
else:
|
||||||
|
widget = self.find_child_by_name(setting.name)
|
||||||
|
widget.setStyleSheet('')
|
||||||
|
widget.setToolTip('')
|
||||||
|
|
||||||
return export_chosen and valid_proj_dirs and settings_valid
|
return export_chosen and valid_proj_dirs and settings_valid
|
||||||
|
|
||||||
def project_dir(self):
|
def project_dir(self):
|
||||||
|
|
@ -754,8 +793,8 @@ class MainWindow(QtGui.QWidget, CommandBase):
|
||||||
|
|
||||||
self.ex_button.setEnabled(self.required_settings_filled())
|
self.ex_button.setEnabled(self.required_settings_filled())
|
||||||
|
|
||||||
def project_path_changed(self):
|
def project_path_changed(self, text):
|
||||||
self.ex_button.setEnabled(self.required_settings_filled())
|
self.ex_button.setEnabled(self.required_settings_filled(True))
|
||||||
|
|
||||||
dirs_filled_out = False
|
dirs_filled_out = False
|
||||||
if self.project_dir() and self.output_dir():
|
if self.project_dir() and self.output_dir():
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue