Merge pull request #34 from Web-Multi-Media/tokenauth

Add Authentication & User history

Author: DerouineauNicolas

.gitignore

@@ -140,4 +140,8 @@ db.sqlite3
 # OS files
 .DS_Store
 
+Videos/*
+backend/cachefile.*
+
+
 

.travis.yml

@@ -11,10 +11,11 @@ install:
 
 script:
   - docker-compose -f docker-compose-prod.yml run --rm web ./wait-for-it.sh db:5432 -- python3 manage.py test
+  - docker-compose -f docker-compose-prod.yml run --rm web python3 -m pycodestyle --select=E302,E211,E202,E712,E225,E231 .
 
 deploy:
   provider: script
   script: bash docker_push
   on:
-    branch: master
+    all_branches: true
 

Videos/The.Big.Lebowski.1998.720p.BrRip.x264.YIFY.mp4

@@ -1,8 +1,8 @@
 
 FROM node:8
 
-RUN apt-get update -y
-RUN apt-get install -y python3-pip python-dev build-essential \
+RUN apt-get update -y --allow-unauthenticated
+RUN apt-get install -y --allow-unauthenticated python3-pip python-dev build-essential \
     software-properties-common python3-software-properties \
     x264 x265 ffmpeg && rm -rf /var/lib/apt/lists/*
 

backend/Dockerfile

@@ -1,16 +1,24 @@
 from django.contrib import admin
 from StreamServerApp.models import Video
-from StreamServerApp.utils import delete_DB_Infos, populate_db_from_local_folder
+from StreamServerApp.database_utils import delete_DB_Infos, populate_db_from_local_folder, update_db_from_local_folder
 from django.conf import settings
 
 
-def reload_video(modeladmin, request, queryset):
+def populate_videos(modeladmin, request, queryset):
     delete_DB_Infos()
     populate_db_from_local_folder(settings.VIDEO_ROOT, settings.VIDEO_URL)
-    reload_video.short_description = "Reload videos"
+    populate_videos.short_description = "Populate videos database"
+
+
+def update_videos(modeladmin, request, queryset):
+    update_db_from_local_folder(settings.VIDEO_ROOT, settings.VIDEO_URL)
+    update_videos.short_description = "Update videos database"
+
 
 class VideoAdmin(admin.ModelAdmin):
     actions = []
 
+
 admin.site.register(Video, VideoAdmin)
-admin.site.add_action(reload_video)
+admin.site.add_action(populate_videos)
+admin.site.add_action(update_videos)