diff --git a/.gitignore b/.gitignore index 4e300d6..3cfdaab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,7 @@ -*.spec *.swo *.swp -__pycache__ build +venv +__pycache__ dcc.egg-info dist -poetry.lock -venv diff --git a/LICENSE b/LICENSE deleted file mode 100644 index f0e43ed..0000000 --- a/LICENSE +++ /dev/null @@ -1,7 +0,0 @@ -Copyright 2025 yrriban - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md deleted file mode 100644 index 707c232..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Doom Command Center - -Doom Command Center is an all-in-one tool for automating the process of obtaining Doom WADs, recording demos, producing videos, and anything else Doom-related you may want to do. diff --git a/dcc/__init__.py b/dcc/__init__.py index f102a9c..e69de29 100644 --- a/dcc/__init__.py +++ b/dcc/__init__.py @@ -1 +0,0 @@ -__version__ = "0.0.1" diff --git a/dcc/rib.py b/dcc/rib.py index 7e00265..aca28fd 100644 --- a/dcc/rib.py +++ b/dcc/rib.py @@ -8,8 +8,7 @@ import time class RIB(dcc.doom_base.WadMap): def get_parser(self, prog_name): parser = super().get_parser(prog_name) - parser.add_argument("-s", "--secs_before", type=int, default=10) - parser.add_argument("-a", "--attempt") + parser.add_argument("-s", "--secs_before", default=10) return parser # TODO: the root path should probably be configurable. @@ -26,11 +25,7 @@ class RIB(dcc.doom_base.WadMap): demodir = demodir.joinpath(w.stem.lower()) demodir = demodir / "failed_demos" - glob = f"*map{self.map}*" - if parsed_args.attempt is not None: - glob += f"{parsed_args.attempt}*" - - for f in demodir.glob(glob, case_sensitive=False): + for f in demodir.glob(f"*map{self.map}*", case_sensitive=False): st = os.stat(f) if st.st_mtime > dt: demo = f diff --git a/dcc/thumb.py b/dcc/thumb.py index 9240756..a1afa95 100644 --- a/dcc/thumb.py +++ b/dcc/thumb.py @@ -28,7 +28,7 @@ class Thumb(dcc.doom_base.WadMap): if parsed_args.index: with wand.image.Image( - filename=self.fabricate.joinpath("doomed_index.png") + filename=self.output.joinpath("doomed_index.png") ) as di: di.border(tc, 1, 1) bi.composite(di, gravity="north_east") diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index 428c907..0000000 --- a/pyproject.toml +++ /dev/null @@ -1,33 +0,0 @@ -[project] -name = "dcc" -version = "0.1.0" -description = "Doom Command Center" -authors = [ - {name = "yrriban",email = "yrriban@gmail.com"} -] -license = {text = "MIT"} -readme = "README.md" -requires-python = ">=3.12" -dependencies = [ - "av (>=15.0.0,<16.0.0)", - "boto3 (>=1.40.9,<2.0.0)", - "cliff (>=4.10.0,<5.0.0)", - "numpy (>=2.3.2,<3.0.0)", - "omgifol (>=0.5.1,<0.6.0)", - "tomlkit (>=0.13.3,<0.14.0)", - "wand (>=0.6.13,<0.7.0)", -] - - -[build-system] -requires = ["poetry-core>=2.0.0,<3.0.0"] -build-backend = "poetry.core.masonry.api" - -[project.scripts] -dcc = "dcc.main:main" - -[tool.poetry-pyinstaller-plugin.scripts] -dcc = { source = "dcc/main.py", type = "onefile" } - -[tool.poetry-pyinstaller-plugin.collect] -all = ["dcc"] diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..9222cf5 --- /dev/null +++ b/setup.py @@ -0,0 +1,43 @@ +from setuptools import find_packages +from setuptools import setup + +PROJECT = "dcc" + +VERSION = "0.0.1" + +long_description = "" + +setup( + name=PROJECT, + version=VERSION, + description="Doom Command Center", + long_description=long_description, + author="yrriban", + author_email="yrriban@gmail.com", + platforms=["Any"], + install_requires=["cliff"], + packages=find_packages(), + include_package_data=True, + entry_points={ + "console_scripts": ["dcc=dcc.main:main"], + "dcc": [ + "play = dcc.play:Play", + "record = dcc.record:Record", + "rib = dcc.rib:RIB", + "fabricate = dcc.fabricate:Fabricate", + "put = dcc.put:Put", + "pb = dcc.pb:PB", + "ss = dcc.ss:SS", + "extract = dcc.extract:Extract", + "fetch = dcc.fetch:Fetch", + "text = dcc.text:Text", + "thumb = dcc.thumb:Thumb", + "dsda = dcc.dsda:DSDA", + "eureka = dcc.eureka:Eureka", + "ls = dcc.ls:List", + "configure = dcc.configure:Configure", + "concat = dcc.concat:Concat", + ], + }, + zip_safe=False, +)