Skip to content

add options to specify output paths for some files #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndrewShkrob wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add options to specify output paths for some files #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions src/libkomwm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ def komap_mapswithme(options):
class_tree = {}

# TODO: Introduce new function to parse `colors.txt` for better testability
colors_file_name = os.path.join(ddir, 'colors.txt')
colors_file_name = options.outfile_colors if options.outfile_colors else os.path.join(ddir, 'colors.txt')
colors = set()
if os.path.exists(colors_file_name):
colors_in_file = open(colors_file_name, "r")
Expand All @@ -485,7 +485,7 @@ def addPattern(dashes):
if dashes and dashes not in patterns:
patterns.append(dashes)

patterns_file_name = os.path.join(ddir, 'patterns.txt')
patterns_file_name = options.outfile_patterns if options.outfile_patterns else os.path.join(ddir, 'patterns.txt')
if os.path.exists(patterns_file_name):
patterns_in_file = open(patterns_file_name, "r")
for patternsLine in patterns_in_file:
Expand Down Expand Up @@ -907,14 +907,14 @@ def rule_sort_key(dict_):

# Write drules_proto.bin and drules_proto.txt files

drules_bin = open(os.path.join(options.outfile + '.bin'), "wb")
drules_bin = open(os.path.join(options.outfile), "wb")
drules_bin.write(drules.SerializeToString())
drules_bin.close()

if options.txt:
drules_txt = open(os.path.join(options.outfile + '.txt'), "wb")
drules_txt.write(str(drules).encode())
drules_txt.close()
if options.outfile_dump:
drules_dump = open(os.path.join(options.outfile_dump), "wb")
drules_dump.write(str(drules).encode())
drules_dump.close()

# Write classificator.txt and visibility.txt files

Expand Down Expand Up @@ -981,8 +981,12 @@ def main():
help="maximal available zoom level", metavar="ZOOM")
parser.add_option("-o", "--output-file", dest="outfile", default="-",
help="output filename", metavar="FILE")
parser.add_option("-x", "--txt", dest="txt", action="store_true",
help="create a text file for output", default=False)
parser.add_option("--output-file-dump", dest="outfile_dump", default=None,
help="path for output file dump", metavar="FILE")
parser.add_option("--output-file-colors", dest="outfile_colors", default=None,
help="path for output colors file", metavar="FILE")
parser.add_option("--output-file-patterns", dest="outfile_patterns", default=None,
help="path for output patterns file", metavar="FILE")
parser.add_option("-p", "--priorities-path", dest="priorities_path",
help="path to priorities *.prio.txt files", metavar="PATH")
parser.add_option("-d", "--data-path", dest="data",
Expand Down