From f82c7f1d60bd6ce6b46d39e636158462e576fd8d Mon Sep 17 00:00:00 2001 From: Tom van der Lee Date: Wed, 21 Oct 2015 20:14:51 +0000 Subject: Moved tempdir to download location --- youtube_podcaster/podcastupdater.py | 2 +- youtube_podcaster/youtube/downloader.py | 18 ++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/youtube_podcaster/podcastupdater.py b/youtube_podcaster/podcastupdater.py index 8afebfa..4ba4c8d 100644 --- a/youtube_podcaster/podcastupdater.py +++ b/youtube_podcaster/podcastupdater.py @@ -71,7 +71,7 @@ class PodcastUpdater: feed = self.add_feed(feed_id, yt_playlist) if feed.last_updated < time.time() - 600: - self.populate_feed(feed, feed_id, yt_playlist) + self.populate_feed(feed, feed_id, yt_playlist, max_results=1) feed.rss_file(feed_file) with open(self.feeds_file, "wb") as feeds: diff --git a/youtube_podcaster/youtube/downloader.py b/youtube_podcaster/youtube/downloader.py index 24fa1b0..bbae2e4 100644 --- a/youtube_podcaster/youtube/downloader.py +++ b/youtube_podcaster/youtube/downloader.py @@ -20,20 +20,11 @@ class Downloader: self.location = location self.base_url = base_url - self.downloaded = [] - if file_format == "vorbis": self.extension = "ogg" elif file_format == "opus": self.extension = "opus" - if sys.platform == "linux" and not hasattr(sys, "real_prefix"): - self.tmp_dir = "/tmp/youtube-podcaster" - else: - self.tmp_dir= "%s/tmp/youtube-podcaster" % (sys.prefix) - - os.makedirs(self.tmp_dir, 0o755, True) - def download(self, video, video_id, feed_id): # Real output @@ -43,7 +34,8 @@ class Downloader: # Tmp output tmp_filename = "%s.webm" % (video_id) - tmp_output = "%s/%s" % (self.tmp_dir, tmp_filename) + tmp_dir = "%s/tmp" % output_dir + tmp_output = "%s/%s" % (tmp_dir, tmp_filename) options = {"format": "bestaudio/best", "outtmpl": tmp_output, @@ -55,17 +47,15 @@ class Downloader: video_url = "https://www.youtube.com/watch?v=%s" % (video["snippet"]["resourceId"]["videoId"]) youtube_dl.YoutubeDL(options).download([video_url]) - tmp_output = "%s/%s" % (self.tmp_dir, filename) + tmp_output = "%s/%s" % (tmp_dir, filename) - url = "%s/%s/%s.%s" % (self.base_url, feed_id, video_id, self.extension) + url = "%s/%s/%s" % (self.base_url, feed_id, filename) size = str(os.path.getsize(tmp_output)) mime = mimetypes.guess_type(tmp_output)[0] os.makedirs(output_dir, 0o755, True) os.rename(tmp_output, output) - self.downloaded.append(output) - return (url, size, mime) # vim: set ts=8 sw=4 tw=0 et : -- cgit v1.2.3