New release, 0.4.1
Changes: - added --transcode yes/no to enable transcoding .off into .mp3 for handicapped devices which do not support open codes (iOS, looking at you here) - added webcron endpoint to run feed updates in situations where the system scheduler can not be used - feed manager is now mostly a single page app with live updates - added -v (version) option - added versioned updatees for feed and index manager Fixes: - direct login now works as intended New install requirements: - ffmpeg-python - setuptools The change to a SPA was necessitated by the introduction of the `--transcode yes/no` option which (when activated) causes feed updates to take much more time, especially on less powerful hardware. This would cause the feed manager process to timeout before the feeds were updated. This problem is mostly fixed but can still occur in the webcron update process. If this happens the php-fpm and/or web server timeout needs to be increased. This should only happen on slower hardware and/or slow links.
This commit is contained in:
Frank de Lange
parent
b194872598
commit
14b213b315
12 changed files with 654 additions and 188 deletions
|
|
@ -7,8 +7,10 @@ import urllib.parse
|
|||
|
||||
from librespot.metadata import EpisodeId
|
||||
|
||||
import ffmpeg
|
||||
|
||||
from spodcast.const import ERROR, ID, ITEMS, NAME, SHOW, DURATION_MS, DESCRIPTION, RELEASE_DATE, URI, URL, EXTERNAL_URLS, IMAGES, SPOTIFY, FILE_EXISTS
|
||||
from spodcast.feedgenerator import RSS_FEED_CODE, RSS_FEED_FILE_NAME, RSS_FEED_SHOW_INDEX, RSS_FEED_INFO_EXTENSION
|
||||
from spodcast.feedgenerator import RSS_FEED_CODE, RSS_FEED_FILE_NAME, RSS_FEED_SHOW_INDEX, RSS_FEED_INFO_EXTENSION, RSS_FEED_SHOW_IMAGE, RSS_FEED_VERSION, get_index_version
|
||||
from spodcast.spotapi import EPISODE_INFO_URL, SHOWS_URL, EPISODE_DOWNLOAD_URL, ANON_PODCAST_DOMAIN
|
||||
from spodcast.utils import clean_filename
|
||||
from spodcast.spodcast import Spodcast
|
||||
|
|
@ -70,6 +72,8 @@ def download_file(url, filepath):
|
|||
import shutil
|
||||
import requests
|
||||
|
||||
mimetype = "audio/mpeg"
|
||||
|
||||
r = requests.get(url, stream=True, allow_redirects=True)
|
||||
if r.status_code != 200:
|
||||
r.raise_for_status() # Will only raise for 4xx codes, so...
|
||||
|
|
@ -83,24 +87,29 @@ def download_file(url, filepath):
|
|||
and abs(file_size - os.path.getsize(filepath)) < 1000
|
||||
and Spodcast.CONFIG.get_skip_existing_files()
|
||||
):
|
||||
return filepath, FILE_EXISTS
|
||||
return filepath, FILE_EXISTS, mimetype
|
||||
|
||||
log.info("Downloading file")
|
||||
r.raw.read = functools.partial(r.raw.read, decode_content=True)
|
||||
with open(filepath, "wb") as file:
|
||||
shutil.copyfileobj(r.raw, file)
|
||||
|
||||
return filepath, os.path.getsize(filepath)
|
||||
|
||||
return filepath, os.path.getsize(filepath), mimetype
|
||||
|
||||
def download_stream(stream, filepath):
|
||||
size = stream.input_stream.size
|
||||
mp3_filepath = os.path.splitext(filepath)[0] + ".mp3"
|
||||
mimetype = "audio/ogg"
|
||||
|
||||
if (
|
||||
os.path.isfile(filepath)
|
||||
and abs(size - os.path.getsize(filepath)) < 1000
|
||||
((os.path.isfile(filepath)
|
||||
and abs(size - os.path.getsize(filepath)) < 1000)
|
||||
or (Spodcast.CONFIG.get_transcode()
|
||||
and os.path.isfile(mp3_filepath)))
|
||||
and Spodcast.CONFIG.get_skip_existing_files()
|
||||
):
|
||||
return filepath, FILE_EXISTS
|
||||
return filepath, FILE_EXISTS, mimetype
|
||||
|
||||
log.info("Downloading stream")
|
||||
time_start = time.time()
|
||||
|
|
@ -117,7 +126,18 @@ def download_stream(stream, filepath):
|
|||
if delta_want > delta_real:
|
||||
time.sleep(delta_want - delta_real)
|
||||
|
||||
return filepath, downloaded
|
||||
if Spodcast.CONFIG.get_transcode():
|
||||
log.info("transcoding ogg->mp3")
|
||||
transcoder = ffmpeg.input(filepath)
|
||||
transcoder = ffmpeg.output(transcoder, mp3_filepath)
|
||||
ffmpeg.run(transcoder, quiet=True)
|
||||
file.close()
|
||||
os.unlink(filepath)
|
||||
filepath = mp3_filepath
|
||||
downloaded = os.path.getsize(filepath)
|
||||
mimetype = "audio/mpeg"
|
||||
|
||||
return filepath, downloaded, mimetype
|
||||
|
||||
|
||||
def download_episode(episode_id) -> None:
|
||||
|
|
@ -140,48 +160,52 @@ def download_episode(episode_id) -> None:
|
|||
stream = Spodcast.get_content_stream(episode_stream_id, Spodcast.DOWNLOAD_QUALITY)
|
||||
basename = f"{filename}.ogg"
|
||||
filepath = os.path.join(show_directory, basename)
|
||||
path, size = download_stream(stream, filepath)
|
||||
mimetype="audio/ogg"
|
||||
path, size, mimetype = download_stream(stream, filepath)
|
||||
basename = os.path.basename(path) # may have changed due to transcoding
|
||||
else:
|
||||
basename=f"{filename}.mp3"
|
||||
filepath = os.path.join(show_directory, basename)
|
||||
path, size = download_file(download_url, filepath)
|
||||
mimetype="audio/mpeg"
|
||||
path, size, mimetype = download_file(download_url, filepath)
|
||||
|
||||
if size == FILE_EXISTS:
|
||||
log.info(f"Skipped {podcast_name}: {episode_name}")
|
||||
return
|
||||
else:
|
||||
log.warning(f"Downloaded {podcast_name}: {episode_name}")
|
||||
|
||||
if Spodcast.CONFIG.get_enable_rss_feed():
|
||||
episode_info = {
|
||||
"mimetype": mimetype,
|
||||
"medium": "audio",
|
||||
"duration": int(duration_ms/1000),
|
||||
"date": time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.strptime(release_date, "%Y-%m-%d")),
|
||||
"title": escape(episode_name), "guid": uri, "description": escape(description),
|
||||
"filename": urllib.parse.quote(basename),
|
||||
"size": int(size) }
|
||||
info_file = open(os.path.join(show_directory, f"{basename}.{RSS_FEED_INFO_EXTENSION}"), "w")
|
||||
info_file.write(json.dumps(episode_info))
|
||||
info_file.close()
|
||||
if Spodcast.CONFIG.get_rss_feed():
|
||||
episode_info = {
|
||||
"mimetype": mimetype,
|
||||
"medium": "audio",
|
||||
"duration": int(duration_ms/1000),
|
||||
"date": time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.strptime(release_date, "%Y-%m-%d")),
|
||||
"title": escape(episode_name), "guid": uri, "description": escape(description),
|
||||
"filename": urllib.parse.quote(basename),
|
||||
"size": int(size) }
|
||||
info_file = open(os.path.join(show_directory, f"{basename}.{RSS_FEED_INFO_EXTENSION}"), "w")
|
||||
info_file.write(json.dumps(episode_info))
|
||||
info_file.close()
|
||||
|
||||
if Spodcast.CONFIG.get_rss_feed():
|
||||
show_index_file_name = os.path.join(show_directory, f"{RSS_FEED_SHOW_INDEX}.{RSS_FEED_INFO_EXTENSION}")
|
||||
if not os.path.isfile(show_index_file_name):
|
||||
if not os.path.isfile(show_index_file_name) or int(get_index_version(show_index_file_name)) < Spodcast.CONFIG.get_version_int():
|
||||
podcast_name, link, description, image = get_info(episode_id, "show")
|
||||
show_info = {
|
||||
"version": str(RSS_FEED_VERSION + Spodcast.CONFIG.get_version_str()),
|
||||
"title": escape(podcast_name),
|
||||
"link": link,
|
||||
"description": escape(description),
|
||||
"image": image }
|
||||
"image": RSS_FEED_SHOW_IMAGE }
|
||||
show_index_file = open(show_index_file_name, "w")
|
||||
show_index_file.write(json.dumps(show_info))
|
||||
show_index_file.close()
|
||||
|
||||
show_image_name = os.path.join(show_directory, f"{RSS_FEED_SHOW_IMAGE}")
|
||||
if not os.path.isfile(show_image_name):
|
||||
download_file(image, show_image_name)
|
||||
|
||||
rss_file_name = os.path.join(show_directory, RSS_FEED_FILE_NAME)
|
||||
if not os.path.isfile(rss_file_name):
|
||||
if not os.path.isfile(rss_file_name) or int(get_index_version(rss_file_name)) < Spodcast.CONFIG.get_version_int():
|
||||
rss_file = open(rss_file_name, "w")
|
||||
rss_file.write(RSS_FEED_CODE())
|
||||
rss_file.write(RSS_FEED_CODE(Spodcast.CONFIG.get_version_str()))
|
||||
rss_file.close()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue