diff options
| author | Alex Shnitman <alexta69@gmail.com> | 2021-07-25 20:56:56 +0300 |
|---|---|---|
| committer | Alex Shnitman <alexta69@gmail.com> | 2021-07-25 21:22:20 +0300 |
| commit | 3fe107b2991399a3ea0c446cf579e977b75817dd (patch) | |
| tree | 86904ea2cedc183386c6a24be689c45912fb39aa | |
| parent | Add AUDIO_DOWNLOAD_DIR option (diff) | |
| download | metube-3fe107b2991399a3ea0c446cf579e977b75817dd.tar.gz metube-3fe107b2991399a3ea0c446cf579e977b75817dd.tar.bz2 metube-3fe107b2991399a3ea0c446cf579e977b75817dd.zip | |
set AUDIO_DOWNLOAD_DIR to the value if DOWNLOAD_DIR if it wasn't overriden in the environment
| -rw-r--r-- | Dockerfile | 1 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | app/main.py | 5 |
3 files changed, 5 insertions, 3 deletions
@@ -25,7 +25,6 @@ COPY app ./app COPY --from=builder /metube/dist/metube ./ui/dist/metube
ENV DOWNLOAD_DIR /downloads
-ENV AUDIO_DOWNLOAD_DIR /downloads
VOLUME /downloads
EXPOSE 8081
CMD ["python3", "app/main.py"]
@@ -34,7 +34,7 @@ services: Certain values can be set via environment variables, using the `-e` parameter on the docker command line, or the `environment:` section in docker-compose.
* __DOWNLOAD_DIR__: path to where the downloads will be saved. Defaults to `/downloads` in the docker image, and `.` otherwise.
-* __AUDIO_DOWNLOAD_DIR__: path to where the audio downloads will be saved. Defaults to `/downloads` in the docker image, and `.` otherwise.
+* __AUDIO_DOWNLOAD_DIR__: path to where audio-only downloads will be saved, if you wish to separate them from the video downloads. Defaults to the value of `DOWNLOAD_DIR`.
* __URL_PREFIX__: base path for the web server (for use when hosting behind a reverse proxy). Defaults to `/`.
* __OUTPUT_TEMPLATE__: the template for the filenames of the downloaded videos, formatted according to [this spec](https://github.com/ytdl-org/youtube-dl/blob/master/README.md#output-template). Defaults to `%(title)s.%(ext)s`.
diff --git a/app/main.py b/app/main.py index 194bba6..dad19e3 100644 --- a/app/main.py +++ b/app/main.py @@ -16,7 +16,7 @@ log = logging.getLogger('main') class Config:
_DEFAULTS = {
'DOWNLOAD_DIR': '.',
- 'AUDIO_DOWNLOAD_DIR': '.',
+ 'AUDIO_DOWNLOAD_DIR': '%%DOWNLOAD_DIR',
'URL_PREFIX': '',
'OUTPUT_TEMPLATE': '%(title)s.%(ext)s',
}
@@ -24,6 +24,9 @@ class Config: def __init__(self):
for k, v in self._DEFAULTS.items():
setattr(self, k, os.environ[k] if k in os.environ else v)
+ for k, v in self.__dict__.items():
+ if v.startswith('%%'):
+ setattr(self, k, getattr(self, v[2:]))
if not self.URL_PREFIX.endswith('/'):
self.URL_PREFIX += '/'
|