Fill in download_dir or audio_download_dir on launch

2 files changed, 37 insertions, 15 deletions

diff --git a/app/main.py b/app/main.py
index 56adc00..de13f1e 100644
--- a/app/main.py
+++ b/app/main.py
@@ -17,8 +17,8 @@ class Config:
     _DEFAULTS = {

         'DOWNLOAD_DIR': '.',

         'AUDIO_DOWNLOAD_DIR': '%%DOWNLOAD_DIR',

-        'CUSTOM_DIR': 'true',

-        'AUTO_CREATE_CUSTOM_DIR': 'false',

+        'CUSTOM_DIRS': 'true',

+        'CREATE_DIRS': 'false',

         'STATE_DIR': '.',

         'URL_PREFIX': '',

         'OUTPUT_TEMPLATE': '%(title)s.%(ext)s',

@@ -101,18 +101,39 @@ async def delete(request):
 async def connect(sid, environ):

     await sio.emit('all', serializer.encode(dqueue.get()), to=sid)

     await sio.emit('configuration', serializer.encode(config), to=sid)

-    if config.CUSTOM_DIR:

-        await sio.emit('custom_directories', serializer.encode(get_custom_directories()), to=sid)

+    if config.CUSTOM_DIRS:

+        await sio.emit('custom_dirs', serializer.encode(get_custom_dirs()), to=sid)

 

-def get_custom_directories():

-    path = pathlib.Path(config.DOWNLOAD_DIR)

-    # Recursively lists all subdirectories, and converts PosixPath objects to string

-    dirs = list(map(str, path.glob('**')))

+def get_custom_dirs():

+    def recursive_dirs(base):

+        path = pathlib.Path(base)

+

+        # Converts PosixPath object to string, and remove base/ prefix

+        def convert(p):

+            s = str(p)

+            if s.startswith(base):

+                s = s[len(base):]

+

+            if s.startswith('/'):

+                s = s[1:]

+

+            return s

+

+        # Recursively lists all subdirectories of DOWNLOAD_DIR

+        dirs = list(filter(None, map(convert, path.glob('**'))))

+

+        return dirs

     

-    if '.' in dirs:

-        dirs.remove('.')

+    download_dir = recursive_dirs(config.DOWNLOAD_DIR)

 

-    return {"directories": dirs}

+    audio_download_dir = download_dir

+    if config.DOWNLOAD_DIR != config.AUDIO_DOWNLOAD_DIR:

+        audio_download_dir = recursive_dirs(config.AUDIO_DOWNLOAD_DIR)

+    

+    return {

+        "download_dir": download_dir,

+        "audio_download_dir": audio_download_dir

+    }

 

 @routes.get(config.URL_PREFIX)

 def index(request):

diff --git a/app/ytdl.py b/app/ytdl.py
index 29fa4bd..4329147 100644
--- a/app/ytdl.py
+++ b/app/ytdl.py
@@ -228,16 +228,17 @@ class DownloadQueue:
         elif etype == 'video' or etype.startswith('url') and 'id' in entry and 'title' in entry:

             if not self.queue.exists(entry['id']):

                 dl = DownloadInfo(entry['id'], entry['title'], entry.get('webpage_url') or entry['url'], quality, format, folder)

+                # Keep consistent with frontend

                 base_directory = self.config.DOWNLOAD_DIR if (quality != 'audio' and format != 'mp3') else self.config.AUDIO_DOWNLOAD_DIR

                 if folder:

-                    if self.config.CUSTOM_DIR != 'true':

-                        return {'status': 'error', 'msg': f'A folder for the download was specified but CUSTOM_DIR is not true in the configuration.'}

+                    if self.config.CUSTOM_DIRS != 'true':

+                        return {'status': 'error', 'msg': f'A folder for the download was specified but CUSTOM_DIRS is not true in the configuration.'}

                     dldirectory = os.path.realpath(os.path.join(base_directory, folder))

                     if not dldirectory.startswith(base_directory):

                         return {'status': 'error', 'msg': f'Folder "{folder}" must resolve inside the base download directory "{base_directory}"'}

                     if not os.path.isdir(dldirectory):

-                        if self.config.AUTO_CREATE_CUSTOM_DIR != 'true':

-                            return {'status': 'error', 'msg': f'Folder "{folder}" for download does not exist, and AUTO_CREATE_CUSTOM_DIR is not true in the configuration.'}

+                        if self.config.CREATE_DIRS != 'true':

+                            return {'status': 'error', 'msg': f'Folder "{folder}" for download does not exist inside base directory "{base_directory}", and CREATE_DIRS is not true in the configuration.'}

                         os.makedirs(dldirectory, exist_ok=True)

                 else:

                     dldirectory = base_directory