where_to 0.9.6 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWI4YjlkZjYzNGRjNjEyNGYyNzhjMGVlYjE0Y2RkZmYyMWUzZDk4ZQ==
+    NmY0ZmI3NzkxOWZmZjVmYzg3MGZkN2U1NjlhZTU1MjBlNGU2NGU1Zg==
   data.tar.gz: !binary |-
-    OTQ3OTY3YzZjMzQ5OTJjNTBjNDIyYzk0M2JmMWMzNGFmZTY2NjlhYQ==
+    ODgwMTY4YjM1ZmIwOTJkZTVhYWQ0ZjE3NmY4YzYwNDBhZDcxMjk4ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MTRjMDA0YWM2MDYyMzk3MDhhOTA2ZTNjODk2ZDA3Njk2ZGU2NWViYzkyMzc5
-    MDdkMTk3Y2Q1NDFhZjA0MDNmNDAyODJlNWU2MGNjODA4OWE0MzA4Nzc0MTlk
-    ZTBlYjU0ODhkM2FhYjg2M2NhNDk3NTI2NGJjNWJkMmY1NmFmYmU=
+    MGRmNzZkYjY2NTlmMDY1MmE1NmJlNWVkMDVmYTZiMWNmMTdkODcwNmJjNzkw
+    OTA2NTA2MzJiMDExZTE4YzA4Y2QyYTY4ZWZlMzI1NjRlZGI1YTM0NTEzMWY5
+    MjJmMDE1ZWNlNzIwYzE4ZjVlMzM3MGZhOTE0NmNmMzljYzQ5YTk=
   data.tar.gz: !binary |-
-    MDYxMTcxOTc0ZDM0MzRmZDM1NzU0M2Q3ZjNjZDI4NWQ4NWZjM2E2OTVhMDc4
-    NjkzYjBiZjliYTM0OGZkZDFhYTc3NTMyYzFjM2Q0MmE4NmM2YTc0MTU1ZmZl
-    NTc4YTNkOGE3MzFkMTU0Y2I1NTY5ZTZjMzY0NTBjMDQ1Nzk4Y2Y=
+    MGEyMDJhZTY0MzhkYmFhNGQwZGJlZWZmYWViMjhjNGE5Njg1ODI3MWQxNjk3
+    YmQwMmNiMmNmYmJlZDRkOWM0Yjg1ZDVkYWRiMjM4YzJlNjcyNDlkMWFkNmQw
+    YjI2YjcwZmY5ZTE3MDEzM2M0YTczMzJjMWVmYzQ0YmNmZTEwYjU=

data/Rakefile

@@ -5,6 +5,12 @@ RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
 
+namespace :parallel do
+  task :spec do
+    sh "parallel_rspec spec/"
+  end
+end
+
 task :watch do
   folders_to_watch = 'bin lib spec'
   action_on_change = 'bundle exec rake'
@@ -15,4 +21,4 @@ task :watch do
     puts 'You need to have the filewatcher gem installed to perform this task.'
     puts 'Install with \'gem install filewatcher\''
   end
-end
+end

data/bin/whereto

