junkie 0.0.15 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cee9998ed6619f25ad25d6ecf5a0b1630e590f62
-  data.tar.gz: 167176d895dcde45b58d63d01bcda1678dcda5dd
+  metadata.gz: 7a4dbf5c630d92490879347140c6444521c1a938
+  data.tar.gz: 73f496cb2a66aa3ac8fa51594123f0d540ee6614
 SHA512:
-  metadata.gz: a8d7c7baa3489f5a1ea4bf4e81d1766662e20edb4cf77742b435be03c5ad33f7fd09b88a2e9f1a0b20436917b214b6ff84957244190f11650a4e57eadcff78cd
-  data.tar.gz: b4824a30267a7b4e0b382d33bb8f2f6ad9c4e7424cd0d9d88d40367ba889110d41082fe9cfd225b2c029740f709d147fc0f563c00c42a3d38a2c2e99fb083df2
+  metadata.gz: 178036fb83a0a40e5644e9f3f5e74d269f39b9f8460abe8f15a0dca0d38ba64d1e0b26433c9c35222d8e4799243959ef1666e63d174aab2c1d6c39327cc70497
+  data.tar.gz: 681339370cac8ce58001ad6e56c8dd11bbaa34e19172c5be26ae86ee3d3fd1d14279a4e4d21c22f28a3d23cb9c8e775c500a120c76c782deab6f60a0cac1a29d

data/junkie.gemspec

@@ -23,12 +23,12 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('yajl-ruby', ["~> 1.1.0"])
   gem.add_runtime_dependency('nokogiri', [">= 1.5"])
   gem.add_runtime_dependency('hashconfig', [">= 0.0.2"])
-  gem.add_runtime_dependency('serienrenamer', [">= 0.0.1"])
+  gem.add_runtime_dependency('serienrenamer', [">= 0.2.0"])
   gem.add_runtime_dependency('sjunkieex', [">= 0.0.1"])
-  gem.add_runtime_dependency('sindex', [">= 0.0.1"])
+  gem.add_runtime_dependency('sindex', [">= 0.2.5"])
   gem.add_runtime_dependency('logging', ["~> 1.8.0"])
   gem.add_runtime_dependency('twitter', ["~> 4.4.0"])
-  gem.add_runtime_dependency('thin')
+  gem.add_runtime_dependency('thin', ["= 1.5.1"])
   gem.add_runtime_dependency('sinatra', ["~> 1.3.3"])
   gem.add_runtime_dependency('sinatra-websocket', ["~> 0.2.1"])
 end

data/lib/junkie/episode.rb

@@ -2,14 +2,16 @@
 module Junkie
 
   require 'sindex'
+  require 'securerandom'
 
   class Episode
-    attr_reader :id, :series, :found_at, :link
-    attr_accessor :description, :status, :pid
+    attr_reader :uuid, :id, :series, :found_at
+    attr_accessor :description, :status, :pid, :links
 
-    def initialize(series, link, description=nil)
+    def initialize(series, links, description=nil)
+      @uuid = SecureRandom.uuid
       @series = series
-      @link = link
+      @links = links
       @found_at = DateTime.now
       @description = description
       @status = :found
@@ -20,6 +22,18 @@ module Junkie
       "%s (%s)" % [ @series, episode_identifier ]
     end
 
+    def to_hash
+      {
+          uuid: @uuid,
+          id: @id,
+          series: @series,
+          links: @links,
+          status: @status,
+          found_at: @found_at,
+          description: @description
+      }
+    end
+
     private
 
     def episode_identifier

data/lib/junkie/patched/sjunkieex.rb

@@ -65,8 +65,8 @@ module Junkie
               next
           end
 
-          episode = Junkie::Episode.new(
-              series, selected_link, link_data[:episodedata])
+          episode = Junkie::Episode.new(series, [selected_link], link_data[:episodedata])
+          episode.status = :encrypted
           episodes << episode
         end
       end

data/lib/junkie/push/endpoint.rb

@@ -0,0 +1,28 @@
+
+module Junkie
+  module Push
+
+    class Endpoint
+      include Log, Config
+
+      DEFAULT_CONFIG = {
+          gcm_app_key: '',
+      }
+
+      def initialize(channels)
+
+        channels[:push_registration].subscribe do |reg|
+          type, regid = reg
+
+          puts "Add registration %s=%s" % [type, regid]
+        end
+
+        channels[:push_episode_count].subscribe do |count|
+          puts "Count of encrypted episode links: %d" % [count]
+        end
+
+      end
+    end
+  end
+end
+

data/lib/junkie/pyload/observer.rb

@@ -31,7 +31,7 @@ module Junkie
         @should_stat_queued_episodes = false
 
         @channels[:episodes].subscribe do |episode|
-          next unless episode.status == :found
+          next unless episode.status == :decrypted
 
           log.info("Got episode from Channel: #{episode}")
           @found_episodes.push(episode)
