miyuki 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a738dc0caf96d28fc8b3807262a1ac9cf8c2a9c0
-  data.tar.gz: a3b604faf11c4e3470d4055fdeadcb457323080f
+  metadata.gz: bfa81dd6b05e2361be6fdd3062edf78a85308fef
+  data.tar.gz: 9c151825a73470dc07d53229209215d1a5997b48
 SHA512:
-  metadata.gz: 52e7cd31f0bcee2b41e9d72bcf012db2fe231ec420abed99c75dfaf6048c92a07282f8161e3c2f5ed8d27267fa22117667dbf116dea3e8a09af360942270d77d
-  data.tar.gz: 83cd396adc61d5f6c077ac184cb0e99257ce01d621f2b8a3bb1ad9e83ae522a29bf51eaab7d6a3f365ead4604a6e385066d958afc0593facaeb46ff5be72ea42
+  metadata.gz: 566a45cae0d029cbe3bafb3d3db98fa816a50e6f3b42916d32a0f0b821c4358ecc3fdf39b79643f5f88fa546d7fdd8bd2d25d9d9d06299feb596e85085d9b6d2
+  data.tar.gz: d1da7e3a0a15709edaf5b1658eccb0b206da5c1adee17baff7af8c933183f2cbea9c1de632fdaf47a4cbcd7db4e48640e9706ee162d71c765e94741d1faaf802

data/.gitignore

@@ -0,0 +1,2 @@
+*.gem
+TODO

data/Gemfile

@@ -3,3 +3,5 @@ source 'https://rubygems.org'
 gem 'rufus-scheduler'
 gem 'yamazaki', '>= 0.3'
 gem 'foreverb'
+gem 'terminal-notifier'
+gem 'libnotify'

data/Gemfile.lock

@@ -8,6 +8,7 @@ GEM
       thor (>= 0.15.0)
     rufus-scheduler (3.0.9)
       tzinfo
+    terminal-notifier (1.6.2)
     thor (0.19.1)
     thread_safe (0.3.4)
     tzinfo (1.2.2)
@@ -21,4 +22,5 @@ PLATFORMS
 DEPENDENCIES
   foreverb
   rufus-scheduler
+  terminal-notifier
   yamazaki (>= 0.3)

data/README.md

@@ -1,10 +1,15 @@
 Miyuki – Non ti lascia mai solo
 ===============================
-
 After having configured the `example/miyuki.conf` configuration file, Miyuki lets you to have always the latest episodes of anime you're watching, downloading the episodes whenever they're available on Nyaa.
 
 Of course, set the watch directory inside the configuration file to the one you've set in your torrent client.
 
+Features
+--------
+- After having launched the daemon, the changes to the configuration file will be always syncronized without having restart Miyuki
+- Whenever Miyuki finds out a new episode to download, you'll be notified with an alert (compatible with OSX natively and with Linux installing `libnotify`)
+- Miyuki gives you a powerful way to search anime series through patterns
+
 How to use
 ----------
 `$ gem install miyuki`
@@ -12,3 +17,12 @@ How to use
 `$ miyuki start example/miyuki.conf`
 
 `$ miyuki stop` (or `$ miyuki kill`)
