junkie 0.0.3 → 0.0.4

data/junkie.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency(%q<sjunkieex>, [">= 0.0.1"])
   gem.add_runtime_dependency(%q<sindex>, [">= 0.0.1"])
   gem.add_runtime_dependency(%q<logging>, ["~> 1.8.0"])
+  gem.add_runtime_dependency(%q<twitter>, ["~> 4.4.0"])
 end

data/lib/junkie.rb

@@ -8,10 +8,15 @@ require 'junkie/helper'
 require 'junkie/patched/sjunkieex'
 require 'junkie/pyload/api'
 require 'junkie/pyload/observer'
+require 'junkie/notification/twitter'
 require 'logging'
 
+Logging.appenders.stdout(
+    'stdout',
+    :level  => :debug,
+    :layout => Logging.layouts.pattern(:pattern => '[%d] %-5l: %m\n')
+)
 Logging.logger.root.appenders = Logging.appenders.stdout
-Logging.logger.root.level = :debug
 
 module Junkie
 

data/lib/junkie/episode.rb

@@ -5,7 +5,7 @@ module Junkie
 
   class Episode
     attr_reader :id, :series, :found_at, :link
-    attr_accessor :description, :status
+    attr_accessor :description, :status, :pid
 
     def initialize(series, link, description=nil)
       @series = series

data/lib/junkie/notification/twitter.rb

@@ -0,0 +1,68 @@
+require 'twitter'
+
+module Junkie
+  module Notification
+
+    class Twitter
+      include Log, Config
+
+      DEFAULT_CONFIG = {
+        twitter_enabled:    false,
+        consumer_key:       "",
+        consumer_secret:    "",
+        oauth_token:        "",
+        oauth_token_secret: "",
+      }
+
+      def initialize(channels)
+        @channels = channels
+        @config = Config.get_config(self)
+
+        if @config[:twitter_enabled]
+
+          # check the configuration
+          [:consumer_key, :consumer_secret, :oauth_token,
+           :oauth_token_secret].each do |key|
+
+            unless @config[key] && @config[key].match(/\w+/)
+              raise InvalidConfigError, "#{key} option is missing"
+            end
+          end
+
+          # configure
+          ::Twitter.configure do |config|
+            config.consumer_key = @config[:consumer_key]
+            config.consumer_secret = @config[:consumer_secret]
+            config.oauth_token = @config[:oauth_token]
+            config.oauth_token_secret = @config[:oauth_token_secret]
+          end
+
+          # bind to channel
+          @channels[:notifications].subscribe do |episode|
+            next unless episode.status == :extracted
+
+            log.info("Received an episode from channel. I will tweet about this")
+            send_notification(episode)
+          end
+
+        else
+          log.info("Twitter support is disabled")
+        end
+      end
+
+      private
+
+      # Sends a formatted message out through Twitter
+      #
+      # @param [Junkie::Episode] episode that has been downloaded
+      def send_notification(episode)
+        begin
+          mess = "A new episode of #{episode} has been downloaded #junkie"
+          ::Twitter.update(mess)
+        rescue Exception => e
+          log.error(e)
+        end
+      end
+    end
+  end
+end

data/lib/junkie/pyload/observer.rb

@@ -11,18 +11,31 @@ module Junkie
           watchdog_refresh: 10,          # interval the watchdog_timer is fired
       }
 
-      def initialize(config={})
+      def initialize(channels)
         @config = Config.get_config(self)
 
         @api = Junkie::Pyload::Api.new
 
+        @channels = channels
+
+        @found_episodes = Array.new
+
+        @active_episode = nil
+
         @ready_for_new_links = true
         @watchdog_enabled = false
-        @active_downloads = Hash.new
-
         @skipped_timer_at_first_complete_detection = false
+        @should_send_it_on_channel = false
+
+        @channels[:episodes].subscribe do |episode|
+          next unless episode.status == :found
+
+          log.info("Got episode from Channel: #{episode}")
+          @found_episodes.push(episode)
+        end
       end
 
+
       # is a method that is called once from inside the reactor and allows us
       # to register custom actions into the reactor
       def setup
@@ -32,32 +45,53 @@ module Junkie
         }
 
         EM.add_periodic_timer(@config[:watchdog_refresh]) do
+
+          # temporary fix for the SystemStackError
+          if @should_send_it_on_channel
+            log.info("Sending complete episode out on the channel")
+            @channels[:episodes].push(@active_episode)
+            @active_episode = nil
+
+            @should_send_it_on_channel = false
+          end
+
           monitor_progress if @watchdog_enabled
+
+          in_fiber {
+            add_next_episode_to_pyload
+          }
         end
       end
 
-      # Adds new episode to Pyload which downloads the episode and extracts it
-      #
-      # @param [Junkie::Episode] episode which should be downloaded
+
+      # Add next episode to Pyload which downloads the episode and extracts it
       #
       # @note should only be called if `is_ready?` returns true
-      def add_episode(episode)
-        raise InvalidStateError, "Observer is not ready" unless is_ready?
-        @ready_for_new_links = false
+      def add_next_episode_to_pyload
+
+        # detect if we cann add a new episode
+        return unless is_ready?
+        return if @found_episodes.empty?
+
+        @active_episode = @found_episodes.shift
+        episode = @active_episode
 
+        @ready_for_new_links = false
         episode.status = :downloading
 
         package = "%s@%s" % [ episode.id, episode.series ]
 
-        pid = @api.call(:addPackage, {name: package, links: [episode.link]})
+        pid = @api.call(:addPackage,
+                          { name: package, links: [episode.link] })
 
