miyuki 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e1f6766c6de32f19ca19a15b0d50c4aac6462cd
-  data.tar.gz: 71406609632d18bcded6d20be2ffb1f3d1d9f867
+  metadata.gz: 0d1d62e953d637ca08c623be1773c1fe6e9d96ec
+  data.tar.gz: cae2deff7388f7bfc4d8f6f28f751eb03aa476fe
 SHA512:
-  metadata.gz: 4251deb61c0d65ce5a88fc2667a8904a64ce665c1817b5a87e0437e478e0ebeea1d5b7070e2a0ec054d29c2af230630b995db0d98c29a45dcdc686fc7372b442
-  data.tar.gz: 2d5ce0c653fd560c64f2d7ad13ec5382dcf89c1064727696748818db7c73a453cddde89bac4e51bab8bb020066eda6853ff6c28a8835189387dc63dfedbf85b6
+  metadata.gz: fa4d58397e07128b437f0e9308e4e36e7c2ed2edffd99db3e922467a86c8c9094d9a042ede7fd5ffdbef4e67f83e1928a0256f43bf1cd2b16280ab6091a7c3c4
+  data.tar.gz: 2dc1f9116496dfc6be9a6079ca5808c077a7bb256cffe78d2d2bc19f7c0380135f483e5cb639a0364e9e114ddb79367b4fd8217f3475eea757fbfcef6c7dba5c

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+# 0.5
+- Add episodes block in the configuration file to download range of episodes
+
+# 0.4
+- Add tests
+- Implement file-watcher for configuration file
+- Add system notifier for Windows
+
+# 0.3
+- Implement system notifications for OSX and Linux
+
+# 0.2
+- Daemonization
+
+# 0.1
+- Initial release

data/example/miyuki.conf

@@ -4,8 +4,11 @@ notifications:
   enabled: true
 
 series:
-  - name:   Mekakucity
-    fansub: Commie
+  - name:     Mekakucity
+    fansub:   Commie
+    episodes:
+      from: 9
+      skipIfNotSure: true # default: false (download anyway)
 
   - name:    Nisekoi
     fansub:  Commie

data/features/step_definitions/tracker_step.rb

@@ -2,30 +2,59 @@ And(/I wait (\d+) seconds?/) do |seconds|
   sleep seconds.to_f
 end
 
-Then(/I have almost (\d+) torrent files? containing "(.*?)"/) do |count, string|
+Then(/I have almost (\d+) torrent files? containing "(.+)"/) do |count, string|
   watch_dir = Miyuki.config['watchDir']
-  torrent_files = Dir["#{watch_dir}/*.torrent"].select { |f| f.include?(string) }
+  torrent_files = Dir["#{watch_dir}/*.torrent"].select { |f| f.contains?(string) }
 
   expect(torrent_files.count).to be >= count.to_i
 end
 
-And(/I have almost (\d+) torrent files? that do not contain "(.*?)"/) do |count, string|
+And(/I have almost (\d+) torrent files? that do not contain "(.+)"/) do |count, string|
   watch_dir = Miyuki.config['watchDir']
-  torrent_files = Dir["#{watch_dir}/*.torrent"].reject { |f| f.include?(string) }
+  torrent_files = Dir["#{watch_dir}/*.torrent"].reject { |f| f.contains?(string) }
 
   expect(torrent_files.count).to be >= count.to_i
 end
 
-And(/there are (\d+) torrent files? containing "(.*?)"/) do |count, string|
+And(/I have not the episodes? (.+) of "(.+)"/) do |episodes, string|
   watch_dir = Miyuki.config['watchDir']
-  torrent_files = Dir["#{watch_dir}/*.torrent"].select { |f| f.include?(string) }
+  torrent_files = Dir["#{watch_dir}/*.torrent"].select { |f| f.contains?(string) }
+
+  episodes = episodes.split(',').map(&:to_i)
+
+  torrent_files.select! do |f|
+    episode = f.scan(/- [0-9]*\.?[0-9]+/).flatten.last.to_i
+    episodes.include?(episode)
+  end
+
+  expect(torrent_files.empty?).to be_truthy
+end
+
+And(/I have the episodes? (.+) of "(.+)"/) do |episodes, string|
+  watch_dir = Miyuki.config['watchDir']
+  torrent_files = Dir["#{watch_dir}/*.torrent"].select { |f| f.contains?(string) }
+  torrent_files_count = torrent_files.length
+
+  episodes = episodes.split(',').map(&:to_i)
+
+  torrent_files.select! do |f|
+    episode = f.scan(/- [0-9]*\.?[0-9]+/).flatten.last.to_i
+    episodes.include?(episode)
+  end
+
+  expect(torrent_files.length).to_not be torrent_files_count
+end
+
+And(/there are (\d+) torrent files? containing "(.+)"/) do |count, string|
+  watch_dir = Miyuki.config['watchDir']
+  torrent_files = Dir["#{watch_dir}/*.torrent"].select { |f| f.contains?(string) }
 
   expect(torrent_files.count).to be count.to_i
 end
 
-And(/there are (\d+) torrent files? that do not contain "(.*?)"/) do |count, string|
+And(/there are (\d+) torrent files? that do not contain "(.+)"/) do |count, string|
   watch_dir = Miyuki.config['watchDir']