+
+Known bugs
+----------
+- Nisekoi BDs in `example/miyuki.conf` are downloaded both in 720p and 1080p
+
+Contributors
+------------
+- [alfateam123](https://github.com/alfateam123) — notifications
+

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake'
 task default: [ :build, :install ]
 
 task :build do
-  sh 'gem build *.gemspec'
+   sh 'gem build *.gemspec'
 end
 
 task :install do

data/example/miyuki.conf

@@ -1,6 +1,7 @@
-configuration:
-  watchDir:      "~/.watch"
-  refreshEvery:  1h
+watchDir:      "~/.watch"
+refreshEvery:  1h
+notifications:
+  enabled: true
 
 series:
   - name:   Nisekoi

data/lib/miyuki/miyuki.rb

@@ -13,54 +13,73 @@
 ##
 
 module Miyuki
-	class << self
-		def config=(config_file)
-			@config_file = config_file
-			@config = load_config
+  class << self
+    def config=(config_file)
+      @notifier = Notifier.new
 
-			Rufus::Scheduler.singleton.every('10m') { refresh_config! }
-		end
+      @config_file = config_file
+      @config = load_config
 
-		def track!
-			watch_dir = File.expand_path(@config['configuration']['watchDir'])
-			FileUtils.mkdir_p(watch_dir) unless File.directory?(watch_dir)
+      # TODO: Implement file watcher
+      Rufus::Scheduler.singleton.every('1m') { refresh_config }
+    end
 
-			@tracker = Tracker.new(watch_dir, @config['series'])
+    def track!
+      watch_dir = File.expand_path(@config['watchDir'])
+      FileUtils.mkdir_p(watch_dir) unless File.directory?(watch_dir)
 
-			run_scheduler
-		end
+      # TODO: #deep_dup instead of using Marshal
+      @tracker = Tracker.new(watch_dir, Marshal.load(Marshal.dump(@config))['series']) do |torrent|
+        notify_torrents(torrent)
+      end
 
-	private
+      run_scheduler
+    end
 
-		def refresh_config!
-			new_config = load_config
+  private
 
-			if @config != new_config
-				@config = new_config
-				@scheduler.pause if defined?(@scheduler)
-				track!
-			end
-		end
+    def refresh_config
+      new_config = load_config
 
-		def load_config
-			YAML.load(File.read(@config_file))
-		end
+      if @config != new_config
+        notify_configuration
 
-		def run_scheduler
-			@scheduler = Rufus::Scheduler.new
-			@scheduler.every @config['configuration']['refreshEvery'] do
-			  old_torrents = @tracker.torrents
+        @config = new_config
+        @scheduler.pause if defined?(@scheduler)
+        track!
+      end
+    end
 
-			  @tracker.refresh
+    def refresh_torrents
+      old_torrents = @tracker.torrents
 
-			  new_torrents = @tracker.torrents - old_torrents
-			  if new_torrents.any?
-			    puts 'New torrents:'
-			    new_torrents.each { |torrent| puts torrent.to_s }
-			  end
-			end
+      @tracker.refresh
 
-			@scheduler.join
-		end
-	end
+      new_torrents = @tracker.remove_duplicates(old_torrents)
+      new_torrents.each { |torrent| notify_torrents(new_torrents) }
+    end
+
+    def load_config
+      YAML.load(File.read(@config_file))
+    end
+
+    def run_scheduler
+      @scheduler = Rufus::Scheduler.new
+      @scheduler.every @config['refreshEvery'] { refresh_torrents }
+      @scheduler.join
+    end
+
+    def notify_torrents(torrent)
+      if @config['notifications']['enabled']
+        @notifier.notify(torrent.title, 'New episode released')
+        sleep 1.1
+      end
+    end
+
+    def notify_configuration
+      if @config['notifications']['enabled']
+        @notifier.notify('New configuration loaded in Miyuki', 'Changes detected in configuration file')
+      end
+    end
+  end
 end

data/lib/miyuki/notifier.rb

@@ -0,0 +1,34 @@
+##
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+#
+# Everyone is permitted to copy and distribute verbatim or modified
+# copies of this license document, and changing it is allowed as long
+# as the name is changed.
+#
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+##
+
+module Miyuki
+  class Notifier
+    def initialize(notifier = nil)
+      @notifier = notifier || get_notifier
+    end
+
+    def notify(title, message)
+      @notifier.notify(title, message)
+    end
+
+  private
+
+    def get_notifier
+      case RUBY_PLATFORM
+        when /darwin/ then Miyuki::TerminalNotifier.new
+        when /linux/  then Miyuki::Libnotify.new
+      end
+    end
+  end
+end

data/lib/miyuki/notifiers/libnotify.rb

@@ -0,0 +1,22 @@
+##
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+#
+# Everyone is permitted to copy and distribute verbatim or modified
+# copies of this license document, and changing it is allowed as long
+# as the name is changed.
+#
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+##
+require 'libnotify'
+
+module Miyuki
+  class Libnotify
+    def notify(title, message)
+      ::Libnotify.show(body: message, summary: title)
+    end
+  end
+end

data/lib/miyuki/notifiers/terminal-notifier.rb

@@ -0,0 +1,22 @@
+##
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+#
+# Everyone is permitted to copy and distribute verbatim or modified
+# copies of this license document, and changing it is allowed as long
+# as the name is changed.
+#
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+##
+require 'terminal-notifier'
+
+module Miyuki
+  class TerminalNotifier
+    def notify(title, message)
+      ::TerminalNotifier.notify(message, title: title, sound: 'default')
+    end
+  end
+end

data/lib/miyuki/tracker.rb

@@ -18,10 +18,12 @@ module Miyuki
 
     attr_reader :torrents
 
-    def initialize(watch_dir, series)
+    def initialize(watch_dir, series, &callback)
+      # TODO: This will raise a warning when the class is initializated twice
       Yamazaki.const_set(:WATCH_DIR, watch_dir)
 
-      @series = series
+      @series   = series || []
+      @callback = callback if block_given?
 
       refresh
     end
@@ -30,17 +32,34 @@ module Miyuki
       @torrents = []
 
       fetch_torrents
-      @torrents.each { |torrent| Yamazaki.download_torrent(torrent.title, torrent.link) }
+
+      @torrents.each do |torrent|
+        existed = File.exists?("#{Yamazaki::WATCH_DIR}/#{torrent.title}.torrent")
+        Yamazaki.download_torrent(torrent.title, torrent.link)
+        downloaded = !existed && File.exists?("#{Yamazaki::WATCH_DIR}/#{torrent.title}.torrent")
+
+        # TODO: `downloaded` should be returned by Yamazaki natively
+        @callback.call(torrent) if downloaded && @callback
+      end
+    end
+
+    # TODO: Refactor
+    def remove_duplicates(other_torrents)
+      @torrents.delete_if do |torrent|
+        other_torrents.each do |other_torrent|
+          return true if torrent.link == other_torrent.link
+        end
+      end
     end
 
   private
 
     def fetch_torrents
       @series.each do |series|
-        pattern = pattern_of(series)
+        pattern  = pattern_of(series)
         torrents = search(pattern)
 
-        @torrents.concat(torrents)
+        @torrents.concat(torrents.reverse)
       end
     end
 

data/lib/miyuki/version.rb

@@ -13,5 +13,5 @@
 ##
 
 module Miyuki
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

data/lib/miyuki.rb

@@ -17,6 +17,12 @@ require 'yaml'
 require 'rufus-scheduler'
 require 'yamazaki'
 
+require 'miyuki/notifier'
 require 'miyuki/tracker'
 require 'miyuki/miyuki'
 require 'miyuki/version'
+
+case RUBY_PLATFORM
+  when /darwin/ then require 'miyuki/notifiers/terminal-notifier.rb'
+  when /linux/  then require 'miyuki/notifiers/libnotify.rb'
+end

data/miyuki.gemspec

@@ -1,20 +1,25 @@
 Kernel.load 'lib/miyuki/version.rb'
 
 Gem::Specification.new do |s|
-	s.name          = 'miyuki'
-	s.version       = Miyuki::VERSION
-	s.author        = 'Roxas Shadow'
-	s.email         = 'webmaster@giovannicapuano.net'
-	s.homepage      = 'https://github.com/RoxasShadow/Miyuki'
-	s.platform      = Gem::Platform::RUBY
-	s.summary       = 'Miyuki allows you to not miss any episode of anime you\'re watching'
-	s.description   = 'Miyuki downloads automatically every episode of anime you\'re watching'
-	s.files         = `git ls-files -z`.split("\0")
-	s.require_path  = 'lib'
-	s.executables   = 'miyuki'
-	s.license       = 'WTFPL'
+  s.name          = 'miyuki'
+  s.version       = Miyuki::VERSION
+  s.author        = 'Roxas Shadow'
+  s.email         = 'webmaster@giovannicapuano.net'
+  s.homepage      = 'https://github.com/RoxasShadow/Miyuki'
+  s.platform      = Gem::Platform::RUBY
+  s.summary       = 'Miyuki allows you to not miss any episode of anime you\'re watching'
+  s.description   = 'Miyuki downloads automatically every episode of anime you\'re watching'
+  s.files         = `git ls-files -z`.split("\0")
+  s.require_path  = 'lib'
+  s.executables   = 'miyuki'
+  s.license       = 'WTFPL'
 
-	s.add_dependency 'yamazaki',        '~> 0.3'
-	s.add_dependency 'rufus-scheduler', '~> 3.0'
-	s.add_dependency 'foreverb',        '~> 0.3'
+  s.add_dependency 'yamazaki',        '~> 0.3'
+  s.add_dependency 'rufus-scheduler', '~> 3.0'
+  s.add_dependency 'foreverb',        '~> 0.3'
+
+  case RUBY_PLATFORM
+    when /darwin/ then s.add_dependency 'terminal-notifier', '~> 1.6'
+    when /linux/  then s.add_dependency 'libnotify',         '~> 0.8'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miyuki
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Roxas Shadow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yamazaki
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: Miyuki downloads automatically every episode of anime you're watching
 email: webmaster@giovannicapuano.net
 executables:
@@ -59,6 +73,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -67,6 +82,9 @@ files:
 - example/miyuki.conf
 - lib/miyuki.rb
 - lib/miyuki/miyuki.rb
+- lib/miyuki/notifier.rb
+- lib/miyuki/notifiers/libnotify.rb
+- lib/miyuki/notifiers/terminal-notifier.rb
 - lib/miyuki/tracker.rb
 - lib/miyuki/version.rb
 - miyuki.gemspec