@@ -83,8 +83,7 @@ module Junkie
 
         package = "%s@%s" % [ episode.id, episode.series ]
 
-        pid = @api.call(:addPackage,
-                          { name: package, links: [episode.link] })
+        pid = @api.call(:addPackage, {name: package, links: episode.links })
 
         episode.pid = pid
 

data/lib/junkie/reactor.rb

@@ -5,6 +5,7 @@ require 'eventmachine'
 require 'fiber'
 require 'yaml'
 require 'junkie'
+require 'junkie/push/endpoint'
 require 'junkie/pyload/api'
 require 'junkie/pyload/observer'
 require 'junkie/errors'
@@ -20,21 +21,24 @@ module Junkie
       :episode_search_refresh      => 15, # in minutes
     }
 
-
     def initialize
       @config = Config.get_config(self)
 
       log.info("Starting Junkie #{Junkie::VERSION}")
 
       @channels = {
+          encrypted: EM::Channel.new,
           episodes: EM::Channel.new,
           notifications: EM::Channel.new,
           info: EM::Channel.new,
+          push_episode_count: EM::Channel.new,
+          push_registration: EM::Channel.new,
       }
 
       @pyload_observer = Junkie::Pyload::Observer.new(@channels)
       @twitter_notification = Junkie::Notification::Twitter.new(@channels)
       @dumper = Junkie::Notification::Dumper.new(@channels)
+      @push_endpoint = Junkie::Push::Endpoint.new(@channels)
 
       @found_episodes = Hash.new
       build_procs # has to be called here
@@ -98,7 +102,7 @@ module Junkie
             if not @found_episodes.has_key? identifier
               log.info("Found new episode '#{episode}'")
 
-              @channels[:episodes].push(episode)
+              @channels[:encrypted].push(episode)
               @found_episodes[identifier] = episode
             end
           end

data/lib/junkie/version.rb

@@ -1,3 +1,3 @@
 module Junkie
-  VERSION = "0.0.15"
+  VERSION = "0.1.0"
 end

data/lib/junkie/webinterface/interface.rb

@@ -25,6 +25,8 @@ module Junkie
 
         @@stats = Hash.new
 
+        @@encrypted_episodes = Hash.new
+
         # every connected client connects to the following channel, so infos
         # pushed to this channel are transmitted to the clients
         @@ws_channel = EM::Channel.new
@@ -36,9 +38,19 @@ module Junkie
           @@ws_channel.push(info)
         end
 
+        # get new encrypted episode links
+        @@channels[:encrypted].subscribe do |episode|
+          @@encrypted_episodes[episode.uuid] = episode
+          publish_encrypted_count
+        end
+
         run!
       end
 
+      def self.publish_encrypted_count
+        @@channels[:push_episode_count].push(@@encrypted_episodes.length)
+      end
+
       get '/' do
         if !request.websocket?
           @junkie_version = Junkie::VERSION
@@ -65,6 +77,41 @@ module Junkie
           end
         end
       end
+
+      get '/links/encrypted' do
+        content_type :json
+        @@encrypted_episodes.values.map {|e| e.to_hash }.to_json
+      end
+
+      post '/links/decrypt/:uuid' do
+        uuid = params["uuid"]
+        decrypted_links = JSON.parse(request.body.read).fetch("links") { [] }
+
+        if @@encrypted_episodes.has_key?(uuid) and !decrypted_links.empty?
+          episode = @@encrypted_episodes.delete(uuid)
+          episode.status = :decrypted
+          episode.links = decrypted_links
+
+          @@channels[:episodes].push(episode)
+          Interface.publish_encrypted_count
+
+          status 201
+          decrypted_links.to_json
+        else
+          status 404
+        end
+      end
+
+      post "/app/:service" do
+        registration_id = JSON.parse(request.body.read).fetch('regid') { nil }
+
+        if params['service'] != 'gcm' or registration_id == nil
+          status 404
+        else
+          @@channels[:push_registration].push([:gcm, registration_id])
+          status 201
+        end
+      end
     end
   end
 end

data/lib/junkie.rb

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

metadata

@@ -1,195 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: junkie
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.1.0
 platform: ruby
 authors:
 - Philipp Böhm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: hashconfig
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: serienrenamer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: sjunkieex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: sindex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: sinatra-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.1
 description: TV series management application
@@ -200,9 +200,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -218,6 +218,7 @@ files:
 - lib/junkie/notification/dumper.rb
 - lib/junkie/notification/twitter.rb
 - lib/junkie/patched/sjunkieex.rb
+- lib/junkie/push/endpoint.rb
 - lib/junkie/pyload/api.rb
 - lib/junkie/pyload/observer.rb
 - lib/junkie/reactor.rb
@@ -240,17 +241,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: TV series managament tool that does all the work you have with your series.