templates
/
KiBot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplified the scripts installation check. 

Moved names and URLs to constants defined in misc module.
This commit is contained in:
Salvador E. Tropea 2020-03-19 16:58:41 -03:00
parent 6d6a11a02b
commit 46e2a12385
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
kiplot/kiplot.py
View File

@ -44,12 +44,16 @@ def check_version(command, version):
logger.error('Wrong version for `'+command+'` ('+res[0]+'), must be '+version+' or newer.') logger.error('Wrong version for `'+command+'` ('+res[0]+'), must be '+version+' or newer.')
exit(misc.MISSING_TOOL) exit(misc.MISSING_TOOL)
def check_eeschema_do(file): def check_script(cmd, url, version=None):
if which('eeschema_do') is None: if which(cmd) is None:
logger.error('No `eeschema_do` command found.\n' logger.error('No `'+cmd+'` command found.\n'
'Please install it, visit: https://github.com/INTI-CMNB/kicad-automation-scripts') 'Please install it, visit: '+url)
exit(misc.MISSING_TOOL) exit(misc.MISSING_TOOL)
check_version('eeschema_do','1.1.1') if not version is None:
check_version(cmd, version)
def check_eeschema_do(file):
check_script(misc.CMD_EESCHEMA_DO, misc.URL_EESCHEMA_DO, '1.1.1')
sch_file = os.path.splitext(file)[0] + '.sch' sch_file = os.path.splitext(file)[0] + '.sch'
if not os.path.isfile(sch_file): if not os.path.isfile(sch_file):
logger.error('Missing schematic file: ' + sch_file) logger.error('Missing schematic file: ' + sch_file)
@ -145,7 +149,7 @@ class Plotter(object):
def _run_erc(self, brd_file): def _run_erc(self, brd_file):
sch_file = check_eeschema_do(brd_file) sch_file = check_eeschema_do(brd_file)
cmd = ['eeschema_do', 'run_erc', sch_file, '.'] cmd = [misc.CMD_EESCHEMA_DO, 'run_erc', sch_file, '.']
# If we are in verbose mode enable debug in the child # If we are in verbose mode enable debug in the child
if logger.getEffectiveLevel() <= logging.DEBUG: if logger.getEffectiveLevel() <= logging.DEBUG:
cmd.insert(1, '-vv') cmd.insert(1, '-vv')
@ -162,7 +166,7 @@ class Plotter(object):
def _update_xml(self, brd_file): def _update_xml(self, brd_file):
sch_file = check_eeschema_do(brd_file) sch_file = check_eeschema_do(brd_file)
cmd = ['eeschema_do', 'bom_xml', sch_file, '.'] cmd = [misc.CMD_EESCHEMA_DO, 'bom_xml', sch_file, '.']
# If we are in verbose mode enable debug in the child # If we are in verbose mode enable debug in the child
if logger.getEffectiveLevel() <= logging.DEBUG: if logger.getEffectiveLevel() <= logging.DEBUG:
cmd.insert(1, '-vv') cmd.insert(1, '-vv')
@ -175,12 +179,8 @@ class Plotter(object):
exit(misc.BOM_ERROR) exit(misc.BOM_ERROR)
def _run_drc(self, brd_file, ignore_unconnected, check_zone_fills): def _run_drc(self, brd_file, ignore_unconnected, check_zone_fills):
if which('pcbnew_run_drc') is None: check_script(misc.CMD_PCBNEW_RUN_DRC, misc.URL_PCBNEW_RUN_DRC, '1.1.0')
logger.error('No `pcbnew_run_drc` command found.\n' cmd = [misc.CMD_PCBNEW_RUN_DRC, brd_file, '.']
'Please install it, visit: https://github.com/INTI-CMNB/kicad-automation-scripts')
exit(misc.MISSING_TOOL)
check_version('pcbnew_run_drc','1.1.0')
cmd = ['pcbnew_run_drc', brd_file, '.']
# If we are in verbose mode enable debug in the child # If we are in verbose mode enable debug in the child
if logger.getEffectiveLevel() <= logging.DEBUG: if logger.getEffectiveLevel() <= logging.DEBUG:
cmd.insert(1, '-vv') cmd.insert(1, '-vv')
@ -543,10 +543,7 @@ class Plotter(object):
self._do_ibom(board, plot_ctrl, output, brd_file) self._do_ibom(board, plot_ctrl, output, brd_file)
def _do_kibom(self, board, plot_ctrl, output, brd_file): def _do_kibom(self, board, plot_ctrl, output, brd_file):
if which('KiBOM_CLI.py') is None: check_script(misc.CMD_KIBOM,misc.URL_KIBOM)
logger.error('No `KiBOM_CLI.py` command found.\n'
'Please install it, visit: https://github.com/INTI-CMNB/KiBoM')
exit(misc.MISSING_TOOL)
to = output.options.type_options to = output.options.type_options
format = to.format.lower() format = to.format.lower()
outdir = plot_ctrl.GetPlotOptions().GetOutputDirectory() outdir = plot_ctrl.GetPlotOptions().GetOutputDirectory()
@ -554,7 +551,7 @@ class Plotter(object):
os.makedirs(outdir) os.makedirs(outdir)
prj = os.path.splitext(os.path.relpath(brd_file))[0] prj = os.path.splitext(os.path.relpath(brd_file))[0]
logger.debug('Doing BoM, format '+format+' prj: '+prj) logger.debug('Doing BoM, format '+format+' prj: '+prj)
cmd = [ 'KiBOM_CLI.py', prj+'.xml', os.path.join(outdir, prj)+'.'+format ] cmd = [ misc.CMD_KIBOM, prj+'.xml', os.path.join(outdir, prj)+'.'+format ]
logger.debug('Running: '+str(cmd)) logger.debug('Running: '+str(cmd))
try: try:
check_output(cmd, stderr=STDOUT) check_output(cmd, stderr=STDOUT)
@ -563,16 +560,13 @@ class Plotter(object):
exit(misc.BOM_ERROR) exit(misc.BOM_ERROR)
def _do_ibom(self, board, plot_ctrl, output, brd_file): def _do_ibom(self, board, plot_ctrl, output, brd_file):
if which('generate_interactive_bom.py') is None: check_script(misc.CMD_IBOM,misc.URL_IBOM)
logger.error('No `generate_interactive_bom.py` command found.\n'
'Please install it, visit: https://github.com/INTI-CMNB/InteractiveHtmlBom')
exit(misc.MISSING_TOOL)
outdir = plot_ctrl.GetPlotOptions().GetOutputDirectory() outdir = plot_ctrl.GetPlotOptions().GetOutputDirectory()
if not os.path.exists(outdir): if not os.path.exists(outdir):
os.makedirs(outdir) os.makedirs(outdir)
prj = os.path.splitext(os.path.relpath(brd_file))[0] prj = os.path.splitext(os.path.relpath(brd_file))[0]
logger.debug('Doing Interactive BoM, prj: '+prj) logger.debug('Doing Interactive BoM, prj: '+prj)
cmd = [ 'generate_interactive_bom.py', brd_file, cmd = [ misc.CMD_IBOM, brd_file,
'--dest-dir', outdir, '--dest-dir', outdir,
'--no-browser', ] '--no-browser', ]
to = output.options.type_options to = output.options.type_options

9
kiplot/misc.py
View File

@ -14,4 +14,11 @@ NO_SCH_FILE = 9
ERC_ERROR = 10 ERC_ERROR = 10
BOM_ERROR = 11 BOM_ERROR = 11
CMD_EESCHEMA_DO = 'eeschema_do'
URL_EESCHEMA_DO = 'https://github.com/INTI-CMNB/kicad-automation-scripts'
CMD_PCBNEW_RUN_DRC = 'pcbnew_run_drc'
URL_PCBNEW_RUN_DRC = URL_EESCHEMA_DO
CMD_KIBOM = 'KiBOM_CLI.py'
URL_KIBOM = 'https://github.com/INTI-CMNB/KiBoM'
CMD_IBOM = 'generate_interactive_bom.py'
URL_IBOM = 'https://github.com/INTI-CMNB/InteractiveHtmlBom'