Removed some whitespace, minor optimizations
parent
1b7df6e3b2
commit
5f961b7460
|
@ -15,7 +15,7 @@ import os
|
||||||
import argparse
|
import argparse
|
||||||
from tempfile import NamedTemporaryFile
|
from tempfile import NamedTemporaryFile
|
||||||
import yaml
|
import yaml
|
||||||
from platform import system as getOS, release
|
from platform import system as OSName, OSRelease
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import winreg
|
import winreg
|
||||||
|
@ -63,13 +63,13 @@ def writeOutput(data, className) -> dict:
|
||||||
print( f'DEBUG: need {filesNeeded} files for {className}', file=sys.stderr)
|
print( f'DEBUG: need {filesNeeded} files for {className}', file=sys.stderr)
|
||||||
|
|
||||||
FilNedLen = len(str(filesNeeded))
|
FilNedLen = len(str(filesNeeded))
|
||||||
|
reservedSpace = len(f'{className}_script_{filesNeeded}.cfg') + 4
|
||||||
|
|
||||||
|
# Initialize variables
|
||||||
|
outfile = NamedTemporaryFile(prefix=className, delete=False)
|
||||||
# I know % formatting is old-school and pylint hates it,
|
# I know % formatting is old-school and pylint hates it,
|
||||||
# but "%*d" is the easiest way to left-pad with zeros
|
# but "%*d" is the easiest way to left-pad with zeros
|
||||||
# without hardcoding a number. The extra 4 bytes is just some leeway
|
# without hardcoding a number. The extra 4 bytes is just some leeway
|
||||||
reservedSpace = len('%s_script_%0*d.cfg' % (className, FilNedLen, fileNum)) + 4
|
|
||||||
|
|
||||||
# Initialize the variables
|
|
||||||
outfile = NamedTemporaryFile(prefix=className, delete=False)
|
|
||||||
namesDict.update({ outfile.name: '%s_script_%0*d.cfg' % (className, FilNedLen, fileNum) })
|
namesDict.update({ outfile.name: '%s_script_%0*d.cfg' % (className, FilNedLen, fileNum) })
|
||||||
|
|
||||||
while (fileNum <= filesNeeded and len(lineList) > 0):
|
while (fileNum <= filesNeeded and len(lineList) > 0):
|
||||||
|
@ -77,7 +77,7 @@ def writeOutput(data, className) -> dict:
|
||||||
lineLen = len(line) # nice
|
lineLen = len(line) # nice
|
||||||
|
|
||||||
if bytesWritten + reservedSpace + lineLen > maxFileSize:
|
if bytesWritten + reservedSpace + lineLen > maxFileSize:
|
||||||
outfile.write( ('exec %s_script_%0*d' % (className, FilNedLen, fileNum)).encode('utf8') )
|
outfile.write( ('exec %s_script_%0*d' % (className, FilNedLen, fileNum+1)).encode('utf8') )
|
||||||
bytesWritten += reservedSpace
|
bytesWritten += reservedSpace
|
||||||
if args.debug:
|
if args.debug:
|
||||||
print( f'DEBUG: Wrote {bytesWritten} bytes to {className} ({fileNum}/{filesNeeded})', file=sys.stderr)
|
print( f'DEBUG: Wrote {bytesWritten} bytes to {className} ({fileNum}/{filesNeeded})', file=sys.stderr)
|
||||||
|
@ -106,7 +106,7 @@ def parseConfig(config):
|
||||||
if os.path.isdir(targetDir) == False:
|
if os.path.isdir(targetDir) == False:
|
||||||
os.mkdir(targetDir)
|
os.mkdir(targetDir)
|
||||||
if args.debug:
|
if args.debug:
|
||||||
print(f"DEBUG: Created", file=sys.stderr)
|
print( f"DEBUG: Created directory {targetDir}", file=sys.stderr)
|
||||||
|
|
||||||
tempsAndReals = {}
|
tempsAndReals = {}
|
||||||
|
|
||||||
|
@ -144,9 +144,7 @@ def parseCLI():
|
||||||
return parser
|
return parser
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
"""
|
""" Command line interface. """
|
||||||
Command line interface.
|
|
||||||
"""
|
|
||||||
global args
|
global args
|
||||||
global targetDir
|
global targetDir
|
||||||
parser = parseCLI()
|
parser = parseCLI()
|
||||||
|
@ -155,9 +153,9 @@ def main():
|
||||||
if args.directory is not None:
|
if args.directory is not None:
|
||||||
targetDir = args.directory
|
targetDir = args.directory
|
||||||
else:
|
else:
|
||||||
systemName = getOS()
|
systemName = OSName()
|
||||||
if systemName == "Darwin":
|
if systemName == "Darwin":
|
||||||
if float( '.'.join(release().split('.')[0:2]) ) >= 10.15:
|
if float( '.'.join(OSRelease().split('.')[0:2]) ) >= 10.15:
|
||||||
if not args.force:
|
if not args.force:
|
||||||
print(
|
print(
|
||||||
"As of macOS Catalina (v10.15), 32-bit applications "
|
"As of macOS Catalina (v10.15), 32-bit applications "
|
||||||
|
|
Loading…
Reference in New Issue