diff --git a/doomcc/doom_base.py b/doomcc/doom_base.py index c12a867..16ae0f3 100644 --- a/doomcc/doom_base.py +++ b/doomcc/doom_base.py @@ -132,10 +132,8 @@ class WadMap(Wad): ] if len(candidates) == 0: raise Exception( - "no suitable demo candidates for WAD {} MAP {}{}.".format( - self.wad, - self.map, - f" name {self._name}" if self._name else "", + "no suitable demo candidates for WAD {} MAP {} name {}.".format( + self.wad, self.map, self.name_string ) ) if len(candidates) == 1: diff --git a/doomcc/text.py b/doomcc/text.py index 421f37d..b8ee90a 100644 --- a/doomcc/text.py +++ b/doomcc/text.py @@ -86,7 +86,7 @@ class Text(doomcc.doom_base.WadMap): map_names = self._config.get("map_names") if map_names is not None: text = map_names.get(f"map{mapnum}") - if text is not None: + if text != "": return text return input("Map Name? ") diff --git a/pyproject.toml b/pyproject.toml index 520742e..d860b22 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ description = "Doom Command Center" authors = [ {name = "yrriban",email = "yrriban@gmail.com"} ] -license = "MIT" +license = {text = "MIT"} readme = "README.md" requires-python = ">=3.12" dependencies = [ diff --git a/tests/doom_base_test.py b/tests/doom_base_test.py deleted file mode 100644 index 5510fee..0000000 --- a/tests/doom_base_test.py +++ /dev/null @@ -1,28 +0,0 @@ -import doomcc.doom_base -import os -import pathlib -import pytest -import tempfile - -class Workbench: - pass - -def test_demo_in_path(): - w = Workbench() - w.demo_in_path = lambda: doomcc.doom_base.WadMap.demo_in_path(w) - w._file_base = lambda path: doomcc.doom_base.WadMap._file_base(w, path) - w.wad = pathlib.Path("scythe") - w.map = "01" - w.name_string = "_index" - w._name = "index" - with tempfile.TemporaryDirectory() as td: - w.demos = pathlib.Path(td) - with pytest.raises(Exception): - w.demo_in_path() - - dp = pathlib.Path(td).joinpath("scythe") - os.mkdir(dp) - dp.joinpath("scythe_map01_index.lmp").touch() - assert w.demo_in_path() == dp.joinpath("scythe_map01_index.lmp") - dp.joinpath("scythe_map01_index-00028.lmp").touch() - assert w.demo_in_path() == dp.joinpath("scythe_map01_index-00028.lmp")