@@ -0,0 +1,143 @@
+#!/usr/bin/env ruby
+require 'gli'
+require_relative '../lib/where_to'
+
+include GLI::App
+
+PROMPT_DESCRIPTORS = Hash.new do |hash, key|
+  hash[key] = "a #{key}"
+end
+
+PROMPT_DESCRIPTORS[:episode_number] = 'an episode number'
+PROMPT_DESCRIPTORS[:episode_title]  = 'an episode title'
+
+# PROMPT_DESCRIPTORS.freeze
+
+program_desc 'Helps you organize your media library by enforcing a consistent directory structure.'
+
+version WhereTo::VERSION
+
+subcommand_option_handling :normal
+arguments :strict
+
+desc 'Enforce a file structure on the specified file or directory'
+arg_name 'location'
+command :organize do |cmd|
+
+  cmd.desc 'Set the name of the series (will otherwise be prompted to enter)'
+  cmd.arg_name 'series_title'
+  cmd.default_value nil
+  cmd.flag [:s, :series]
+
+  cmd.desc 'Set the season number'
+  cmd.arg_name 'season_number'
+  cmd.default_value nil
+  cmd.flag [:n, :season]
+
+  cmd.desc 'Set the TVDB season id'
+  cmd.arg_name 'series_id'
+  cmd.default_value nil
+  cmd.flag [:i, :series_id]
+
+  # cmd.desc 'Set the series airdate'
+  # cmd.arg_name 'season_airdate'
+  # cmd.default_value nil
+  # cmd.flag [:a, :airdate]
+
+  cmd.desc 'Only look for files with the given extension'
+  cmd.arg_name 'extname'
+  cmd.default_value '.mkv'
+  cmd.flag [:e, :ext]
+
+  cmd.desc "Run normally, but don't actually perform renames"
+  cmd.default_value false
+  cmd.switch :dryrun, negatable: false
+
+  cmd.action do |global_options, options, args|
+    puts ''
+    location = args[0]
+    raise "The location '#{location}' does not exist" unless File.exist? location
+
+    @options = options
+
+    Dir.chdir location
+    files = Dir.glob "*#{options[:ext]}"
+    puts "I found the following files:"
+    files.each { |file| puts file }
+    puts ''
+
+    WhereTo.configure do |config|
+      config.tvdb_api_key = ENV['TVDB_API_KEY']
+    end
+
+    process files
+
+  end
+
+end
+
+def process(files)
+  locator = WhereTo::Locator.new series_id: @options[:series_id]
+  locator.episode_number = 0
+  locator.series_title   = prompt_for :series_title, default: locator.series_title
+
+  files.sort.each do |file|
+    puts ''
+    puts "For file #{file}:"
+
+    %i{season episode_number group}.each do |field|
+      locator.send("#{field}=", prompt_for(field, default: locator.send(field)))
+    end
+
+    locator.lookup! 
+    locator.episode_title  = prompt_for :episode_title, default: locator.episode_title
+
+    new_file = locator.locate.filename
+    puts "New filename: #{new_file}"
+
+    if not @options[:dryrun]
+      rename file, to: new_file
+    else
+      puts 'Skipping rename because of dryrun flag'
+    end
+
+  end
+end
+
+def rename(from, to:)
+  print 'Renaming...'
+  FileUtils.mv from, to unless from == to
+  puts 'success!'
+end
+
+def prompt_for(option, default: nil)
+  prompt = "Enter #{PROMPT_DESCRIPTORS[option]}"
+  prompt += " (or press enter for #{default})" unless default.nil?
+  prompt += ': '
+  print prompt
+  input = STDIN.gets.chomp
+  input.empty? ? default : input  
+end
+
+pre do |global,command,options,args|
+  # Pre logic here
+  # Return true to proceed; false to abort and not call the
+  # chosen command
+  # Use skips_pre before a command to skip this block
+  # on that command only
+  true
+end
+
+post do |global,command,options,args|
+  # Post logic here
+  # Use skips_post before a command to skip this
+  # block on that command only
+end
+
+on_error do |exception|
+  # Error logic here
+  # return false to skip default error handling
+  true
+end
+
+exit run(ARGV)

data/lib/where_to/episode_formatter.rb

@@ -4,7 +4,7 @@ module WhereTo
     attr_accessor :quality, :extension, :group
     DEFAULT_EXTENSION = '.mkv'
 
-    def initialize(hash = {}, series_title: hash[:series_title], season_number: hash[:season_number], episode_title: hash[:episode_title], episode_number: hash[:episode_number], extension: hash[:extension], quality: hash[:quality], group: hash[:group])
+    def initialize(hash = {}, series_title: hash[:series_title], season_number: hash[:season_number], episode_title: hash[:episode_title], episode_number: hash[:episode_number], extension: hash[:extension], quality: hash[:quality], group: hash[:group], series_id: hash[:series_id])
       set_unless_nil :series_title,   series_title
       set_unless_nil :season_number,  season_number
       set_unless_nil :episode_title,  episode_title
@@ -48,4 +48,4 @@ module WhereTo
     end
 
   end
-end
+end

data/lib/where_to/locator.rb

@@ -1,14 +1,17 @@
-require 'where_to/location'
-require 'where_to/configuration'
+require_relative 'location'
+require_relative 'configuration'
 require 'yaml'
 
 module WhereTo
   class Locator
     attr_accessor :series_title, :airdate, :season, :season_airdate
-    attr_accessor :episode_title, :episode_number, :episode_quality, :episode_extension, :group
+    attr_accessor :episode_title, :episode_number, :episode_quality, :episode_extension, :group, :series_id
 
     def initialize(hash = {})
       load_values_from hash
+      if series_id
+        @series_title = WhereTo::TVDB.new(params).lookup_series(series_id).name
+      end
     end
   
     def locate(hash = {})
@@ -48,6 +51,7 @@ module WhereTo
       _params[:quality]        = episode_quality
       _params[:extension]      = episode_extension
       _params[:group]          = group
+      _params[:series_id]      = series_id
       _params
     end
 
@@ -58,15 +62,16 @@ module WhereTo
     end
 
     def load_values_from(hash = {})
