Replace deprecated ugettext_lazy import with gettext_lazy

sage_stream/api/views.py

@@ -27,7 +27,8 @@ def get(self, request, *args, **kwargs):
         video_path = request.GET.get(path_key)
         range_header = request.META.get('HTTP_RANGE', '').strip()
         range_re = re.compile(range_re_pattern, re.I)
-        video_path = video_path.replace(media_url, media_dir)
+        if not (media_url == '/' or media_dir == ''):
+            video_path = video_path.replace(media_url, media_dir)
         video_path = os.path.join(django_settings.BASE_DIR, video_path)
 
         # log

sage_stream/models.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 class WatchLog(models.Model):
     """Stream watch log"""

sage_stream/utils/file_services.py

@@ -1,15 +1,14 @@
 import os
 
-
-def file_iterator(file_name, chunk_size=8192, offset=0, length=None):
+def file_iterator(file_name, request_index, chunk_size=8192, offset=0, length=None):
     """iterate file chunk by chunk in generator mode"""
     with open(file_name, "rb") as f:
         f.seek(offset, os.SEEK_SET)
         remaining = length
         while True:
             bytes_length = chunk_size if remaining is None else min(remaining, chunk_size)
             data = f.read(bytes_length)
-            if not data:
+            if not (data and request_index.is_current()):
                 break
             if remaining:
                 remaining -= len(data)

sage_stream/utils/stream_services.py

@@ -27,7 +27,7 @@ def get_content_range_header(first_byte, last_byte, size):
     return 'bytes %s-%s/%s' % (first_byte, last_byte, size)
 
 
-def get_streaming_response(path, range_header, range_re, max_load_volume):
+def get_streaming_response(path, range_header, range_re, max_load_volume, request_index):
     """
     get range_header and match bytes position in the file
     generate StreamingHttpResponse
@@ -46,6 +46,7 @@ def get_streaming_response(path, range_header, range_re, max_load_volume):
         resp = StreamingHttpResponse(
             file_iterator(
                 path,
+                request_index,
                 offset=first_byte,
                 length=length
             ),