sindex 0.1.6 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 552391a571ac690c5883cad63976f6d31e96ae41
+  data.tar.gz: 8f91d85665809cd30d74bcd99cdd555e170181a4
+SHA512:
+  metadata.gz: 07a5e6a260d79bb1ea5f85cca815f8c65fdc95d9485c337137218631f3dfad2e837d16ee3177ee261e142542db40acc8ab733be0e304de21a7abb465634fb231
+  data.tar.gz: dedc4575e054849f9f426ccc68dbacf03497532d0a128f251e47db7663caa5096eb92e1976119c664e8ce7a802420198562a9f9d522f066effa0c462c61a1f90

data/bin/sindex

@@ -6,7 +6,6 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'sindex'
 require 'serienrenamer'
-require 'serienmover'
 require 'fileutils'
 require 'hashconfig'
 require 'optparse'
@@ -58,6 +57,13 @@ OptionParser.new do |opts|
     config[:index_file] = opt
   end
 
+  opts.on( "-n", "--new-series STRING", String,
+        "Add a new series to the index. It creates an episode S01E00 for you.") do |opt|
+
+    options[:new_series] ||= []
+    options[:new_series] << opt
+  end
+
   opts.on( "-b", "--buildindex STRING", String,
     "Build an index by reading the series/episodes from the supplied directory") do |opt|
 
@@ -99,6 +105,7 @@ class Cmdline
     @processed_episodes = {}
   end
 
