feat: separate tmp dir

Author: iomz

.gitignore

@@ -25,8 +25,7 @@ config.yml
 config.yaml
 
 # downloads
-/downloads
-/output
+/radiko
 
 # misc
 *.bak

Dockerfile

@@ -28,8 +28,8 @@ COPY --from=build /build/radicron /app/radicron
 # set timezone
 ENV TZ "Asia/Tokyo"
 # set the default download dir
-ENV RADIGO_HOME "/downloads"
-VOLUME ["/downloads"]
+ENV RADICRON_HOME "/radiko"
+VOLUME ["/radiko"]
 
 ENTRYPOINT ["/app/radicron"]
 CMD ["-c", "/app/config.yml"]

README.md

@@ -51,6 +51,9 @@ Create a configuration file (`config.yml`) to define rules for recording:
 area-id: JP13 # if unset, default to "your" region
 extra-stations:
   - ALPHA-STATION # include stations not in your region
+ignore-stations:
+  - JOAK # ignore stations from search
+minimum-output-size: 2 # do not save an audio below this size (in MB), default is 1 (MB)
 rules:
   airship: # name your rule as you like
     station-id: FMT # (optional) the staion_id, if not available by default, automatically add this station to the watch list
@@ -60,35 +63,30 @@ rules:
     window: 48h # only within the past window from the current time
   hiccorohee:
     pfm: "ヒコロヒー" # search by pfm
-  watchman:
+  trad:
     dow: # filter by day of the week (e.g, Mon, tue, WED)
-      - fri
-    pfm: "宇多丸"
-    station-id: TBS
+      - wed
+      - thu
+    station-id: FMT
+    title: "THE TRAD"
 ```
 
-In addition, set `${RADIGO_HOME}` to set the download directory.
+In addition, set `${RADICRON_HOME}` to set the download directory.
 
 ## Usage
 
 ```bash
-mkdir -p ./downloads && RADIGO_HOME=./downloads radicron -c config.yml
+mkdir -p ./radiko/{downloads,tmp} && RADICRON_HOME=./radiko radicron -c config.yml
 ```
 
 ### Try with Docker
 
-By default, it mounts `./config.yml` and `./downloads` to the container.
+By default, it mounts `./config.yml` and `./radiko` to the container.
 
 ```console
 docker compose up
 ```
 
-To set the ownership of the downloaded files right, run with `$UID` and `$GID` environment variables:
-
-```console
-UID=$(id -u) GID=$(id -g) docker compose up -d
-```
-
 ## Build the image yourself
 
 In case the [image](https://github.com/iomz/radicron/pkgs/container/radicron) is not available for your platform:

cmd/radicron/main.go

@@ -28,9 +28,9 @@ func reload(ctx context.Context, filename string) (radicron.Rules, error) {
 	rules := radicron.Rules{}
 	cwd, _ := os.Getwd()
 
-	// check ${RADIGO_HOME}
-	if os.Getenv("RADIGO_HOME") == "" {
-		os.Setenv("RADIGO_HOME", filepath.Join(cwd, "downloads"))
+	// check ${RADICRON_HOME}
+	if os.Getenv("RADICRON_HOME") == "" {
+		os.Setenv("RADICRON_HOME", filepath.Join(cwd, "radiko"))
 	}
 
 	// load params from a config file

const.go

@@ -13,6 +13,8 @@ const (
 	DefaultInterval = "168h"
 	// DefaultMinimumOutputSize
 	DefaultMinimumOutputSize = 1
+	// Environment Variable for RADICRON_HOME
+	EnvRadicronHome = "RADICRON_HOME"
 	// Language for ID3v2 tags
 	ID3v2LangJPN = "jpn"
 	// Kilobytes for the metric bytes

docker-compose.yml

@@ -8,4 +8,4 @@ services:
     user: 1000:1000
     volumes:
       - ./config.yml:/app/config.yml
-      - ./downloads:/downloads
+      - ./radiko:/radiko

download.go

@@ -57,7 +57,7 @@ func Download(
 	asset.Schedules = append(asset.Schedules, prog)
 
 	// the output config
-	output, err := radigo.NewOutputConfig(
+	output, err := newOutputConfig(
 		fmt.Sprintf(
 			"%s_%s_%s",
 			startTime.In(Location).Format(OutputDatetimeLayout),
@@ -275,6 +275,30 @@ func getChunklistFromM3U8(uri string) ([]string, error) {
 	return getChunklist(resp.Body)
 }
 
+// getRadicronPath gets the RADICRON_HOME path
+func getRadicronPath(sub string) (string, error) {
+	// If the environment variable RADICRON_HOME is set,
+	// override working directory path.
+	fullPath := os.Getenv(EnvRadicronHome)
+	switch {
+	case fullPath != "" && !filepath.IsAbs(fullPath):
+		wd, err := os.Getwd()
+		if err != nil {
+			return "", err
+		}
+		fullPath = filepath.Join(wd, fullPath, sub)
+	case fullPath == "":
+		wd, err := os.Getwd()
+		if err != nil {
+			return "", err
+		}
+		fullPath = filepath.Join(wd, "radiko", sub)
+	default:
+		fullPath = filepath.Join(fullPath, sub)
+	}
+	return filepath.Clean(fullPath), nil
+}
+
 // getURI returns uri generated by parsing m3u8.
 func getURI(input io.Reader) (string, error) {
 	playlist, listType, err := m3u8.DecodeFrom(input, true)
@@ -289,9 +313,28 @@ func getURI(input io.Reader) (string, error) {
 	return p.Variants[0].URI, nil
 }
 
+// newOutputConfig prepares the outputdir
+func newOutputConfig(fileBaseName, fileFormat string) (*radigo.OutputConfig, error) {
+	fullPath, err := getRadicronPath("downloads")
+	if err != nil {
+		return nil, err
+	}
+
+	return &radigo.OutputConfig{
+		DirFullPath:  fullPath,
+		FileBaseName: fileBaseName,
+		FileFormat:   fileFormat,
+	}, nil
+}
+
 // tempAACDir creates a dir to store temporary aac files
 func tempAACDir() (string, error) {
-	aacDir, err := os.MkdirTemp("", "aac")
+	fullPath, err := getRadicronPath("tmp")
+	if err != nil {
+		return "", err
+	}
+
+	aacDir, err := os.MkdirTemp(fullPath, "aac")
 	if err != nil {
 		return "", err
 	}