3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-07-17 16:47:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

[bin] newNodeType: update

Browse source 
- allow executable with multiple arguments
- force utf8 conversion
- fix typo in help
This commit is contained in:
Fabien Castan 2022-02-22 15:35:37 +01:00
parent 0d6f5211fa
commit 22a2bbdf2a
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
bin/meshroom_newNodeType
View file

@ -5,6 +5,7 @@ import argparse
import os import os
import re import re
import sys import sys
import shlex
from pprint import pprint from pprint import pprint
def trim(s): def trim(s):
@ -60,7 +61,7 @@ parser.add_argument('node', metavar='NODE_NAME', type=str,
help='New node name') help='New node name')
parser.add_argument('bin', metavar='CMDLINE', type=str, parser.add_argument('bin', metavar='CMDLINE', type=str,
default=None, default=None,
help='Output plugin folder') help='Input executable')
parser.add_argument('--output', metavar='DIR', type=str, parser.add_argument('--output', metavar='DIR', type=str,
default=os.path.dirname(__file__), default=os.path.dirname(__file__),
help='Output plugin folder') help='Output plugin folder')
@ -77,7 +78,7 @@ soft = "{nodeType}"
if args.bin: if args.bin:
soft = args.bin soft = args.bin
import subprocess import subprocess
proc = subprocess.Popen(args=[args.bin, '--help'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) proc = subprocess.Popen(args=shlex.split(args.bin) + ['--help'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = proc.communicate() stdout, stderr = proc.communicate()
inputCmdLineDoc = stdout if stdout else stderr inputCmdLineDoc = stdout if stdout else stderr
elif sys.stdin.isatty(): elif sys.stdin.isatty():
@ -137,7 +138,7 @@ choiceValues1_re = re.compile('\* (?P<value>\w+):')
choiceValues2_re = re.compile('\((?P<value>.+?)\)') choiceValues2_re = re.compile('\((?P<value>.+?)\)')
choiceValues3_re = re.compile('\{(?P<value>.+?)\}') choiceValues3_re = re.compile('\{(?P<value>.+?)\}')
cmdLineArgs = args_re.findall(inputCmdLineDoc) cmdLineArgs = args_re.findall(inputCmdLineDoc.decode('utf-8'))
print('='*80) print('='*80)
pprint(cmdLineArgs) pprint(cmdLineArgs)