fyt 1.1.0 → 1.1.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c611729b71b5a743afe5f3cd8ad2398652c9a49
-  data.tar.gz: 355130646ff2d7aeb63eaa5c7fea96af9147934d
+  metadata.gz: 1cec7dee6e177eb58e5071c79f51f3e1c29a4e69
+  data.tar.gz: af334e708cfb2da0788983657b3409999a31d3f3
 SHA512:
-  metadata.gz: 64bf799b52e985194e48f38c20379b8ff90f0beaa15d004413f73f657c7f5545605fd8bf0cfe6c9f70f65e0ad18bbbeaaf4e475911efc0808377d4ae08b416ba
-  data.tar.gz: f15eb3468a99cc056661a8811ebe60bf07c74b076e606d89f3896d27eb459dc2a49ae47eabbb95ea99a5d7a5a14802123230e3bceca10e9f42958294f7b309d8
+  metadata.gz: 9672d4f3c46fda7fc45de6f22b590274957da90e6c790794bfb7cd017c3aeac17c5c9bcd0e5f381bf47343e86c00444c64a5d01d74a4816e193911f32a51d1b9
+  data.tar.gz: 03c13c6e60a37e62810c3f81880eb200cca32c42a1a3c81b15b68feed062af94be04ebbeb8a72f9c202643c65f40eec18f73167503e6ef4d6d352da262833cc4

data/lib/fyt.rb

@@ -36,9 +36,9 @@ module FYT
     )
 
     config[:feeds].each do |feed_config|
-      source_feed = FYT::Parser.new(feed_config[:url], manager.get!).read
+      source_feed = FYT::Parser.new(feed_config[:url], manager).read
 
-      new_feed = FYT::Builder.new(source_feed, storage, config[:server_prefix], manager.get!).build
+      new_feed = FYT::Builder.new(source_feed, storage, config[:server_prefix], manager).build
 
       storage.add_feed(feed_config[:name], new_feed)
     end

data/lib/fyt/builder.rb

@@ -2,11 +2,11 @@
 module FYT
   # processes the Youtube feed
   class Builder < FYT::Base
-    def initialize(source_feed, storage, server_prefix, proxy)
+    def initialize(source_feed, storage, server_prefix, proxy_manager)
       @source_feed = source_feed
       @storage = storage
       @server_prefix = server_prefix
-      @proxy = proxy
+      @proxy_manager = proxy_manager
       @maker = RSS::Maker['2.0'].new
     end
 
@@ -39,9 +39,10 @@ module FYT
     end
 
     def add_image(youtube_url, title)
+      proxy = proxy_manager.get!
       youtube_url = youtube_url.gsub('http:', 'https:')
 
-      open(youtube_url, proxy: 'http://' + @proxy.url) do |file|
+      open(youtube_url, proxy: 'http://' + proxy.url) do |file|
         image_url =
           file.read.scan(/<meta property=\"og:image\" content=\"(.*)\">/)
               .flatten.first
@@ -51,6 +52,8 @@ module FYT
       end
     rescue OpenURI::HTTPError => e
       logger.debug "OpenURI::HTTPError: #{e.message}"
+    rescue
+      add_image(youtube_url, title)
     end
 
     def add_item(link, title, filename)

data/lib/fyt/parser.rb

@@ -5,15 +5,19 @@ require 'rss'
 module FYT
   # reads and prepares a youtube feed for further processing
   class Parser < FYT::Base
-    def initialize(url, proxy)
+    def initialize(url, proxy_manager)
       @url = url
-      @proxy = proxy
+      @proxy_manager = proxy_manager
     end
 
     def read
-      open(@url, proxy: 'http://' + @proxy.url) do |rss|
+      proxy = @proxy_manager.get!
+
+      open(@url, proxy: 'http://' + proxy.url) do |rss|
         return RSS::Parser.parse(rss, false)
       end
+    rescue
+      read
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fyt
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1.pre
 platform: ruby
 authors:
 - Steffen Schröder
@@ -54,12 +54,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: fyt