junkie 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e94bc9ed0a6752f3ab21177d2e301e603c5b164
-  data.tar.gz: 223dfd25c8f29d346f19f8faf35dbde831b03ae1
+  metadata.gz: 299b760e5856e465a123191575aa2f0709eafa75
+  data.tar.gz: e364723f5af594b340f312982e4f934af65af0ef
 SHA512:
-  metadata.gz: bf1971e2ca25e9d06797df7dc90882d31cc05b1a242d89141ce10086d21d5dd65be93fcd6b485c4ec9715206aa8448e86cdd875cc877083a086ad95271ff2ce1
-  data.tar.gz: 8c98fb1bc9f4e8c5955c1593e3b143f5e5596df1a0ca2d60752fe8191e3a182bc240c76f214b252772b1b3ba8dd71537ea2061a0f3b3e37cd6ffbe6646159f99
+  metadata.gz: 982562006b5265fbea20ea56858a374d8dd52b0541df29d99bc1162060081ecc476f06d9c20ad153ea809be6acdc522b4d84c9999c1c3fd814b5ac6f223b3fe1
+  data.tar.gz: 094de64cf493a05b3f99a08cda652a89b0b1e4719d048912bb954684e309f687a94548ed089e56597352dbc8fe33ab7226f4e1acbbbd69ddfc94613d0e9fa68c

data/lib/junkie.rb

@@ -7,6 +7,7 @@ require 'junkie/errors'
 require 'junkie/helper'
 require 'junkie/patched/sjunkieex'
 require 'junkie/push/endpoint'
+require 'junkie/resolver/redirect'
 require 'junkie/pyload/api'
 require 'junkie/pyload/observer'
 require 'junkie/notification/twitter'

data/lib/junkie/reactor.rb

@@ -27,7 +27,6 @@ module Junkie
       log.info("Starting Junkie #{Junkie::VERSION}")
 
       @channels = {
-          encrypted: EM::Channel.new,
           episodes: EM::Channel.new,
           notifications: EM::Channel.new,
           info: EM::Channel.new,
@@ -39,6 +38,7 @@ module Junkie
       @twitter_notification = Junkie::Notification::Twitter.new(@channels)
       @dumper = Junkie::Notification::Dumper.new(@channels)
       @push_endpoint = Junkie::Push::Endpoint.new(@channels)
+      @redirect_resolver = Junkie::Resolver::RedirectResolver.new(@channels)
 
       @found_episodes = Hash.new
       build_procs # has to be called here
@@ -102,7 +102,7 @@ module Junkie
             if not @found_episodes.has_key? identifier
               log.info("Found new episode '#{episode}'")
 
-              @channels[:encrypted].push(episode)
+              @channels[:episodes].push(episode)
               @found_episodes[identifier] = episode
             end
           end

data/lib/junkie/resolver/redirect.rb

@@ -0,0 +1,67 @@
+require 'em-http'
+
+module Junkie
+  module Resolver
+
+    class RedirectResolver
+      include Log, Config
+
+      DEFAULT_CONFIG = {
+          uri_patterns: [
+              'http://download.serienjunkies.org/go-'
+          ],
+      }
+
+      def initialize(channels)
+        @channels = channels
+        @patterns = Config.get_config(self)[:uri_patterns]
+
+        channels[:episodes].subscribe do |episode|
+          next unless episode.status == :decrypted
+
+          resolve_links(episode)
+        end
+      end
+
+      # resolve links that matches any pattern by issuing a HEAD request and
+      # using the Location response header instead of the original supplied header
+      def resolve_links(episode)
+        multi = EventMachine::MultiRequest.new
+        request_count = 0
+
+        episode.links.each_with_index do |link, index|
+          next unless @patterns.index { |p| link.include?(p) }
+
+          request_count += 1
+          multi.add(index, EventMachine::HttpRequest.new(link).head)
+        end
+
+        if request_count == 0
+          send_episode(episode)
+        else
+          multi.callback do
+            links = episode.links.clone
+
+            responses = multi.responses[:callback]
+            responses.each do |index, value|
+              location = value.response_header.fetch("LOCATION") { nil }
+
+              unless location.nil?
+                links[index] = location
+              end
+            end
+
+            episode.links = links
+            send_episode(episode)
+          end
+        end
+      end
+
+      def send_episode(episode)
+        episode.status = :resolved
+        @channels[:episodes].push(episode)
+      end
+
+    end
+  end
+end

data/lib/junkie/version.rb

@@ -1,3 +1,3 @@
 module Junkie
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/junkie/webinterface/interface.rb

@@ -39,7 +39,9 @@ module Junkie
         end
 
         # get new encrypted episode links
-        @@channels[:encrypted].subscribe do |episode|
+        @@channels[:episodes].subscribe do |episode|
+          next unless episode.status == :encrypted
+
           @@encrypted_episodes[episode.uuid] = episode
           publish_encrypted_count
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junkie
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Philipp Böhm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -222,6 +222,7 @@ files:
 - lib/junkie/pyload/api.rb
 - lib/junkie/pyload/observer.rb
 - lib/junkie/reactor.rb
+- lib/junkie/resolver/redirect.rb
 - lib/junkie/version.rb
 - lib/junkie/webinterface/interface.rb
 - lib/junkie/webinterface/public/js/index.js