Reorg project tree

manbearwiz · Apr 25, 2020 · 07a329f · 07a329f
1 parent a9be903
commit 07a329f
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -7,8 +7,8 @@
 FROM python:alpine
 
 
-RUN mkdir -p /usr/src/app
-COPY . /usr/src/app
+RUN mkdir -p /usr/src
+COPY app /usr/src/app
 
 # Download static files (JS/CSS Libraries)
 WORKDIR /usr/src/app/static
@@ -24,6 +24,7 @@ RUN apk add --no-cache ffmpeg tzdata curl wget && \
   apk del curl wget
 
 WORKDIR /usr/src/app
+COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir -r requirements.txt
 
 EXPOSE 8080

diff --git a/static/css/style.css → app/static/css/style.css b/static/css/style.css → app/static/css/style.css
diff --git a/static/js/.gitkeep → app/static/js/.gitkeep b/static/js/.gitkeep → app/static/js/.gitkeep
diff --git a/static/js/youtubedl.js → app/static/js/youtubedl.js b/static/js/youtubedl.js → app/static/js/youtubedl.js
diff --git a/index.html → app/templates/index.html b/index.html → app/templates/index.html
diff --git a/logs.html → app/templates/logs.html b/logs.html → app/templates/logs.html
diff --git a/youtube-dl-server.py → app/youtube-dl-server.py b/youtube-dl-server.py → app/youtube-dl-server.py
@@ -30,17 +30,17 @@ class QueueAction:
     'YDL_SERVER_PORT': 8080,
     'YDL_CACHE_DIR': '/youtube-dl/.cache',
     'YDL_DB_PATH': '/youtube-dl/.ydl-metadata.db',
-    'YDL_SUBTITLES_LANGUAGES': None,
+    'YDL_SUBTITLES_LANGUAGES': 'all',
 }
 
 @app.route('/')
 def front_index():
-    return static_file('index.html', root='./')
+    return static_file('templates/index.html', root='./')
 
 
 @app.route('/logs')
 def front_logs():
-    return static_file('logs.html', root='./')
+    return static_file('templates/logs.html', root='./')
 
 
 @app.route('/static/:filename#.*#')

diff --git a/youtube_dl_logdb.py → app/youtube_dl_logdb.py b/youtube_dl_logdb.py → app/youtube_dl_logdb.py