From 39c26fffa60aed36b1ef1da157f26868a1c4ca10 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Sun, 6 Nov 2022 10:34:43 -0700 Subject: [PATCH] Move container image to my registry --- Dockerfile | 12 +++--------- build.sh | 2 +- src/cd.py | 10 ++++++---- src/reader.py | 2 ++ start.sh | 2 +- www/index.html | 1 + 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1ddb9ac..7ab4085 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,19 +7,13 @@ RUN true \ && sed -i 's/main$/main contrib non-free/' /etc/apt/sources.list \ && apt-get -y update \ && DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y install \ - dvdbackup \ - libdvd-pkg libdvdcss2 \ - handbrake-cli libavcodec-extra \ + dvdbackup lsdvd libdvd-pkg libdvdcss2 \ cd-discid cdparanoia lame \ - python3 \ - python3-slugify \ + handbrake-cli libavcodec-extra \ + python3 python3-slugify \ && true RUN dpkg-reconfigure libdvd-pkg -RUN true \ - && DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y install \ - cowsay - COPY src/* /app/ COPY abcde.conf httpd.conf /etc/ COPY --chown=linuxserver:linuxserver www /www diff --git a/build.sh b/build.sh index 384a18a..4c80e1b 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ set -e -tag=registry.gitlab.com/dartcatcher/media-sucker/media-sucker +tag=git.woozle.org/neale/media-sucker docker build --tag $tag . case "$1" in diff --git a/src/cd.py b/src/cd.py index 5a91429..0982105 100644 --- a/src/cd.py +++ b/src/cd.py @@ -14,7 +14,7 @@ MINUTE = 60 * SECOND HOUR = 60 * MINUTE def scan(state, device): - # Get disc ID + logging.info("Scanning CD to get disc ID") p = subprocess.run( [ "cd-discid", @@ -27,7 +27,7 @@ def scan(state, device): state["discid"] = discid cddb_id = discid.split()[0] - # Look it up in cddb + logging.info("Looking disc up on CDDB") email = os.environ.get("EMAIL") # You should really set this variable, tho if not email: user = "user" @@ -49,6 +49,8 @@ def scan(state, device): state["title"] = "Unknown CD - %s" % cddb_id state["tracks"] = ["Track %02d" % (i+1) for i in range(num_tracks)] + logging.info("CD scan complete") + def copy(state, device, directory): # cdparanoia reports completion in samples @@ -59,7 +61,7 @@ def copy(state, device, directory): track_num = 1 for track_name in state["tracks"]: - logging.debug("Ripping track %d of %d", track_num, len(state["tracks"])) + logging.info("Ripping track %d of %d", track_num, len(state["tracks"])) p = subprocess.Popen( [ "cdparanoia", @@ -99,7 +101,7 @@ def encode(state, directory): tag_script.write("\n") for track_name in state["tracks"]: - logging.debug("Encoding track %d (%s)" % (track_num, track_name)) + logging.info("Encoding track %d (%s)" % (track_num, track_name)) duration = durations[track_num-1] argv = [ "lame", diff --git a/src/reader.py b/src/reader.py index 3502330..38c3db5 100644 --- a/src/reader.py +++ b/src/reader.py @@ -88,6 +88,8 @@ class Reader(worker.Worker): time.sleep(i * 5) def handle(self, video): + logging.info("Handling media, video=%r" % video) + self.status["video"] = video self.status["state"] = "reading" diff --git a/start.sh b/start.sh index f11e816..ec66fdc 100755 --- a/start.sh +++ b/start.sh @@ -9,7 +9,7 @@ docker run \ -v /dev:/hdev \ -v /srv/ext/incoming/sucker:/incoming/sucker \ --cpu-shares 256 \ - registry.gitlab.com/dartcatcher/media-sucker/media-sucker \ + git.woozle.org/neale/media-sucker \ -incoming /incoming/sucker \ -drive /hdev/sr0 /hdev/sr1 /hdev/sr2 diff --git a/www/index.html b/www/index.html index 3019f62..60fda00 100644 --- a/www/index.html +++ b/www/index.html @@ -4,6 +4,7 @@ Media Sucker +