fyt 1.0.0 → 1.1.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cfe8a3d2d043c10d0556c4e0abe003dd0e9d792
-  data.tar.gz: 7f0d6d7f9e296cdce98b7fe33100244822ba8ae6
+  metadata.gz: 8092f5a8ee7b7a7d00abd196a38b8f77e3b1c085
+  data.tar.gz: 7321598ee061f2afd9d814a1ba313ae52e35aae8
 SHA512:
-  metadata.gz: 3812e0c3e763f9623ec6e369d310b100832adc9f7d7a0178e00efdda4e7b28c76a54421a1bd67f6f68bfb8abfcb79306d6b068cb353720aa2d37aaa86ab81efb
-  data.tar.gz: 0532aaa8d5d01e05ef6cd01a743a38c94ac78df93730f3b10aef8e6f4ab3ff692fee2261d19ca1d0887de29a4b0e20daa9cbc4b317b2ef5d593d888a85b062e3
+  metadata.gz: 1cd4f4500809e7bce98fa08736ddfe1f209db04285781afcfdce40d2c48025e450cdce1ec3c23e6bbdbe3f779b5fd5341f451a8598b6683deaf1fda194d6da22
+  data.tar.gz: 198e910963312074d2eb278b3e976398396ee055c98adbe57b2bfef5eed418c4387a288a078f9ab0f9ee3279f889a1778dc525fe6705b8dc27601d3058689cd7

data/lib/fyt/base.rb

@@ -8,7 +8,7 @@ module FYT
 
     def logger
       @@logger ||= Logger.new(STDOUT).tap do |logger|
-        logger.level = Logger::INFO
+        logger.level = Logger::DEBUG
       end
     end
   end

data/lib/fyt/builder.rb

@@ -41,7 +41,7 @@ module FYT
     def add_image(youtube_url, title)
       youtube_url = youtube_url.gsub('http:', 'https:')
 
-      open(youtube_url, proxy: @proxy) do |file|
+      open(youtube_url, proxy: 'http://' + @proxy.url) do |file|
         image_url =
           file.read.scan(/<meta property=\"og:image\" content=\"(.*)\">/)
               .flatten.first

data/lib/fyt/parser.rb

@@ -11,7 +11,7 @@ module FYT
     end
 
     def read
-      open(@url, proxy: @proxy) do |rss|
+      open(@url, proxy: 'http://' + @proxy.url) do |rss|
         return RSS::Parser.parse(rss, false)
       end
     end

data/lib/fyt/storage.rb

@@ -2,11 +2,11 @@
 module FYT
   # Manages file downloads and storage
   class Storage < FYT::Base
-    def initialize(path, format_options, output_format, proxy = nil)
+    def initialize(path, format_options, output_format, proxy_manager = nil)
       @path = path || ''
       @format_options = format_options
       @output_format = output_format
-      @proxy = proxy
+      @proxy_manager = proxy_manager
       @known_files = []
     end
 
@@ -15,6 +15,7 @@ module FYT
 
       path = path_for(item)
       download_file!(url, path)
+
       @known_files << File.basename(path)
       File.basename(path)
     end
@@ -50,12 +51,14 @@ module FYT
     private
 
     def download_file!(url, output_path)
+      proxy = @proxy_manager.get!
+
       options = [
         "-f '#{@format_options}'",
         "--merge-output-format '#{@output_format}'",
         "-o '#{output_path}'"
       ]
-      options << "--proxy '#{@proxy}'" if @proxy
+      options << "--proxy 'http://#{proxy.url}'" if proxy
       options << "'#{url}'"
 
       options_string = options.join(' ')
@@ -63,6 +66,8 @@ module FYT
       logger.debug "Executing: youtube-dl #{options_string}"
 
       execute "youtube-dl #{options_string}"
+    rescue
+      download_file!(url, output_path)
     end
 
     def execute(command_string)

data/lib/fyt.rb

@@ -7,6 +7,8 @@ require_relative 'fyt/storage'
 
 require 'fileutils'
 
+require 'proxy_fetcher'
+
 # handles the general behaviour of FYT
 module FYT
   def self.lock
@@ -24,17 +26,19 @@ module FYT
 
   def self.run
     config = FYT::Config.new
+    manager =
+      ProxyFetcher::Manager.new(filters: { country: 'DE', maxtime: '500' })
     storage = FYT::Storage.new(
       config[:storage_path],
       config[:format_options],
       config[:output_format],
-      config[:proxy]
+      manager
     )
 
     config[:feeds].each do |feed_config|
-      source_feed = FYT::Parser.new(feed_config[:url], config[:proxy]).read
+      source_feed = FYT::Parser.new(feed_config[:url], manager.get!).read
 
-      new_feed = FYT::Builder.new(source_feed, storage, config[:server_prefix], config[:proxy]).build
+      new_feed = FYT::Builder.new(source_feed, storage, config[:server_prefix], manager.get!).build
 
       storage.add_feed(feed_config[:name], new_feed)
     end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fyt
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0.pre
 platform: ruby
 authors:
 - Steffen Schröder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
-dependencies: []
+date: 2017-10-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: proxy_fetcher
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: Downloads a youtube channel and its videos and stores them locally as
   a podcatcher-friendly feed
 email: steffen@schröder.xyz
@@ -40,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.10
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: fyt