junkie 0.0.2 → 0.0.3

data/lib/junkie/pyload/observer.rb

@@ -17,8 +17,10 @@ module Junkie
         @api = Junkie::Pyload::Api.new
 
         @ready_for_new_links = true
-        @watchdog = nil
+        @watchdog_enabled = false
         @active_downloads = Hash.new
+
+        @skipped_timer_at_first_complete_detection = false
       end
 
       # is a method that is called once from inside the reactor and allows us
@@ -28,6 +30,10 @@ module Junkie
           @api.login
           cleanup
         }
+
+        EM.add_periodic_timer(@config[:watchdog_refresh]) do
+          monitor_progress if @watchdog_enabled
+        end
       end
 
       # Adds new episode to Pyload which downloads the episode and extracts it
@@ -49,12 +55,7 @@ module Junkie
 
         log.info("Added #{episode} to Pyload, Pid=#{pid}")
 
-        # start watchdog timer if it does not already run
-        if @watchdog.nil?
-          @watchdog = EM::PeriodicTimer.new(@config[:watchdog_refresh]) do
-            monitor_progress
-          end
-        end
+        (@watchdog_enabled = true) unless @watchdog_enabled
       end
 
       # checks if the Observer is ready to add new episodes to Pyload
@@ -78,7 +79,7 @@ module Junkie
 
             if queue_data.empty?
               log.info("Empty Pyload queue, I cancel the watchdog timer")
-              unschedule_watchdog
+              @watchdog_enabled = false
               throw :break
             end
 
@@ -95,10 +96,19 @@ module Junkie
             pids = get_complete_downloads(queue_data)
 
             if not pids.empty?
-              @api.call(:deletePackages, {pids: pids})
-              log.info("Complete packages are removed from Pyload Queue")
-
-              @ready_for_new_links = true
+              if @skipped_timer_at_first_complete_detection
+                @api.call(:deletePackages, {pids: pids})
+                log.info("Complete packages are removed from Pyload Queue")
+                @skipped_timer_at_first_complete_detection = false
+
+                @ready_for_new_links = true
+              else
+                # If a package is complete, we are sometimes so fast to remove
+                # it, before the extracting can be started, so we will skip it
+                # the first time
+                log.info("Complete package detected, skip the first time")
+                @skipped_timer_at_first_complete_detection = true
+              end
             end
           }
         }
@@ -173,13 +183,6 @@ module Junkie
         end
       end
 
-      # cancels the watchdog timer
-      def unschedule_watchdog
-        if @watchdog_timer
-          @watchdog_timer.cancel
-        end
-      end
-
       def cleanup
         log.debug("Made a cleanup of Pyload's Queue")
         @api.call(:stopAllDownloads)

data/lib/junkie/reactor.rb

@@ -26,8 +26,6 @@ module Junkie
     def initialize
       @config = Config.get_config(self)
 
-      @sindex = Sindex::SeriesIndex.new(index_file: @config[:series_index_file])
-      @sjunkieex = Sjunkieex::Interface.new(@sindex, @config)
       @pyload_observer = Junkie::Pyload::Observer.new()
 
       @episode_queue = EM::Queue.new
@@ -41,9 +39,15 @@ module Junkie
       # the episode_queue if they are new
       @look_for_new_episodes = Proc.new {
         in_fiber {
-          log.info "Looking for new episodes"
 
-          @sjunkieex.get_links_for_downloads.each do |episode|
+          log.debug "Reload Sindex from file"
+          # 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)
+
+          log.info "Looking for new episodes"
+          sjunkieex.get_links_for_downloads.each do |episode|
             identifier = "%s@%s" % [episode.id, episode.series]
 
             if not @found_episodes.has_key? identifier

data/lib/junkie/version.rb

@@ -1,3 +1,3 @@
 module Junkie
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: junkie
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: