podtergeist 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 867b1321f63eb7766bd461c247f7d44a786e10fd
-  data.tar.gz: eddbd5dfdd5d2a89bc31af3d9812423a85b6e549
+  metadata.gz: 936cd7653a16e5add58ca0680e893175f7da7fbc
+  data.tar.gz: 82e8c580a94acefed48af4dce426cbc06dc0a13a
 SHA512:
-  metadata.gz: 9d6579bbd0910fbe35deb8f1ecea724e0c010e73347f5cc7499bcd4093c65679349b5bb0509814a167f490b65f56dfe34e5f66b1e233ecb27e60d6219b6e2aea
-  data.tar.gz: aba99cae44fa37c9be4acdc32916f9a543094920d0058bdac22fc83100edd1ad041810c457112e1854bfeecee870b1db8dc4fbd0d8e95f6358259cee53d834af
+  metadata.gz: e327e77b2d841f8f79b0e3107a1ed79c1fa95c8363f57d7bbea5ff7eb28ea576da74af3275aa02e031b06f0e71b1d32055b00165fea6b4f03343ede2f9fb07f0
+  data.tar.gz: d027d15c2a566e97c95beea89e0e5c26f97259c4d580dd7bb70ba7b40fd09e2e1c7e854bb1f41401432872cdd560c9c68facf860a4ff79570d4c951521fa0b85

data/bin/podtergeist

@@ -10,7 +10,7 @@ class PodtergeistCLI < Thor
   method_option :host, :required => true, :type => :string
   method_option :show_title, :required => false, :type => :string
   method_option :show_link, :required => true, :type => :string
-  method_option :show_description, :false => true, :type => :string
+  method_option :show_description, :required => false, :type => :string
   method_option :episode_link, :required => true, :type => :string
   method_option :episode_pubdate, :required => true, :type => :string
 

data/lib/podtergeist/feed.rb

@@ -16,7 +16,6 @@ module Podtergeist
 
       def existing(feed,params)
         shows = Dir.glob("#{params['local_directory']}/*.{m4a,mp3}")
-        FileUtils.rm(feed) if feed_exists?(feed)
         create_channel(feed,params,shows.first)
         shows.each do |file|
           append_item(feed,params,file)
@@ -31,47 +30,54 @@ module Podtergeist
       end
 
       # create
-      def create_channel(path,params,file=params['local_file'])
+      def create_channel(path,params,local_file=params['local_file'])
         rss = RSS::Rss.new('2.0')
         channel = RSS::Rss::Channel.new
 
-        # If we have an existing file we don't need to use supplied data.
-        file_metadata = {}
-        TagLib::FileRef.open(file) do |fileref|
-          tag = fileref.tag
-          file_metadata.update({
-            'show_title' => tag.album,
-            'show_description' => "#{tag.album} on #{tag.artist}"
-          })
-        end if file
-
-        channel.title = file_metadata['show_title'] || params['show_title']
-        channel.description = file_metadata['show_description'] || params['show_description']
-        channel.link = file_metadata['show_link'] || params['show_link']
+        # If we have an existing file we prefer it to improperly escaped supplied data.
+        metadata = retrieve_file_metadata(local_file)
+        channel.title = metadata['episode_title'] || params['show_title']
+        channel.description = metadata['show_description'] || params['show_description']
+        channel.link = metadata['show_link'] || params['show_link']
 
         rss.channel = channel
-
-        file = File.new(path, 'w')
-        file.write(rss.to_s)
-        file.close
+        write_rss_file!(path, rss)
       end
 
       # add item
-      def append_item(path,params,file=params['local_file'])
-        remote = URI.escape("#{params['host']}/#{File.basename(file)}")
+      def append_item(path,params,local_file=params['local_file'])
+        rss = RSS::Parser.parse(File.new(path))
+        rss.items << rss_channel_item(local_file, params)
+        write_rss_file!(path, rss)
+      end
 
-        TagLib::FileRef.open(file) do |fileref|
+      protected
+      def retrieve_file_metadata(file)
+        metadata = {}
+        if file
+          TagLib::FileRef.open(file) do |fileref|
+            tag = fileref.tag
+            metadata.update({
+              'episode_title' => tag.album,
+              'show_description' => "#{tag.album} on #{tag.artist}"
+            })
+          end
+        end
+        metadata
+      end
+
+      def rss_channel_item(local_file, params)
+        TagLib::FileRef.open(local_file) do |fileref|
           unless fileref.null?
             tag = fileref.tag
             properties = fileref.audio_properties
 
-            rss = RSS::Parser.parse(File.new(path))
-
             item = RSS::Rss::Channel::Item.new
             item.title = tag.title
             item.link = params['episode_link'] unless params['episode_link'].nil?
-
-            item.pubDate = Date.parse(params['episode_pubdate']).rfc822 unless params['episode_pubdate'].nil?
+            if pub_date = params['episode_pubdate'] || pub_date = File.ctime(local_file).to_s
+              item.pubDate = Date.parse(pub_date).rfc822
+            end
 
             item.guid = RSS::Rss::Channel::Item::Guid.new
             item.guid.content = params['episode_link'] unless params['episode_link'].nil?
@@ -79,17 +85,20 @@ module Podtergeist
 
             item.description = tag.comment
 
-            item.enclosure = RSS::Rss::Channel::Item::Enclosure.new(remote, properties.length, MIME::Types.type_for(file).first)
+            remote = URI.escape("#{params['host']}/#{File.basename(local_file)}")
+            item.enclosure = RSS::Rss::Channel::Item::Enclosure.new(
+              remote, properties.length, MIME::Types.type_for(local_file).first
+            )
 
-            rss.items << item
-
-            file = File.new(path, 'w')
-            file.write(rss.to_s)
-            file.close
+            return item
           end
         end
       end
 
+      def write_rss_file!(path, rss, mode = 'w')
+        File.open(path, mode) { |file| file.write(rss.to_s) }
+      end
+
     end
   end
 end

data/lib/podtergeist/version.rb

@@ -1,3 +1,3 @@
 module Podtergeist
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: podtergeist
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Robert Coleman