podcast-to-youtube 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 115e31e02b8cb4d5227184c68ae3ff382a87f504
-  data.tar.gz: 68258b13e753a549584ecab9f3a543d09ce8ce1e
+  metadata.gz: 57b82537f13f35c6432a322663f7360e910f9157
+  data.tar.gz: 082524dcc9f62e39f7ff2ff2d1c9cd97ffca0e9e
 SHA512:
-  metadata.gz: f90c3477a7415663adb7789ac8dd4b020944d123887be3fc42b7313b3361a8d67ce4f14e6451afa8c09c5a54ade0f0ed9037195fac746d326b070f7d4b3b44d8
-  data.tar.gz: b95b9e63d81b0247c34201bb41fc220a88229b33d31479524dfae82b7d5329d35531757d305a2d41457c6b28aaf6c50a3bf1a191429b0f2bf30409418d0f19a1
+  metadata.gz: 29c53c0dd2944e10e94c9fea6b3031fa7e90bd6e4545fd43a05256a07707e04438c4fc7070f37bafeb76f873cacda22bf5ee47655176bd6eacf7b7a63075c0f2
+  data.tar.gz: efb9857a5df38a23b5f7ea228909731a12bbe9af4885ec0bce6328f1f1dc92cfb4a5d7bd9e7358b8f95668851954f9c89cb67f0071f63853ab40136febfb3c71

data/bin/podcast-to-youtube

@@ -9,34 +9,36 @@ require 'optparse'
 options = {}
 
 opt_parser = OptionParser.new do |opt|  
-  opt.banner = "Usage: podcast-to-youtube COMMAND [OPTIONS]"
-  opt.separator  ""
-  opt.separator  "Commands"
-  opt.separator  "     upload: upload an existing podcast feed to youtube"
-  opt.separator  ""
-  opt.separator  "Options"
-
-  opt.on("-f","--feedurl URL","podcast feed url") do |feedurl|
-    options[:feedurl] = feedurl
-  end
-
-  opt.on("-s","--clientsecretfile SECRET","path to the client_secret.json") do |clientsecretfile|
-    options[:clientsecretfile] = clientsecretfile
-  end
-
-  opt.on("-c","--videocategoryid ID","youtube video category id for the uploaded vides") do |videocategoryid|
-    options[:videocategoryid] = videocategoryid
-  end
-
-  opt.on("-h","--help","print this help") do
-    puts opt_parser
-  end
+	opt.banner = "Usage: podcast-to-youtube COMMAND [OPTIONS]"
+	opt.separator  ""
+	opt.separator  "Commands"
+	opt.separator  "     upload: upload an existing podcast feed to youtube"
+	opt.separator  ""
+	opt.separator  "Options"
+
+	opt.on("-f","--feedurl URL","podcast feed url") do |feedurl|
+		options[:feedurl] = feedurl
+	end
+
+	opt.on("-s","--clientsecretfile SECRET","path to the client_secret.json") do |clientsecretfile|
+		options[:clientsecretfile] = clientsecretfile
+	end
+
+	opt.on("-c","--videocategoryid ID","youtube video category id for the uploaded vides") do |videocategoryid|
+		options[:videocategoryid] = videocategoryid
+	end
+
+	opt.on("-h","--help","print this help") do
+		puts opt_parser
+	end
 end
 
 opt_parser.parse!
 
 if ARGV[0] == "upload"
-  	PodcastUploader.upload(options[:feedurl], options[:clientsecretfile], options[:videocategoryid])
+	uploader = PodcastUploader.new
+	uploader.authenticate_youtube(options[:clientsecretfile])
+	uploader.upload(options[:feedurl], options[:videocategoryid])
 else  
-  	puts opt_parser
+	puts opt_parser
 end  

data/lib/podcast-to-youtube.rb

@@ -7,28 +7,32 @@ require 'rubygems'
 require 'json'
 
 class PodcastUploader
-	def self.upload(podcast_feed_url, client_secret_file_path = 'client_secret.json', video_category_id = '28')
-		
-		if File.file?(client_secret_file_path)
-			client_secret = JSON.parse(File.read(client_secret_file_path))
-		else 
-			raise "Please provide client_secret.json. This is required for the Youtube API authentication. More information can be found in the Readme."
-		end
 
-		puts "parsing feed"
-		feed = Feedjira::Feed.fetch_and_parse podcast_feed_url
+	@client_secret
+	@client_secret_file_path
+	@account
+
+	def authenticate_youtube(client_secret_file_path = 'client_secret.json')
+		load_configuration client_secret_file_path
 
 		puts "connecting to youtube account"
 		Yt.configure do |config|
