From 6baacd9b899ef00a6472209532a2c9ce318d4d94 Mon Sep 17 00:00:00 2001 From: yrriban Date: Fri, 13 Jun 2025 02:05:52 -0400 Subject: [PATCH] PEP 8 compliance. --- dcc/doom_base.py | 52 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/dcc/doom_base.py b/dcc/doom_base.py index 74a77bc..48d411a 100644 --- a/dcc/doom_base.py +++ b/dcc/doom_base.py @@ -6,6 +6,7 @@ import os import re import tomlkit + class Wad(dcc.config.Base): def get_parser(self, prog_name): parser = super().get_parser(prog_name) @@ -33,7 +34,7 @@ class WadMap(Wad): def get_parser(self, prog_name): parser = super().get_parser(prog_name) parser.add_argument('map') - parser.add_argument('-n','--name','--demo_name') + parser.add_argument('-n', '--name', '--demo_name') return parser def run(self, parsed_args): @@ -46,7 +47,7 @@ class WadMap(Wad): @property def map(self): return self._map - + @property def name_string(self): return "" if self._name is None else "_" + self._name @@ -80,36 +81,63 @@ class WadMap(Wad): return f.read().strip() 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: - 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: 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): - 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): - 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): - 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): return "doom/" + self._file_base(".lmp") 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): - 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): - 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): - 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): return "{}_map{}{}{}".format(self.wad, self.map, self.name_string, ext)