+
   def build_up_index
     @series_index = Sindex::SeriesIndex.new
     @series_index.build_up_index_from_directory(
@@ -107,6 +114,26 @@ class Cmdline
     @series_index.dump_index_to_file(@config[:index_file])
   end
 
+
+  def add_new_series
+    call_pre_processing_hook
+
+    @series_index = Sindex::SeriesIndex.new(index_file: @config[:index_file])
+    changed = false
+
+    @options[:new_series].each do |series|
+      next unless series =~ /\w+/
+      next if @series_index.is_series_in_index?(series)
+
+      puts "Creating new index entry for '%s' with S01E00 episode" % [series]
+      @series_index.add_new_series_to_index(series)
+      changed = true
+    end
+
+    write_new_index_if_wanted if changed
+  end
+
+
   def mark_as_watched
     call_pre_processing_hook
 
@@ -158,7 +185,11 @@ class Cmdline
       added_episodes=true
     end
 
-    exit unless added_episodes
+    write_new_index_if_wanted if added_episodes
+  end
+
+
+  def write_new_index_if_wanted
 
     if agree("\nShould I write the new index? ", true)
       @series_index.dump_index_to_file(@config[:index_file])
@@ -167,7 +198,7 @@ class Cmdline
       # Post process all the episodes with a different hook
       if @config[:episode_hook] and @config[:episode_hook].match(/\w+/)
         @processed_episodes.each do |filename,series|
-          puts "Calling Epiode Hook for '#{filename}'"
+          puts "Calling Episode Hook for '#{filename}'"
           cmd = '%s "%s" "%s"' % [ @config[:episode_hook], filename, series ]
           system(cmd) or fail("Episode-Hook failed")
         end
@@ -193,6 +224,7 @@ class Cmdline
     end
   end
 
+
   def call_post_processing_hook
     # calling the post-processing hook to allow a git commit/push or something
     # else in a Script
@@ -201,6 +233,7 @@ class Cmdline
     end
   end
 
+
   def determine_episode_language(seriesname, filename)
     series = @series_index.series_data[seriesname]
 
@@ -224,14 +257,28 @@ class Cmdline
     end
   end
 
+
   def determine_series_name_for_episode(filename)
     sum = md5sum(filename)
     if not @info_store.episode_hash[sum].nil?
       series_pattern = @info_store.episode_hash[sum]
       puts "<< from infostore: #{series_pattern}"
 
-      matching_series = @series_index.series_data.keys.select do |seriesname|
-        Serienmover::SeriesStore.does_match_series?(seriesname, series_pattern)
+      # try to find an exact match otherwise a fuzzy matching approach
+      fuzzy = false
+      matching_series = []
+
+      loop do
+        matching_series = @series_index.series_data.keys.select do |seriesname|
+            Sindex::SeriesIndex.does_the_series_match?(seriesname, series_pattern, fuzzy)
+        end
+
+        if matching_series.empty? and not fuzzy
+            fuzzy = true
+            redo
+        end
+
+        break
       end
 
       series = nil
@@ -259,6 +306,7 @@ class Cmdline
     end
   end
 
+
   # Private: Generates a md5sum for the number of bytes for the supplied file
   #
   # Returns filename
@@ -278,8 +326,13 @@ end
 
 cmd = Cmdline.new(config, options)
 begin
+
   if options[:build_index_from_dir]
     cmd.build_up_index
+
+  elsif options[:new_series]
+    cmd.add_new_series
+
   else
     cmd.mark_as_watched
   end

data/lib/sindex/series_index.rb

@@ -111,6 +111,7 @@ module Sindex
       end
     end
 
+
     # Public: checks if the seriesname in the supplied data is in the
     # index or an alias to a series
     #
@@ -127,6 +128,7 @@ module Sindex
       ! series_name_in_index(episode_text).nil?
     end
 
+
     # Public: Adds episode to index
     #
     #   :series_name
@@ -141,6 +143,18 @@ module Sindex
       end
     end
 
+
+    # Public: Adds a new series to the index with an S01E00 episode
+    def add_new_series_to_index(series_name)
+      raise ArgumentError, "series (#{ series_name }) is already in index" if
+          is_series_in_index?(series_name)
+
+      series = Sindex::Series.new
+      series.add_episode("S01E00 - some really cool episode name.mkv")
+
+      @series_data[series_name] = series
+    end
+
     class << self
 
       # Public: tries to extract the seriesname from supplied data
@@ -167,6 +181,57 @@ module Sindex
         nil
       end
 
+
+      # Public: tries to match the suppplied seriesname pattern
+      #         agains the series
+      #
+      # seriesname     - the seriesname that comes from the index
+      # series_pattern - the series_name that has to be checked
+      #                  agains the seriesname
+      # fuzzy          - does a fuzzy match against the series
+      #
+      # Returns true if it matches otherwise false
+      def does_the_series_match?(seriesname, series_pattern, fuzzy=false)
+
+        if seriesname.match(/#{series_pattern}/i)
+          # if pattern matches the series directly
+          return true
+
+        elsif fuzzy
+          # start with a pattern that includes all words from
+          # series_pattern and if this does not match, it cuts
+          # off the first word and tries to match again
+          #
+          # if the pattern contains one word and if this
+          # still not match, the last word is splitted
+          # characterwise, so that:
+          #  crmi ==> Criminal Minds
+          name_words = series_pattern.split(/ /)
+          word_splitted = false
+
+          while ! name_words.empty?
+
+            pattern = name_words.join('.*')
+            return true if seriesname.match(/#{pattern}/i)
+
+            # split characterwise if last word does not match
+            if name_words.length == 1 && ! word_splitted
+              name_words = pattern.split(//)
+              word_splitted = true
+              next
+            end
+
+            # if last word was splitted and does not match than break
+            # and return empty resultset
+            break if word_splitted
+
+            name_words.delete_at(0)
+          end
+        end
+
+        false
+      end
+
     end
 
     private

data/lib/sindex/version.rb

@@ -1,3 +1,3 @@
 module Sindex
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/sindex.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.name          = "sindex"
   gem.version       = Sindex::VERSION
   gem.authors       = ["Philipp Böhm"]
-  gem.email         = ["philipp-boehm@live.de"]
+  gem.email         = ["philipp@pboehm.org"]
   gem.description   = %q{Tool and library that manages the episodes you have seen in different tv series}
   gem.summary       = %q{Series-Index that manages your watched episodes}
   gem.homepage      = "https://github.com/pboehm/sindex"
@@ -20,6 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency(%q<nokogiri>, [">= 1.5"])
   gem.add_runtime_dependency(%q<hashconfig>, [">= 0.0.1"])
   gem.add_runtime_dependency(%q<serienrenamer>, [">= 0.0.16"])
-  gem.add_runtime_dependency(%q<serienmover>, [">= 0.0.1"])
-  gem.add_runtime_dependency(%q<highline>, ["= 1.6.13"])
+  gem.add_runtime_dependency(%q<highline>, ["~> 1.6.13"])
 end

metadata

@@ -1,100 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: sindex
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Philipp Böhm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: hashconfig
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: serienrenamer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.16
-- !ruby/object:Gem::Dependency
-  name: serienmover
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.13
 description: Tool and library that manages the episodes you have seen in different
   tv series
 email:
-- philipp-boehm@live.de
+- philipp@pboehm.org
 executables:
 - sindex
 extensions: []
@@ -121,33 +96,26 @@ files:
 - test/test_testdata.rb
 homepage: https://github.com/pboehm/sindex
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 942148595
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 942148595
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Series-Index that manages your watched episodes
 test_files:
 - test/seriesindex_example.xml