junkie 0.0.10 → 0.0.11

data/lib/junkie/patched/sjunkieex.rb

@@ -5,23 +5,30 @@ require 'sjunkieex'
 
 module Junkie
 
-  # Monkex-patched version of the Interface from the `sjunkieex` gem
+  # Monkey-patched version of the Interface from the `sjunkieex` gem
   class ::Sjunkieex::Interface
-    include Junkie::Log
+    include Junkie::Log, Junkie::Config
 
+    DEFAULT_CONFIG = {
+      :hd_enabled         => false,
+      # the first hoster has the highest priority
+      :hoster_ids         => ['NOT_AN_HOSTER'],
+    }
 
     # Method that searches for new episodes and returns it in a nice structure
     #
     # @note should be called inside a Ruby fiber
     # @return [Hash] series names as keys, data as values
     def get_links_for_downloads
+      @junkie_config ||= Config.get_config(self)
+
       episodes = []
       look_for_new_episodes.each do |link,series|
 
         links = parse_series_page(series, link)
         links.each do |identifier, link_data|
 
-          hd = @options[:hd_enabled]
+          hd = @junkie_config[:hd_enabled]
 
           # select links, depending on wanted resolution
           links = []
@@ -40,17 +47,27 @@ module Junkie
               next
           end
 
-          download_links = links.select do |link|
-              link.match(/\/f-\w+\/#{ @options[:hoster_id] }_/)
-          end
+          # select a link which corresponds to the hoster with the highest
+          # possible priority
+          selected_link = nil
+          catch(:break) {
+            @junkie_config[:hoster_ids].each do |hoster|
+              links.each do |link|
+                if link.match(/\/f-\w+\/#{ hoster }_/)
+                  selected_link = link
+                  throw :break
+                end
+              end
+            end
+          }
 
-          if download_links.empty?
-              puts "there are no links for this hoster"
+          if selected_link.nil?
+              log.warn("#{series}(#{identifier}) no links for any specified hoster")
               next
           end
 
           episode = Junkie::Episode.new(
-              series, download_links.first, link_data[:episodedata])
+              series, selected_link, link_data[:episodedata])
           episodes << episode
         end
       end
@@ -68,18 +85,18 @@ module Junkie
 
     def get_page_data(link)
       f = Fiber.current
-        http = EventMachine::HttpRequest.new(link).get :timeout => 10
+      http = EventMachine::HttpRequest.new(link).get :timeout => 10
 
-        http.callback { f.resume(http) }
-        http.errback  { f.resume(http) }
+      http.callback { f.resume(http) }
+      http.errback  { f.resume(http) }
 
-        Fiber.yield
+      Fiber.yield
 
-        if http.error
-          raise IOError, http.error
-        end
+      if http.error
+        raise IOError, http.error
+      end
 
-        http.response
+      http.response
     end
   end
 end

data/lib/junkie/pyload/observer.rb

@@ -33,6 +33,7 @@ module Junkie
 
           log.info("Got episode from Channel: #{episode}")
           @found_episodes.push(episode)
+          stat_queued_episodes
         end
       end
 

data/lib/junkie/reactor.rb

@@ -16,8 +16,6 @@ module Junkie
     include Log, Helper, Config
 
     DEFAULT_CONFIG = {
-      :hd_enabled         => false,
-      :hoster_id          => "ul",
       :series_index_file  => File.join(Dir.home, '.sindex/seriesindex.xml'),
       :episode_search_refresh      => 15, # in minutes
     }
@@ -52,7 +50,7 @@ module Junkie
           # TODO refactor this so that we can detect if we have to reload the
           # index (by MD5sum)
           sindex = Sindex::SeriesIndex.new(index_file: @config[:series_index_file])
-          sjunkieex = Sjunkieex::Interface.new(sindex, @config)
+          sjunkieex = Sjunkieex::Interface.new(sindex)
 
           log.info "Looking for new episodes"
           sjunkieex.get_links_for_downloads.each do |episode|

data/lib/junkie/version.rb

@@ -1,3 +1,3 @@
 module Junkie
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/junkie/webinterface/views/index.erb

@@ -30,7 +30,8 @@
 
                     <li data-role="list-divider">About</li>
                     <li>Stats Last Updated At<span class="ui-li-count bigger" id="last_update"></span></li>
-                    <li>Junkie Host<span class="ui-li-count bigger" id="last_update"><%= @server %></span></li>
+                    <li>Junkie Host<span class="ui-li-count bigger"><%= @server %></span></li>
+                    <li>Connection Status<span class="ui-li-count bigger" id="connection_status">disconnected</span></li>
                 </ul>
             </div>
         </div>
@@ -60,8 +61,14 @@
 
         $(function () {
             var ws       = new WebSocket('ws://' + window.location.host + window.location.pathname);
-            ws.onopen    = function()  { console.log('websocket opened'); };
-            ws.onclose   = function()  { console.log('websocket closed'); };
+            ws.onopen    = function()  {
+                console.log('websocket opened');
+                $('#connection_status').text('connected');
+            };
+            ws.onclose   = function()  {
+                console.log('websocket closed');
+                $('#connection_status').text('disconnected');
+            };
             ws.onmessage = function(m) {
                 updateUpdatedAt();
                 var obj = $.parseJSON(m.data);

data/spec/pyload_observer_spec.rb

@@ -14,7 +14,7 @@ describe Junkie::Pyload::Observer do
     stub_const("Junkie::CONFIG_FILE", '/dev/null')
   end
 
-  let(:channels) { {episodes: EM::Channel.new} }
+  let(:channels) { {episodes: EM::Channel.new, info: EM::Channel.new} }
   let(:epi_channel) { channels[:episodes]}
   let(:episode) do
     epi = Junkie::Episode.new( "One Tree Hill", "http://local.host/12345",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: junkie
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine