#70 Plugin Store::File rewrite link to file URI scheme

id774 · id774 · commit 99c7ab933b4a · 2014-02-21T15:22:28.000+09:00
diff --git a/lib/automatic/feed_maker.rb b/lib/automatic/feed_maker.rb
@@ -37,7 +37,7 @@ def self.create_pipeline(feeds = [])
       RSS::Maker.make("2.0") {|maker|
         xss = maker.xml_stylesheets.new_xml_stylesheet
         maker.channel.title = "Automatic Ruby"
-        maker.channel.description = "Automatic Ruby"
+        maker.channel.description = "Automatic::FeedMaker"
         maker.channel.link = "https://github.com/automaticruby/automaticruby"
         maker.items.do_sort = true
 
@@ -66,7 +66,7 @@ def self.content_provide(url, data)
       RSS::Maker.make("2.0") {|maker|
         xss = maker.xml_stylesheets.new_xml_stylesheet
         maker.channel.title = "Automatic Ruby"
-        maker.channel.description = "Automatic Ruby"
+        maker.channel.description = "Automatic::FeedMaker"
         maker.channel.link = "https://github.com/automaticruby/automaticruby"
         maker.items.do_sort = true
         item = maker.items.new_item
diff --git a/lib/automatic/feed_parser.rb b/lib/automatic/feed_parser.rb
@@ -31,7 +31,7 @@ def self.parse_html(html)
       RSS::Maker.make("2.0") {|maker|
         xss = maker.xml_stylesheets.new_xml_stylesheet
         maker.channel.title = "Automatic Ruby"
-        maker.channel.description = "Automatic Ruby"
+        maker.channel.description = "Automatic::FeedParser"
         maker.channel.link = "https://github.com/automaticruby/automaticruby"
         maker.items.do_sort = true
 
diff --git a/plugins/store/file.rb b/plugins/store/file.rb
@@ -15,6 +15,7 @@ class StoreFile
     def initialize(config, pipeline=[])
       @config = config
       @pipeline = pipeline
+      @return_feeds = []
     end
 
     def run
@@ -28,8 +29,9 @@ def run
               retry_max = @config['retry'].to_i || 0
               begin
                 retries += 1
-                wget(feed.link)
+                feed.link = wget(feed.link)
                 sleep ||= @config['interval'].to_i
+                @return_feeds << Automatic::FeedMaker.generate_feed(feed)
               rescue
                 Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault during file download.")
                 sleep ||= @config['interval'].to_i
@@ -39,17 +41,22 @@ def run
           }
         end
       }
+      @pipeline << Automatic::FeedMaker.create_pipeline(@return_feeds) if @return_feeds.length > 0
       @pipeline
     end
 
     private
     def wget(url)
       filename = url.split(/\//).last
+      filepath = File.join(@config['path'], filename)
       open(url) {|source|
-        open(File.join(@config['path'], filename), "w+b") { |o|
+        open(filepath, "w+b") { |o|
           o.print source.read
         }
       }
+      uri_scheme = "file://" + filepath
+      Automatic::Log.puts("info", "Saved: #{uri_scheme}")
+      uri_scheme
     end
   end
 end
diff --git a/plugins/subscription/text.rb b/plugins/subscription/text.rb
@@ -17,7 +17,7 @@ def initialize(config, pipeline=[])
 
     def run
       create_feed
-      @pipeline << Automatic::FeedMaker.create_pipeline(@return_feeds) unless @return_feeds.length == 0
+      @pipeline << Automatic::FeedMaker.create_pipeline(@return_feeds) if @return_feeds.length > 0
       @pipeline
     end
 
@@ -30,7 +30,7 @@ def create_feed
           @config['titles'].each {|title|
             feed = {}
             feed['title'] = title
-            @return_feeds << Automatic::FeedParser.generate_feed(feed)
+            @return_feeds << Automatic::FeedMaker.generate_feed(feed)
           }
         end
 
diff --git a/test/integration/test_image2local.yml b/test/integration/test_image2local.yml
@@ -19,11 +19,15 @@ plugins:
     config:
       db: test_image.db
 
-  - module: StoreTargetLink
+  - module: StoreFile
     config:
       path: /tmp
       retry: 2
       interval: 2
 
-  #- module: PublishConsole
+  - module: StorePermalink
+    config:
+      db: test_image2.db
+
+  # - module: PublishConsole
 
diff --git a/test/integration/test_tumblr2local.yml b/test/integration/test_tumblr2local.yml
@@ -33,5 +33,11 @@ plugins:
     config:
       db: test_tumblr.db
 
+  - module: StoreFile
+    config:
+      path: /tmp
+      retry: 2
+      interval: 2
+
   #- module: PublishConsole
 
