diff --git a/dcc/config.py b/dcc/config.py index ae2487a..03243b6 100644 --- a/dcc/config.py +++ b/dcc/config.py @@ -28,6 +28,7 @@ class ConfigBase(object): self._init_attr(["thumbnail", "font"], None) self._init_attr(["thumbnail", "text_fill"], "white") self._init_attr(["thumbnail", "text_stroke"], "red") + self._init_attr(["thumbnail", "overlay_name"], "M_DOOM_scaled.png") self._init_attr( ["fetch", "mirror"], "https://youfailit.net/pub/idgames" diff --git a/dcc/doom_base.py b/dcc/doom_base.py index d3400ff..aedae79 100644 --- a/dcc/doom_base.py +++ b/dcc/doom_base.py @@ -69,6 +69,12 @@ class Wad(dcc.config.Base): return ["-assign", ",".join(options)] return [] + def thumb_overlay_path(self): + return ( + self._ensure(self.fabricate.joinpath(self.wad)) + .joinpath(self.thumbnail_overlay_name) + ) + class WadMap(Wad): def get_parser(self, prog_name): @@ -82,7 +88,7 @@ class WadMap(Wad): self._name = parsed_args.name self.wad_init(parsed_args) - self.take_action(parsed_args) + return self.take_action(parsed_args) @property def map(self): @@ -162,12 +168,6 @@ class WadMap(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") - ) - def text_thumb_path(self): return ( self._ensure(self.fabricate.joinpath(self.wad)) diff --git a/dcc/thumb.py b/dcc/thumb.py index 9240756..d5faf15 100644 --- a/dcc/thumb.py +++ b/dcc/thumb.py @@ -13,7 +13,7 @@ class Thumb(dcc.doom_base.WadMap): def take_action(self, parsed_args): base = self.base_thumb_path() text = self.text_thumb_path() - mdoom = self.m_doom_path() + overlay = self.thumnail_overlay_path() with ( wand.image.Image(filename=base) as bi, wand.color.Color("transparent") as tc @@ -22,7 +22,7 @@ class Thumb(dcc.doom_base.WadMap): ti.border(tc, 5, 5) bi.composite(ti, gravity="south_west") - with wand.image.Image(filename=mdoom) as mdi: + with wand.image.Image(filename=overlay) as mdi: mdi.border(tc, 5, 5) bi.composite(mdi, gravity="north_west")