-      set_unless_nil :series_title,   hash[:series_title]
-      set_unless_nil :airdate,        hash[:airdate]
-      set_unless_nil :season,         hash[:season]
-      set_unless_nil :season_airdate, hash[:season_airdate]
-      set_unless_nil :episode_title,  hash[:episode_title]
-      set_unless_nil :episode_number, hash[:episode_number]
-      set_unless_nil :episode_quality, hash[:episode_quality]
+      set_unless_nil :series_title,      hash[:series_title]
+      set_unless_nil :airdate,           hash[:airdate]
+      set_unless_nil :season,            hash[:season]
+      set_unless_nil :season_airdate,    hash[:season_airdate]
+      set_unless_nil :episode_title,     hash[:episode_title]
+      set_unless_nil :episode_number,    hash[:episode_number]
+      set_unless_nil :episode_quality,   hash[:episode_quality]
       set_unless_nil :episode_extension, hash[:episode_extension]
-      set_unless_nil :group,          hash[:group]
+      set_unless_nil :group,             hash[:group]
+      set_unless_nil :series_id,         hash[:series_id]
     end
   end
-end
+end

data/lib/where_to/tvdb.rb

@@ -11,11 +11,14 @@ module WhereTo
       @db = TvdbParty::Search.new api_key
     end
 
+    # Probably split into lookup_season, lookup_episode (which lazy instantiate)
+    # and lookup_season!, lookup_episode! (which force db hit):w
     def lookup!
       validate!
       results = @db.search(series_title).first unless series_id
       series  = @db.get_series_by_id (series_id || results['seriesid'])
       episode = series.get_episode season, episode_number
+      raise "It doesn't look like the series #{series.name} has an episode #{episode_number} for season #{season}" unless episode
       @episode_title  = episode.name
       @season_airdate = episode.air_date.year 
 
@@ -27,8 +30,12 @@ module WhereTo
       raise 'You need to configure your TVDB API key before looking up episode information'
     end
 
+    def lookup_series(series_id)
+      @db.get_series_by_id series_id 
+    end
+
     def validate!
-      raise 'A series title is required to lookup episode information' if series_title.nil?
+      raise 'A series title is required to lookup episode information' if series_title.nil? && series_id.nil?
       raise 'An episode number is required to lookup episode information' if episode_number.nil?
       raise 'A season number is required to lookup episode information' if season.nil?
       true
@@ -50,6 +57,7 @@ module WhereTo
       set_unless_nil :episode_number, hash[:episode_number]
       set_unless_nil :episode_quality, hash[:episode_quality]
       set_unless_nil :episode_extension, hash[:episode_extension]
+      set_unless_nil :series_id,         hash[:series_id]
     end
   end
-end
+end

data/lib/where_to/version.rb

@@ -1,3 +1,3 @@
 module WhereTo
-  VERSION = "0.9.6"
+  VERSION = "1.0.0"
 end

data/lib/where_to.rb

@@ -1,9 +1,7 @@
-require 'where_to/version'
-require 'where_to/locator'
-require 'where_to/location'
-require 'where_to/configuration'
-require 'where_to/episode_formatter'
-require 'where_to/tvdb'
+require 'date'
+
+# Require all the libraries!
+Dir[File.dirname(__FILE__) + "/where_to/**/*.rb"].each { |f| require_relative f }
 
 module WhereTo
   class << self

data/where_to.gemspec

@@ -14,16 +14,20 @@ Gem::Specification.new do |spec|
   spec.summary       = "Helps preserve a folder structure for mediafiles"
   spec.homepage      = "https://github.com/jutonz/where_to"
 
+  spec.platform      = Gem::Platform::RUBY
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.bindir        = "bin"
+  spec.executables   << "whereto"
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "simplecov", "~> 0.10.0"
   spec.add_development_dependency "coveralls", "~> 0.8.1"
   spec.add_development_dependency "rspec", "~> 3.2"
+  spec.add_development_dependency "parallel_tests", "~> 1.5"
 
   spec.add_dependency "tvdb_party", "~> 0.8.0"
+
+  spec.add_runtime_dependency "gli", "2.13.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: where_to
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Justin Toniazzo
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: parallel_tests
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: tvdb_party
   requirement: !ruby/object:Gem::Requirement
@@ -94,10 +108,25 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.13.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.13.1
 description: 
 email:
 - jutonz42@gmail.com
-executables: []
+executables:
+- whereto
 extensions: []
 extra_rdoc_files: []
 files:
@@ -109,6 +138,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- bin/whereto
 - lib/where_to.rb
 - lib/where_to/configuration.rb
 - lib/where_to/episode_formatter.rb