yrriban/dcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tabs to spaces; purge some commented-out code.

Browse source
This commit is contained in:
yrriban 2025-06-13 01:52:57 -04:00
parent b29e2675d1
commit 3fde5791a3
1 changed files with 82 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

164
dcc/doom_base.py
View file

@ -7,113 +7,111 @@ import re
import tomlkit import tomlkit
class Wad(dcc.config.Base): class Wad(dcc.config.Base):
def get_parser(self, prog_name): def get_parser(self, prog_name):
parser = super().get_parser(prog_name) parser = super().get_parser(prog_name)
parser.add_argument('wad') parser.add_argument('wad')
return parser return parser
def wad_init(self, parsed_args): def wad_init(self, parsed_args):
self.init_base(parsed_args) self.init_base(parsed_args)
self._wad = parsed_args.wad self._wad = parsed_args.wad
wcp = self.pwads.joinpath(self.wad).joinpath(self.config_name) wcp = self.pwads.joinpath(self.wad).joinpath(self.config_name)
if wcp.exists(): if wcp.exists():
self._wad_config = tomlkit.toml_file.TOMLFile(wcp).read() self._wad_config = tomlkit.toml_file.TOMLFile(wcp).read()
self._config.update(self._wad_config.value) self._config.update(self._wad_config.value)
#for k,v in self._wad_config.value.items():
#self._config.add(k,v)
def run(self, parsed_args): def run(self, parsed_args):
self.wad_init(parsed_args) self.wad_init(parsed_args)
self.take_action(parsed_args) self.take_action(parsed_args)
@property @property
def wad(self): def wad(self):
return self._wad return self._wad
class WadMap(Wad): class WadMap(Wad):
def get_parser(self, prog_name): def get_parser(self, prog_name):
parser = super().get_parser(prog_name) parser = super().get_parser(prog_name)
parser.add_argument('map') parser.add_argument('map')
parser.add_argument('-n','--name','--demo_name') parser.add_argument('-n','--name','--demo_name')
return parser return parser
def run(self, parsed_args): def run(self, parsed_args):
self._map = parsed_args.map self._map = parsed_args.map
self._name = parsed_args.name self._name = parsed_args.name
self.wad_init(parsed_args) self.wad_init(parsed_args)
self.take_action(parsed_args) self.take_action(parsed_args)
@property @property
def map(self): def map(self):
return self._map return self._map
@property @property
def name_string(self): def name_string(self):
return "" if self._name is None else "_" + self._name return "" if self._name is None else "_" + self._name
def dsda_preamble(self): def dsda_preamble(self):
args = ["-iwad", self.iwad_path(self.wad)] args = ["-iwad", self.iwad_path(self.wad)]
pwadpath = self.pwads.joinpath(self.wad) pwadpath = self.pwads.joinpath(self.wad)
wads = sorted(pwadpath.glob('*.wad', case_sensitive=False)) wads = sorted(pwadpath.glob('*.wad', case_sensitive=False))
if len(wads) > 0: if len(wads) > 0:
args = args + ["-file"] + wads args = args + ["-file"] + wads
dehs = sorted(pwadpath.glob('*.deh', case_sensitive=False)) dehs = sorted(pwadpath.glob('*.deh', case_sensitive=False))
if len(dehs) > 0: if len(dehs) > 0:
args = args + ["-deh"] + dehs args = args + ["-deh"] + dehs
args = args + ["-complevel", self.complevel()] args = args + ["-complevel", self.complevel()]
args = args + ["-skill", "4"] args = args + ["-skill", "4"]
args = args + ["-warp", self.map] args = args + ["-warp", self.map]
return args return args
def complevel(self): def complevel(self):
complevel = self.pwads.joinpath(self.wad).joinpath("complevel") complevel = self.pwads.joinpath(self.wad).joinpath("complevel")
if not complevel.exists(): if not complevel.exists():
raise Exception("No complevel set for wad {}.".format(self.wad)) raise Exception("No complevel set for wad {}.".format(self.wad))
with io.open(complevel) as f: with io.open(complevel) as f:
return f.read().strip() return f.read().strip()
def demo_in_path(self): def demo_in_path(self):
candidates = [x for x in self.demos.joinpath(self.wad).glob(self._file_base("*.lmp"))] candidates = [x for x in self.demos.joinpath(self.wad).glob(self._file_base("*.lmp"))]
if len(candidates) == 0: if len(candidates) == 0:
raise Exception("no suitable demo candidates for WAD {} MAP {} name {}.".format(self.wad, self.map, self.name_string)) raise Exception("no suitable demo candidates for WAD {} MAP {} name {}.".format(self.wad, self.map, self.name_string))
if len(candidates) == 1: if len(candidates) == 1:
return candidates[0] return candidates[0]
return sorted(filter(lambda s : re.search("-", str(s)), candidates))[-1] return sorted(filter(lambda s : re.search("-", str(s)), candidates))[-1]
def dsda_text_path(self): def dsda_text_path(self):
return self._ensure(self.demos.joinpath(self.wad)).joinpath(self._file_base(".txt")) return self._ensure(self.demos.joinpath(self.wad)).joinpath(self._file_base(".txt"))
def video_path(self): def video_path(self):
return self._ensure(self.fabricate.joinpath(self.wad)).joinpath(self._file_base(".mp4")) return self._ensure(self.fabricate.joinpath(self.wad)).joinpath(self._file_base(".mp4"))
def demo_out_path(self): def demo_out_path(self):
return self._ensure(self.demos.joinpath(self.wad)).joinpath(self._file_base(".lmp")) return self._ensure(self.demos.joinpath(self.wad)).joinpath(self._file_base(".lmp"))
def target_bucket(self): def target_bucket(self):
return "doom/" + self._file_base(".lmp") return "doom/" + self._file_base(".lmp")
def base_thumb_path(self): def base_thumb_path(self):
return self._ensure(self.fabricate.joinpath(self.wad)).joinpath(self._file_base("_base.png")) return self._ensure(self.fabricate.joinpath(self.wad)).joinpath(self._file_base("_base.png"))
def m_doom_path(self): def m_doom_path(self):
return self._ensure(self.fabricate.joinpath(self.wad)).joinpath("M_DOOM_scaled.png") return self._ensure(self.fabricate.joinpath(self.wad)).joinpath("M_DOOM_scaled.png")
def text_thumb_path(self): def text_thumb_path(self):
return self._ensure(self.fabricate.joinpath(self.wad)).joinpath(self._file_base("_text.png")) return self._ensure(self.fabricate.joinpath(self.wad)).joinpath(self._file_base("_text.png"))
def thumb_path(self): def thumb_path(self):
return self._ensure(self.fabricate.joinpath(self.wad)).joinpath(self._file_base("_thumb.png")) return self._ensure(self.fabricate.joinpath(self.wad)).joinpath(self._file_base("_thumb.png"))
def _file_base(self, ext): def _file_base(self, ext):
return "{}_map{}{}{}".format(self.wad, self.map, self.name_string, ext) return "{}_map{}{}{}".format(self.wad, self.map, self.name_string, ext)
def _ensure(self, path): def _ensure(self, path):
if not path.exists(): if not path.exists():
os.mkdir(path) os.mkdir(path)
return path return path