Merge pull request #42 from Web-Multi-Media/Sync_subtitle

Improve subtitles handling

Author: DerouineauNicolas

README.md

@@ -8,7 +8,7 @@ This project is a video presentation server based on Django Rest Framework and R
 
 
 Support is currently limited to H264 encoded content.
-Subtitles are added automatically if an adequate match is found (after a conversion from .srt to webvtt).
+Subtitles are added automatically if an adequate match is found. You can also upload you own subtitle or resync existing ones.
 
 
 How to use
@@ -30,7 +30,7 @@ Migrate the database:
 
 Populate the database:
 
-    docker-compose -f docker-compose-prod.yml run --rm web python3 manage.py populatedb
+    docker-compose -f docker-compose-prod.yml run --rm web ./wait-for-it.sh db:5432 -- python3 manage.py populatedb
 
 Run the server:
 
@@ -41,17 +41,17 @@ Now the application should be accessible from your browser at `http://localhost:
 
 #### CONFIGURATION
 
-The videos contained in the Videos/ folder are updated everytime the app is launched.
+The videos contained in the Videos/ folder are indexed everytime the populatedb command is launched.
 
-If you want to manually triggers an update, use the following command
+If you want to trigger an update, use the following command
 
-    docker-compose -f docker-compose-prod.yml run --rm web python3 manage.py populatedb
+    docker-compose -f docker-compose-prod.yml run --rm web python3 manage.py updatedb
 
-If you want to reload videos while the app is running, you need to have a superuser created.
+If you want to manually modify the data, you can access the admin page with a superuser account. For that, create one with the following command.
 
     docker-compose -f docker-compose-prod.yml run --rm web python3 manage.py createsuperuser
 
-then go to `http://localhost:1337/admin/`, select all Videos and check 'reload Videos' actions.
+then go to `http://localhost:1337/admin/`.
 
 The following variables can be configured in .env file:
 

Videos/folder2/spongebob2.mp4

@@ -0,0 +1,90 @@
+1
+00:00:00,918 --> 00:00:02,294
+[alarm clock sounding]
+
+2
+00:00:02,377 --> 00:00:03,754
+Time for boating school.
+
+3
+00:00:04,046 --> 00:00:05,214
+Let her rip, Gary.
+
+4
+00:00:12,054 --> 00:00:13,138
+Ah.
+
+5
+00:00:19,019 --> 00:00:20,354
+Ta-da!
+
+6
+00:00:20,437 --> 00:00:22,523
+Not bad, partner in crime.
+
+7
+00:00:22,773 --> 00:00:24,983
+The toast could have been
+a little darker though.
+
+8
+00:00:25,108 --> 00:00:26,109
+See you later.
+
+9
+00:00:26,193 --> 00:00:27,277
+Hey SpongeBob.
+
+10
+00:00:27,361 --> 00:00:28,820
+Wanna go jellyfishing?
+
+11
+00:00:28,946 --> 00:00:31,240
+Sorry Patrick, I can't.
+I have school today.
+
+12
+00:00:31,365 --> 00:00:34,451
+What am I supposed to do all
+day while you're at school?
+
+13
+00:00:34,576 --> 00:00:36,995
+I don't know.
+What do you normally do when I'm gone?
+
+14
+00:00:37,120 --> 00:00:39,373
+Wait for you to get back.
+
+15
+00:00:39,957 --> 00:00:43,794
+Wait a second, Patrick.
+Why don't you come to school with me?
+
+16
+00:00:43,919 --> 00:00:45,838
+Hey, that's a great idea.
+
+17
+00:00:45,963 --> 00:00:49,633
+You and me in school together
+as classmates. Think about it!
+
+18
+00:00:53,262 --> 00:00:54,304
+Wow.
+
+19
+00:00:54,888 --> 00:00:58,976
+♪ Road, road, road, road ♪
+
+20
+00:00:59,101 --> 00:01:00,435
+♪ Road, road ♪
+
+21
+00:01:00,561 --> 00:01:03,355
+♪ When I'm on the road ♪
+

Videos/subtitles/spongebob.srt

@@ -0,0 +1,12 @@
+1
+00:00:00,000 --> 00:00:01,500
+For www.forom.com
+
+2
+00:00:01,500 --> 00:00:02,500
+<i>Tonight's the night.</i>
+
+3
+00:00:03,000 --> 00:00:15,000
+<i>And it's going to happen
+again and again --</i>

Videos/subtitles/test.srt

@@ -0,0 +1,16 @@
+1
+00:01:16,924 --> 00:01:19,051
+<i>Vous ne passerez pas !</i>
+
+2
+00:01:19,176 --> 00:01:20,387
+<i>Gandalf !</i>
+
+3
+00:01:25,559 --> 00:01:27,769
+<i>Je suis un Serviteur de Feu Secret,</i>
+
+4
+00:01:27,894 --> 00:01:30,938
+<i>D�tenteur de la flamme d'Anor.</i>
+

Videos/subtitles/unicode_fr.srt

@@ -0,0 +1,2 @@
+frontend/node_modules
+node_modules

backend/.dockerignore

@@ -1,10 +1,12 @@
 
-FROM python:3.6
+FROM python:3.8
 
-RUN apt-get update -y && apt-get install -y ffmpeg 
+RUN apt-get update -y && apt-get install -y ffmpeg
+
+COPY ./backend/openssl.cnf  /etc/ssl/openssl.cnf
 
 ENV PYTHONUNBUFFERED 1
-COPY . /usr/src/app/
+COPY ./backend/ /usr/src/app/
 WORKDIR /usr/src/app
 
 RUN pip3 install -r requirements.txt

backend/Dockerfile

@@ -10,9 +10,11 @@ RUN npm run build
 
 #Build the backend
 
-FROM python:3.6
+FROM python:3.8
 
-RUN apt-get update -y && apt-get install -y ffmpeg 
+RUN apt-get update -y && apt-get install -y ffmpeg
+
+COPY ./backend/openssl.cnf /etc/ssl/openssl.cnf
 
 ENV PYTHONUNBUFFERED 1
 COPY --from=0 /usr/src/frontend/build/ /usr/src/frontend/build/

backend/Dockerfile.prod

@@ -1,24 +1,13 @@
 from django.contrib import admin
-from StreamServerApp.models import Video
+from StreamServerApp.models import Video, Movie, Series, Subtitle
 from StreamServerApp.database_utils import delete_DB_Infos, populate_db_from_local_folder, update_db_from_local_folder
 from django.conf import settings
 
 
-def populate_videos(modeladmin, request, queryset):
-    delete_DB_Infos()
-    populate_db_from_local_folder(settings.VIDEO_ROOT, settings.VIDEO_URL)
-    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 = []
-
+    search_fields = ['name']
 
 admin.site.register(Video, VideoAdmin)
-admin.site.add_action(populate_videos)
-admin.site.add_action(update_videos)
+admin.site.register(Movie)
+admin.site.register(Series)
+admin.site.register(Subtitle)