also accept files according to their extension

[botaradio.git] / interface.py

diff --git a/interface.py b/interface.py
index c2a1d3dacd16c54c585d2b13807a7999d7ad7130..20c9c008efcb775a136a639a078ad63e457ebbce 100644 (file)
--- a/interface.py
+++ b/interface.py
@@ -191,11 +191,13 @@ def status():
         return jsonify({'ver': var.playlist.version,
                         'empty': False,
                         'play': not var.bot.is_pause,
+                        'playhead': var.bot.playhead,
                         'mode': var.playlist.mode})
     else:
         return jsonify({'ver': var.playlist.version,
                         'empty': True,
                         'play': False,
+                        'playhead': -1,
                         'mode': var.playlist.mode})
 
 
@@ -292,7 +294,10 @@ def post():
 
             if len(var.playlist) >= int(request.form['play_music']):
                 var.playlist.point_to(int(request.form['play_music']) - 1)
-                var.bot.interrupt()
+                if not var.bot.is_pause:
+                    var.bot.interrupt()
+                else:
+                    var.bot.is_pause = False
                 time.sleep(0.1)
 
         elif 'delete_music_file' in request.form and ".." not in request.form['delete_music_file']:
@@ -390,7 +395,7 @@ def upload():
         log.info('web: - targetdir: ' + targetdir)
         log.info('web: - mimetype: ' + file.mimetype)
 
-        if "audio" in file.mimetype:
+        if "audio" in file.mimetype or os.path.splitext(filename)[-1] in ('.ogg', '.opus', '.mp3', '.flac', '.wav'):
             storagepath = os.path.abspath(os.path.join(var.music_folder, targetdir))
             print('storagepath:', storagepath)
             if not storagepath.startswith(os.path.abspath(var.music_folder)):