moving config to download folder

Author: Pascal Wacker

.gitignore

@@ -1,4 +1,5 @@
 .vscode
 downloads/*
 !downloads/.gitkeep
+!downloads/config.json
 

Dockerfile

@@ -7,10 +7,9 @@ WORKDIR /app
 # Copy the current directory contents into the container at /app
 ADD requirements.txt /app/requirements.txt
 ADD downloader.py /app/downloader.py
-ADD config.json /app/config.json
 
 # Install any needed packages specified in requirements.txt
 RUN pip install --trusted-host pypi.python.org -r requirements.txt
 
 # Run app.py when the container launches
-CMD ["python", "downloader.py"]
+CMD ["python", "downloader.py"]

README.md

@@ -9,17 +9,20 @@ Docker scripts to download videos from the ETH Zürich video portal
 
 ## Howto:  
 1) Clone (or download) this repo
-2) Modify the `config.json` script and add your courses.  
+2) Modify the `downloads/config.json` script and add your courses.  
 3) Run `docker run -v $(pwd)/downloads:/app/downloads pascalwacker/eth-video-downloader:version-1.0` to run the docker image directly from docker cloud
 
+## Options:
+In `downloads/config.json` the key `existing` accepts either `overwrite` or `skip`. Default is `overwrite`. `overwrite` will overwrite existing files, while `skip` skips them.
+  
 ## Alternative (build the docker image yourself):  
 1) Clone (or download) this repo
-2) Modify the `config.json` script and add your courses.  
+2) Modify the `downloads/config.json` script and add your courses.  
 3) Run `docker build -t eth-video-downloader .`  
 4) Run `docker run -v $(pwd)/downloads:/app/downloads eth-video-downloader`
 
 ## Note:
 If you have permission issues in the download folder after running this script, you can add ` && sudo chown $(whoami):$(whoami) -R downloads` at the end of the `docker run` command. This will change the permission of both user and group to the current user
 
 ## Disclaimer:
-This software is provided as is. The are not responsible for any damages on your system or legal actions brought forward against you. Only use it if you're allowed to save the videos on your hardware by ETH Zürich (http://www.video.ethz.ch/footer/copyright.html)
+This software is provided as is. The are not responsible for any damages on your system or legal actions brought forward against you. Only use it if you're allowed to save the videos on your hardware by ETH Zürich (http://www.video.ethz.ch/footer/copyright.html)

downloader.py

@@ -10,7 +10,7 @@ def dlProgress(count, blockSize, totalSize):
     print('\r' + str(round(count * blockSize * 100 / totalSize)) + '%: ' + str('#' * round(count * blockSize * 100 / totalSize / 5)) + str('_' * (20-round(count * blockSize * 100 / totalSize / 5))), end="")
 
 def main():
-    data = json.load(open('/app/config.json'))
+    data = json.load(open('/app/downloads/config.json'))
 
     mode = 'overwrite'
     if data['existing'] and data['existing'] == 'skip':
@@ -52,4 +52,4 @@ def main():
         print('no targets given')
 
 if __name__ == '__main__':
-    main()
+    main()