|
1 | 1 | from beetsplug.beetstream.utils import *
|
2 |
| -from beetsplug.beetstream.stream import stream |
3 |
| -from beetsplug.beetstream import app |
| 2 | +from beetsplug.beetstream import app, stream |
4 | 3 | from flask import g, request, Response
|
5 | 4 | from beets.random import random_objs
|
6 | 5 | import xml.etree.cElementTree as ET
|
@@ -54,15 +53,18 @@ def stream_song():
|
54 | 53 | id = int(song_subid_to_beetid(request.values.get('id')))
|
55 | 54 | item = g.lib.get_item(id)
|
56 | 55 |
|
57 |
| - return stream(item.path.decode('utf-8'), maxBitrate) |
| 56 | + if maxBitrate > 0 and item.bitrate > maxBitrate * 1000: |
| 57 | + return stream.try_to_transcode(item.path.decode('utf-8'), maxBitrate) |
| 58 | + else: |
| 59 | + return stream.send_raw_file(item.path.decode('utf-8')) |
58 | 60 |
|
59 | 61 | @app.route('/rest/download', methods=["GET", "POST"])
|
60 | 62 | @app.route('/rest/download.view', methods=["GET", "POST"])
|
61 | 63 | def download_song():
|
62 | 64 | id = int(song_subid_to_beetid(request.values.get('id')))
|
63 | 65 | item = g.lib.get_item(id)
|
64 | 66 |
|
65 |
| - return stream(item.path.decode('utf-8'), 0) |
| 67 | + return stream.send_raw_file(item.path.decode('utf-8')) |
66 | 68 |
|
67 | 69 | @app.route('/rest/getRandomSongs', methods=["GET", "POST"])
|
68 | 70 | @app.route('/rest/getRandomSongs.view', methods=["GET", "POST"])
|
|
0 commit comments