-        @active_downloads[pid] = episode
+        episode.pid = pid
 
         log.info("Added #{episode} to Pyload, Pid=#{pid}")
 
         (@watchdog_enabled = true) unless @watchdog_enabled
       end
 
+
       # checks if the Observer is ready to add new episodes to Pyload
       #
       # @returns [Boolean] true if new links can be added
@@ -72,7 +106,6 @@ module Junkie
       # It monitors the download process and reacts depending on the results
       def monitor_progress
         log.debug("Watchdog timer has been fired")
-
         in_fiber {
           catch(:break) {
             queue_data = @api.call(:getQueueData)
@@ -97,10 +130,22 @@ module Junkie
 
             if not pids.empty?
               if @skipped_timer_at_first_complete_detection
+
+                # post process complete active download and send it out on the
+                # channel
+                if pids.include? @active_episode.pid
+                  log.info("'#{@active_episode}' is extracted completely")
+                  @active_episode.pid = nil
+                  @active_episode.status = :extracted
+
+                  @should_send_it_on_channel = true
+                end
+
+                # remove all complete packages
                 @api.call(:deletePackages, {pids: pids})
                 log.info("Complete packages are removed from Pyload Queue")
-                @skipped_timer_at_first_complete_detection = false
 
+                @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
@@ -114,6 +159,7 @@ module Junkie
         }
       end
 
+
       # Searches for failed links in the pyload queue
       #
       # @param [Array] queue_data returned from :getQueueData api method
@@ -130,6 +176,7 @@ module Junkie
         false
       end
 
+
       # Looks for complete downloads and returns their pids
       #
       # @param [Array] queue_data returned from :getQueueData api method
@@ -169,12 +216,11 @@ module Junkie
       def update_package_ids(queue_data)
         queue_data.each do |package|
           pid = package['pid']
-          next if @active_downloads.has_key? pid
+          next if @active_episode.pid == pid
 
-          if @active_downloads.has_key? pid-1
+          if @active_episode.pid == pid-1
             log.info("Package ID has been changed, I will correct this")
-            @active_downloads[pid] = @active_downloads[pid-1]
-            @active_downloads.delete(pid-1)
+            @active_episode.pid = pid
             next
           end
 

data/lib/junkie/reactor.rb

@@ -18,7 +18,6 @@ module Junkie
       :hd_enabled         => false,
       :hoster_id          => "ul",
       :series_index_file  => File.join(Dir.home, '.sindex/seriesindex.xml'),
-      :episode_queue_timer_refresh => 5,  # in seconds
       :episode_search_refresh      => 15, # in minutes
     }
 
@@ -26,9 +25,19 @@ module Junkie
     def initialize
       @config = Config.get_config(self)
 
-      @pyload_observer = Junkie::Pyload::Observer.new()
+      log.info("Starting Junkie #{Junkie::VERSION}")
+
+      episode_channel = EM::Channel.new
+      notification_channel = EM::Channel.new
+
+      @channels = {
+          episodes: episode_channel,
+          notifications: notification_channel
+      }
+
+      @pyload_observer = Junkie::Pyload::Observer.new(@channels)
+      @twitter_notification = Junkie::Notification::Twitter.new(@channels)
 
-      @episode_queue = EM::Queue.new
       @found_episodes = Hash.new
       build_procs # has to be called here
     end
@@ -52,37 +61,28 @@ module Junkie
 
             if not @found_episodes.has_key? identifier
               log.info("Found new episode '#{episode}'")
-              @episode_queue.push(episode)
+
+              @channels[:episodes].push(episode)
               @found_episodes[identifier] = episode
             end
           end
         }
       }
-
-      # Proc that checks is Pyload-Observer is ready for new episodes and the
-      # episode_queue contains new episodes.
-      #
-      # @note Is called from within the reactor
-      @add_episodes_to_pyload = Proc.new do
-        if @pyload_observer.is_ready?
-          @episode_queue.pop do |episode|
-            log.info("Popped episode '#{episode}' from queue")
-            in_fiber {
-              @pyload_observer.add_episode(episode)
-            }
-          end
-        end
-      end
     end
 
     ###########################################################################
     #################### The Reactor ##########################################
     ###########################################################################
     def start
-      log.info("Starting Junkie #{Junkie::VERSION}")
 
       EM.run do
 
+        @channels[:episodes].subscribe do |episode|
+          next unless episode.status == :extracted
+
+          @channels[:notifications].push(episode)
+        end
+
         # do some initialization work
         @pyload_observer.setup
 
@@ -96,13 +96,6 @@ module Junkie
           end
         end
 
-        # Add found episodes into Pyload if there are any episodes and pyload
-        # is ready
-        EM.add_periodic_timer(
-          @config[:episode_queue_timer_refresh], @add_episodes_to_pyload)
-
-        # for determining blocking operations
-        # EM.add_periodic_timer(1) { puts Time.now.to_i }
       end
     end
   end

data/lib/junkie/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: junkie
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-02 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -155,6 +155,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: twitter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.4.0
 description: TV series management application
 email:
 - philipp-boehm@live.de
@@ -178,6 +194,7 @@ files:
 - lib/junkie/errors.rb
 - lib/junkie/helper.rb
 - lib/junkie/log.rb
+- lib/junkie/notification/twitter.rb
 - lib/junkie/patched/sjunkieex.rb
 - lib/junkie/pyload/api.rb
 - lib/junkie/pyload/observer.rb