-  torrent_files = Dir["#{watch_dir}/*.torrent"].reject { |f| f.include?(string) }
+  torrent_files = Dir["#{watch_dir}/*.torrent"].reject { |f| f.contains?(string) }
 
   expect(torrent_files.count).to be count.to_i
 end

data/features/support/env.rb

@@ -2,6 +2,13 @@ require 'miyuki'
 require 'rspec'
 require 'fileutils'
 
+class String
+  def contains?(string)
+    string.split.each { |w| return false if not self.include?(w) }
+    true
+  end
+end
+
 Miyuki.join_scheduler = false
 
 After do |s|

data/features/support/miyuki.conf

@@ -4,8 +4,11 @@ notifications:
   enabled: true
 
 series:
-  - name:   Mekakucity
-    fansub: Commie
+  - name:     Mekakucity
+    fansub:   Commie
+    episodes:
+      from: 9
+      skipIfNotSure: true
 
   - name:    Nisekoi
     fansub:  Commie

data/features/tracker.feature

@@ -7,9 +7,11 @@ Feature: Download new episodes
     When I set the configuration file path to "features/support/miyuki.conf"
     And  I invoke "track!"
     And  I wait 5 seconds to let Miyuki to find and download the episodes
-    Then I have almost 2 torrent files containing "BD"
-    And  I have almost 12 torrent file that do not contain "BD"
-    And  there are 0 torrent files containing "BD 720p"
+    Then I have almost 2 torrent files containing "Nisekoi BD"
+    And  I have almost 4 torrent files that do not contain "BD Nisekoi"
+    And  I have not the episodes 1, 4, 8 of "Mekakucity"
+    And  I have the episode 9, 10 of "Mekakucity"
+    And  there are 0 torrent files containing "Nisekoi 720p"
     And  there are 0 torrent files that do not contain "[Commie]"
 
   Scenario: Episodes already downloaded are ignored

data/lib/miyuki/parser.rb

@@ -0,0 +1,55 @@
+##
+#            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
+  module Parser
+    class << self
+      def parse(series)
+        pattern = series.fetch('pattern', '[$fansub] $name')
+
+        pattern.scan(/\$[a-zA-Z_]*/).each do |var|
+          pattern.gsub!(var, series[var[1..-1]]) if series.has_key?(var[1..-1])
+        end
+
+        pattern
+      end
+
+      def filter_episodes!(torrents, from_episode, skip = false)
+        range = from_episode..1.0/0
+
+        if range
+          torrents.select! do |torrent|
+            return skip unless torrent.title
+
+            episode = torrent.title.scan(/- [0-9]*\.?[0-9]+/).last
+            episode = episode.scan(/[0-9]*\.?[0-9]+/).last if episode
+            episode = episode[1..-1] if episode && episode[0] == '0'
+
+            if episode
+              is_integer?(episode) ? range.include?(episode.to_i) : skip
+            else
+              skip
+            end
+          end
+        end
+      end
+
+    private
+
+      def is_integer?(string)
+        string.to_i.to_s == string
+      end
+    end
+  end
+end

data/lib/miyuki/tracker.rb

@@ -39,7 +39,7 @@ module Miyuki
     def refresh
       @torrents = []
 
-      fetch_torrents
+      fetch_torrents!
 
       @torrents.each do |torrent|
         downloaded = Yamazaki.download_torrent(torrent.title, torrent.link)
@@ -58,23 +58,18 @@ module Miyuki
 
   private
 
-    def fetch_torrents
+    def fetch_torrents!
       @series.each do |series|
-        pattern  = pattern_of(series)
-        torrents = search(pattern)
+        query = URI.encode_www_form_component(Parser.parse(series)) # TODO: move encode to yamazaki?
+        torrents = search(query)
 
-        @torrents.concat(torrents.reverse)
-      end
-    end
-
-    def pattern_of(series)
-      pattern = series.fetch('pattern', '[$fansub] $name')
+        episodes = series['episodes']
+        if episodes && episodes['from']
+          Parser.filter_episodes!(torrents, episodes['from'], !!episodes['skipIfNotSure'])
+        end
 
-      pattern.scan(/\$[a-zA-Z_]*/).each do |var|
-        pattern.gsub!(var, series[var[1..-1]]) if series.has_key?(var[1..-1])
+        @torrents.concat(torrents.reverse)
       end
-
-      pattern
     end
   end
 end

data/lib/miyuki/version.rb

@@ -13,5 +13,5 @@
 ##
 
 module Miyuki
-  VERSION = '0.4'
+  VERSION = '0.5'
 end

data/lib/miyuki.rb

@@ -20,6 +20,7 @@ require 'filewatcher'
 require 'deep_clone'
 
 require 'miyuki/notifier'
+require 'miyuki/parser'
 require 'miyuki/tracker'
 require 'miyuki/miyuki'
 require 'miyuki/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miyuki
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Roxas Shadow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yamazaki
@@ -131,6 +131,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -151,6 +152,7 @@ files:
 - lib/miyuki/notifiers/libnotify.rb
 - lib/miyuki/notifiers/notifu.rb
 - lib/miyuki/notifiers/terminal-notifier.rb
+- lib/miyuki/parser.rb
 - lib/miyuki/tracker.rb
 - lib/miyuki/version.rb
 - miyuki.gemspec
@@ -174,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Miyuki allows you to not miss any episode of anime you're watching