diff --git a/Makefile b/Makefile index 0b244ed..d471b52 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,2 @@ install: - cp dist/pyinstaller/manylinux_2_39_x86_64/dcc /home/tynan/.local/bin/dcc + cp dist/pyinstaller/manylinux_2_39_x86_64/doomcc /home/tynan/.local/bin/dcc diff --git a/doomcc/__main__.py b/doomcc/__main__.py index 5e3e9d1..21747bf 100644 --- a/doomcc/__main__.py +++ b/doomcc/__main__.py @@ -1,5 +1,5 @@ import sys -from dcc.main import main +from doomcc.main import main if __name__ == "__main__": sys.exit(main(sys.argv[1:])) diff --git a/doomcc/concat.py b/doomcc/concat.py index 32c9912..03a106b 100644 --- a/doomcc/concat.py +++ b/doomcc/concat.py @@ -1,6 +1,6 @@ import av import copy -import dcc.doom_base +import doomcc.doom_base import enum import fractions import io @@ -16,7 +16,7 @@ class State(enum.Enum): DONE = 3 -class Concat(dcc.doom_base.Wad): +class Concat(doomcc.doom_base.Wad): def get_parser(self, prog_name): parser = super().get_parser(prog_name) parser.add_argument("start_map") diff --git a/doomcc/configure.py b/doomcc/configure.py index e624246..080f613 100644 --- a/doomcc/configure.py +++ b/doomcc/configure.py @@ -1,9 +1,9 @@ -import dcc.doom_base +import doomcc.doom_base import omg import tomlkit.toml_file -class Configure(dcc.doom_base.Wad): +class Configure(doomcc.doom_base.Wad): def get_parser(self, prog_name): parser = super().get_parser(prog_name) parser.add_argument("--complevel", "--cl") diff --git a/doomcc/doom_base.py b/doomcc/doom_base.py index 85c7b55..16ae0f3 100644 --- a/doomcc/doom_base.py +++ b/doomcc/doom_base.py @@ -1,13 +1,13 @@ from abc import abstractmethod from cliff.command import Command -import dcc.config +import doomcc.config import io import os import re import tomlkit -class Wad(dcc.config.Base): +class Wad(doomcc.config.Base): def get_parser(self, prog_name): parser = super().get_parser(prog_name) parser.add_argument("wad") diff --git a/doomcc/dsda.py b/doomcc/dsda.py index 6e831d2..932d855 100644 --- a/doomcc/dsda.py +++ b/doomcc/dsda.py @@ -1,5 +1,5 @@ -import dcc.config -import dcc.doom_base +import doomcc.config +import doomcc.doom_base import os import re import shutil @@ -7,7 +7,7 @@ import subprocess import zipfile -class DSDA(dcc.doom_base.WadMap): +class DSDA(doomcc.doom_base.WadMap): def get_parser(self, prog_name): parser = super().get_parser(prog_name) parser.add_argument("-s", "--single", action="store_true") diff --git a/doomcc/eureka.py b/doomcc/eureka.py index e8457d5..8618287 100644 --- a/doomcc/eureka.py +++ b/doomcc/eureka.py @@ -1,9 +1,9 @@ -import dcc.doom_base -import dcc.config +import doomcc.doom_base +import doomcc.config import os -class Eureka(dcc.doom_base.WadMap): +class Eureka(doomcc.doom_base.WadMap): def get_parser(self, prog_name): parser = super().get_parser(prog_name) parser.add_argument("--main") diff --git a/doomcc/extract.py b/doomcc/extract.py index 254b1f4..d0412ea 100644 --- a/doomcc/extract.py +++ b/doomcc/extract.py @@ -1,11 +1,11 @@ -import dcc.doom_base +import doomcc.doom_base import omg import numpy as np import wand.color import wand.image -class Extract(dcc.doom_base.Wad): +class Extract(doomcc.doom_base.Wad): def get_parser(self, prog_name): parser = super().get_parser(prog_name) parser.add_argument("lump") diff --git a/doomcc/fabricate.py b/doomcc/fabricate.py index 97b87bd..36f81d5 100644 --- a/doomcc/fabricate.py +++ b/doomcc/fabricate.py @@ -1,12 +1,12 @@ import contextlib -import dcc.config -import dcc.doom_base +import doomcc.config +import doomcc.doom_base import os import shutil import tempfile -class Fabricate(dcc.doom_base.WadMap): +class Fabricate(doomcc.doom_base.WadMap): def get_parser(self, prog_name): parser = super().get_parser(prog_name) parser.add_argument("--fg", action="store_true") diff --git a/doomcc/fetch.py b/doomcc/fetch.py index 2ee9cff..3e5e411 100644 --- a/doomcc/fetch.py +++ b/doomcc/fetch.py @@ -1,4 +1,4 @@ -import dcc.config +import doomcc.config import io import json import pathlib @@ -9,7 +9,7 @@ import urllib.request import zipfile -class Fetch(dcc.config.Base): +class Fetch(doomcc.config.Base): def get_parser(self, prog_name): parser = super().get_parser(prog_name) parser.add_argument("id_or_name") diff --git a/doomcc/ls.py b/doomcc/ls.py index 69d9a34..ffb8f70 100644 --- a/doomcc/ls.py +++ b/doomcc/ls.py @@ -1,8 +1,8 @@ -import dcc.config +import doomcc.config import os -class List(dcc.config.ListerBase): +class List(doomcc.config.ListerBase): def get_parser(self, prog_name): parser = super().get_parser(prog_name) parser.add_argument("target") @@ -24,7 +24,7 @@ class List(dcc.config.ListerBase): raise Exception(f"unknown target {parsed_args.target}") -class WadList(dcc.config.ListerBase): +class WadList(doomcc.config.ListerBase): def get_parser(self, prog_name): parser = super().get_parser(prog_name) parser.add_argument("wad") diff --git a/doomcc/main.py b/doomcc/main.py index fdbb264..745e1d7 100644 --- a/doomcc/main.py +++ b/doomcc/main.py @@ -3,46 +3,46 @@ import sys from cliff.app import App from cliff.commandmanager import CommandManager -import dcc.concat -import dcc.configure -import dcc.dsda -import dcc.eureka -import dcc.extract -import dcc.fabricate -import dcc.fetch -import dcc.ls -import dcc.pb -import dcc.play -import dcc.put -import dcc.record -import dcc.rib -import dcc.ss -import dcc.text -import dcc.thumb +import doomcc.concat +import doomcc.configure +import doomcc.dsda +import doomcc.eureka +import doomcc.extract +import doomcc.fabricate +import doomcc.fetch +import doomcc.ls +import doomcc.pb +import doomcc.play +import doomcc.put +import doomcc.record +import doomcc.rib +import doomcc.ss +import doomcc.text +import doomcc.thumb -class DCC(App): +class DoomCC(App): def __init__(self): cm = CommandManager(None) commands = { - "concat": dcc.concat.Concat, - "configure": dcc.configure.Configure, - "dsda": dcc.dsda.DSDA, - "eureka": dcc.eureka.Eureka, - "extract": dcc.extract.Extract, - "fabricate": dcc.fabricate.Fabricate, - "fetch": dcc.fetch.Fetch, - "ls": dcc.ls.List, - "ls demos": dcc.ls.ListDemos, - "ls videos": dcc.ls.ListVideos, - "pb": dcc.pb.PB, - "play": dcc.play.Play, - "put": dcc.put.Put, - "record": dcc.record.Record, - "rib": dcc.rib.RIB, - "ss": dcc.ss.SS, - "text": dcc.text.Text, - "thumb": dcc.thumb.Thumb, + "concat": doomcc.concat.Concat, + "configure": doomcc.configure.Configure, + "dsda": doomcc.dsda.DSDA, + "eureka": doomcc.eureka.Eureka, + "extract": doomcc.extract.Extract, + "fabricate": doomcc.fabricate.Fabricate, + "fetch": doomcc.fetch.Fetch, + "ls": doomcc.ls.List, + "ls demos": doomcc.ls.ListDemos, + "ls videos": doomcc.ls.ListVideos, + "pb": doomcc.pb.PB, + "play": doomcc.play.Play, + "put": doomcc.put.Put, + "record": doomcc.record.Record, + "rib": doomcc.rib.RIB, + "ss": doomcc.ss.SS, + "text": doomcc.text.Text, + "thumb": doomcc.thumb.Thumb, } for n, c in commands.items(): cm.add_command(n, c) @@ -64,8 +64,8 @@ class DCC(App): def main(argv=sys.argv[1:]): - dcc = DCC() - return dcc.run(argv) + doomcc = DoomCC() + return doomcc.run(argv) if __name__ == "__main__": diff --git a/doomcc/pb.py b/doomcc/pb.py index 661d538..841aba7 100644 --- a/doomcc/pb.py +++ b/doomcc/pb.py @@ -1,8 +1,8 @@ -import dcc.config -import dcc.doom_base +import doomcc.config +import doomcc.doom_base import os -class PB(dcc.doom_base.WadMap): +class PB(doomcc.doom_base.WadMap): def take_action(self, parsed_args): os.execvp("ffplay", ["ffplay", self.video_path()]) diff --git a/doomcc/play.py b/doomcc/play.py index 5459b6e..ee135ca 100644 --- a/doomcc/play.py +++ b/doomcc/play.py @@ -1,8 +1,8 @@ -import dcc.config -import dcc.doom_base +import doomcc.config +import doomcc.doom_base import os -class Play(dcc.doom_base.WadMap): +class Play(doomcc.doom_base.WadMap): def take_action(self, parsed_args): os.execv(self.dsda, [self.dsda] + self.dsda_preamble()) diff --git a/doomcc/put.py b/doomcc/put.py index ba8f89c..77215b4 100644 --- a/doomcc/put.py +++ b/doomcc/put.py @@ -1,9 +1,9 @@ import boto3 -import dcc.config -import dcc.doom_base +import doomcc.config +import doomcc.doom_base -class Put(dcc.doom_base.WadMap): +class Put(doomcc.doom_base.WadMap): def get_parser(self, prog_name): parser = super().get_parser(prog_name) return parser diff --git a/doomcc/record.py b/doomcc/record.py index 0b519cd..55e5af2 100644 --- a/doomcc/record.py +++ b/doomcc/record.py @@ -1,9 +1,9 @@ -import dcc.config -import dcc.doom_base +import doomcc.config +import doomcc.doom_base import os -class Record(dcc.doom_base.WadMap): +class Record(doomcc.doom_base.WadMap): def take_action(self, parsed_args): os.execv( self.dsda, diff --git a/doomcc/rib.py b/doomcc/rib.py index a3e9787..6a456f7 100644 --- a/doomcc/rib.py +++ b/doomcc/rib.py @@ -1,10 +1,10 @@ -import dcc.doom_base +import doomcc.doom_base import pathlib import os import time -class RIB(dcc.doom_base.WadMap): +class RIB(doomcc.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) diff --git a/doomcc/ss.py b/doomcc/ss.py index 446e43d..835dd00 100644 --- a/doomcc/ss.py +++ b/doomcc/ss.py @@ -1,12 +1,12 @@ from tkinter import messagebox -import dcc.config -import dcc.doom_base +import doomcc.config +import doomcc.doom_base import sys import wand.display import wand.image -class SS(dcc.doom_base.WadMap): +class SS(doomcc.doom_base.WadMap): def get_parser(self, prog_name): parser = super().get_parser(prog_name) parser.add_argument("-g", "--gravity", default="center") @@ -24,7 +24,7 @@ class SS(dcc.doom_base.WadMap): img.reset_coords() if img.width < width or img.height < height: if not messagebox.askretrycancel( - title="DCC", + title="Doom Command Center", message=f"Image too small ({img.width}x{img.height})." + "Try again?", ): @@ -35,7 +35,7 @@ class SS(dcc.doom_base.WadMap): if not yolo: wand.display.display(img) accepted = messagebox.askyesnocancel( - title="DCC", message="Is this image acceptable?" + title="Doom Command Center", message="Is this image acceptable?" ) if accepted is None: sys.exit("Gave up on image verification") diff --git a/doomcc/text.py b/doomcc/text.py index 27d8983..b8ee90a 100644 --- a/doomcc/text.py +++ b/doomcc/text.py @@ -1,5 +1,5 @@ -import dcc.config -import dcc.doom_base +import doomcc.config +import doomcc.doom_base import sys import textwrap import wand.drawing @@ -51,10 +51,10 @@ def draw_text(self, img, text, font_size=64, wrap_dist=0.75): draw(img) -dcc.config.Base.draw_text = draw_text +doomcc.config.Base.draw_text = draw_text -class Text(dcc.doom_base.WadMap): +class Text(doomcc.doom_base.WadMap): def get_parser(self, prog_name): parser = super().get_parser(prog_name) parser.add_argument("--nomap", action="store_true") diff --git a/doomcc/thumb.py b/doomcc/thumb.py index e18c143..5ee8265 100644 --- a/doomcc/thumb.py +++ b/doomcc/thumb.py @@ -1,10 +1,10 @@ -import dcc.config -import dcc.doom_base +import doomcc.config +import doomcc.doom_base import wand.color import wand.image -class Thumb(dcc.doom_base.WadMap): +class Thumb(doomcc.doom_base.WadMap): def get_parser(self, prog_name): parser = super().get_parser(prog_name) parser.add_argument("--index", action="store_true") diff --git a/pyproject.toml b/pyproject.toml index 891d8db..d860b22 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [project] -name = "dcc" +name = "doomcc" version = "0.1.0" description = "Doom Command Center" authors = [ @@ -27,10 +27,10 @@ requires = ["poetry-core>=2.0.0,<3.0.0"] build-backend = "poetry.core.masonry.api" [project.scripts] -dcc = "dcc.main:main" +doomcc = "doomcc.main:main" [tool.poetry-pyinstaller-plugin.scripts] -dcc = { source = "dcc/main.py", type = "onefile" } +doomcc = { source = "doomcc/main.py", type = "onefile" } [tool.poetry-pyinstaller-plugin.collect] all = ["cliff"] diff --git a/tests/play_test.py b/tests/play_test.py index a75e694..e778251 100644 --- a/tests/play_test.py +++ b/tests/play_test.py @@ -1,5 +1,5 @@ import cliff.app -import dcc.play +import doomcc.play import logging import os import mockito.matchers @@ -26,9 +26,9 @@ def test_play(expect): scp.mkdir() scp.joinpath("config.toml").touch() scp.joinpath("scythe.wad").touch() - dcc.play.Play.__init__ = lambda self: None - dcc.play.Play.get_epilog = lambda self: "" - rig = dcc.play.Play() + doomcc.play.Play.__init__ = lambda self: None + doomcc.play.Play.get_epilog = lambda self: "" + rig = doomcc.play.Play() rig._hooks = [] parser = rig.get_parser("test_play") parsed_args = parser.parse_args(args=["--doom", td, "scythe", "01"])