handle start_number in / when no segments exist

website/concatenate.py

@@ -108,7 +108,7 @@ def resolve_segment_offset(segment_offset=max(VIEW_COUNTING_PERIOD // HLS_TIME,
     try:
         segment = segments[-min(segment_offset, len(segments))]
     except IndexError:
-        raise FileNotFoundError
+        return None
     return _segment_number(segment)
 
 def get_next_segment(after, start_segment):

website/routes.py

@@ -128,9 +128,8 @@ def segments():
 
     start_number = request.args.get('segment', type=int)
     if start_number == None:
-        try:
-            start_number = resolve_segment_offset()
-        except FileNotFoundError:
+        start_number = resolve_segment_offset()
+        if start_number == None:
             return abort(404)
 
     try:

website/templates/index.html

@@ -55,11 +55,11 @@
                         <source src="{{ url_for('playlist', token=token) }}" type="application/x-mpegURL">
                     </video>
                     <noscript>
-                        <video style="width: 100%;height: 100%;" controls autoplay src="{{ url_for('segments', token=token) }}">
+                        <video style="width: 100%;height: 100%;" controls autoplay src="{{ url_for('segments') }}?{% if start_number != None %}segment={{ start_number }}&{% endif %}token={{ token }}">
                     </noscript>
                     {% else %}
                     <input id="videojs-enabled" type="hidden" value="0">
-                    <video style="width: 100%;height: 100%;" controls autoplay src="{{ url_for('segments') }}?segment={{ start_number }}&token={{ token }}">
+                    <video style="width: 100%;height: 100%;" controls autoplay src="{{ url_for('segments') }}?{% if start_number != None %}segment={{ start_number }}&{% endif %}token={{ token }}">
                     {% endif %}
                 </div>
                 <div id="stream-info-container"><noscript><iframe id="stream-info" src="{{ url_for('stream_info') }}?token={{ token }}&embed=1"></iframe></noscript></div>
@@ -135,4 +135,4 @@
     </script>
     <script src="/static/platform.js"></script>
     </body>
-</html>
+</html>