-		  config.client_id = client_secret['installed']['client_id']
-		  config.client_secret = client_secret['installed']['client_secret']
+			config.client_id = @client_secret['installed']['client_id']
+			config.client_secret = @client_secret['installed']['client_secret']
+		end
+		# check for refresh token in config file
+		if !@client_secret['installed']['refresh_token'].nil?
+			puts "using refresh token"
+			authenticate_youtube_by_refresh_token
+		else
+			# otherwise authenticate with oauth2
+			authenticate_youtube_by_access_token
+			save_configuration
 		end
-		redirect_uri = 'urn:ietf:wg:oauth:2.0:oob' # special redirect uri to make the user copy the auth_code to the application
-		puts "open this url in a browser"
-		puts Yt::Account.new(scopes: ['youtube'], redirect_uri: redirect_uri).authentication_url
-		puts "paste the authentication code here and press enter"
-		auth_code = gets.chomp
-		account = Yt::Account.new authorization_code: auth_code, redirect_uri: redirect_uri
+	end
+
+	def upload(podcast_feed_url, video_category_id, privacy = :private)
+		feed = parse_feed podcast_feed_url
 
 		feed.entries.reverse_each do |entry|
 
@@ -56,17 +60,17 @@ class PodcastUploader
 
 				if(convertCMD_status)
 					# upload to youtube
-					video_description = "#{entry.itunes_summary}\n\nMehr Infos und Links zur Episode: #{entry.url}\nVeröffentlicht: #{entry.published}\nEpisode herunterladen (Audio): #{entry.url}\n\nPodcast Webseite: #{feed.url}\nPodcast Abonnieren: #{feed.url}\nPodcast Author: #{feed.itunes_author}"
+					video_description = generate_video_description(entry, feed)
 					video_title = "#{feed.title} - #{entry.title}"
-					if account.videos.any? {|video| video.title == video_title }
+					if @account.videos.any? {|video| video.title == video_title }
 						puts "do not upload video, as it is already online"
 					else
 						puts "uploading videofile to Youtube"
 						# refresh authentication if expired
-						if account.authentication.expired?
-							account = Yt::Account.new refresh_token: account.authentication.refresh_token
+						if @account.authentication.expired?
+							authenticate_youtube_by_refresh_token
 						end
-						account.upload_video videofile, privacy_status: :private, title: video_title, description: video_description, category_id: video_category_id, tags: %w(podcast)
+						@account.upload_video videofile, privacy_status: privacy, title: video_title, description: video_description, category_id: video_category_id, tags: %w(podcast)
 					end
 				else
 					raise "generating videofile #{videofile} failed"
@@ -75,6 +79,60 @@ class PodcastUploader
 				raise "downloading audiofile or coverart failed"
 			end	
 		end
-
 	end
+
+	private
+
+		def authenticate_youtube_by_refresh_token
+			puts "reauthenticate youtube with refresh token"
+			begin  
+				@account = Yt::Account.new refresh_token: @client_secret['installed']['refresh_token']
+			rescue
+				puts "authentication with refresh token failed"
+				authenticate_youtube_by_access_token
+			end 
+			save_configuration
+		end
+
+		def authenticate_youtube_by_access_token
+			puts "authenticate youtube by access token"
+			redirect_uri = 'urn:ietf:wg:oauth:2.0:oob' # special redirect uri to make the user copy the auth_code to the application
+			puts "open this url in a browser"
+			puts Yt::Account.new(scopes: ['youtube'], redirect_uri: redirect_uri).authentication_url
+			puts "paste the authentication code here and press enter"
+			auth_code = STDIN.gets.chomp
+			@account = Yt::Account.new authorization_code: auth_code, redirect_uri: redirect_uri
+		end
+
+		def parse_feed(podcast_feed_url)
+			puts "parsing feed"
+			return Feedjira::Feed.fetch_and_parse podcast_feed_url
+		end
+
+		def load_configuration(file_path)
+			puts "loading configuration"
+			if File.file?(file_path)
+				@client_secret = JSON.parse(File.read(file_path))
+				@client_secret_file_path = file_path
+			else 
+				raise "Could not find config file at #{file_path}. This is required for the Youtube API authentication. More information can be found in the Readme."
+			end
+		end
+
+		def save_configuration
+			puts "saving current configuration"
+			@client_secret['installed']['refresh_token'] = @account.authentication.refresh_token
+			File.write(@client_secret_file_path, @client_secret.to_json)
+		end
+
+		def generate_video_description(entry, feed)
+			video_description = "#{entry.itunes_summary}\n\n"
+			video_description += "Mehr Infos und Links zur Episode: #{entry.url}\n"
+			video_description += "Veröffentlicht: #{entry.published}\n"
+			video_description += "Episode herunterladen (Audio): #{entry.url}\n\n"
+			video_description += "Podcast Webseite: #{feed.url}\n"
+			video_description += "Podcast Abonnieren: #{feed.url}\n"
+			video_description += "Podcast Author: #{feed.itunes_author}"
+			return video_description
+		end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podcast-to-youtube
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Stefan Trauth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: feedjira
@@ -75,9 +75,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="