movie_organizer 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 199a511e1b86bbdb7ce2a222e2bdeac34a40326132316cd23efce60fe8140a61
-  data.tar.gz: ab718813392b8ee32175a537e1ff8039975ffebe738911447599ea24dd5eed03
+  metadata.gz: c7885aa1f3f8cb1095d8710d11f6bbfcb06ae97016b1d068a3380f56f5eea650
+  data.tar.gz: e234282cbc7fcc5bf81406f0f5705041023fa3d14960a46cd3f783a7e9c46f08
 SHA512:
-  metadata.gz: 4f57172be78ef306f073430b6d5d347e5d0b22af075e6d84097ca42fd7c5d872a35df583fadcbd4fd398951df36768891b5741caf1d1cb4078c3850d200ca7c8
-  data.tar.gz: 2009231d9ec48f6058b037f31c91194f4f900670f1a4bc1e229958e48a836c15d761af2626a122cca06807050935d90f8363f4dece3897ffe4856e11a64a7fa7
+  metadata.gz: bab5fc2431675860b49fb64fd32b4bc8b8dc31bc83a061c93ccfa398eb1423546cdf968dd66abb3a7132b1272be089161da5c13377daa468218a68f636633c93
+  data.tar.gz: a89986894a78352fa1135236b997b7832b3d28a0896c4c6e7a30f8a1dc4589c9d6413471b2617582758485d6e88cc31d6fa0ae14afe876647b85de854f010df8

data/CHANGELOG

@@ -1,3 +1,10 @@
+*0.1.8* (March 03, 2018)
+
+* Prompt for movie directory setting if missing
+* Prompt for tv show directory setting if missing
+* Prompt for video directory setting if missing
+* Actual get home video processing working
+
 *0.1.7* (March 03, 2018)
 
 * Prompt for TMDB API key if missing

data/lib/movie_organizer/movie.rb

@@ -10,16 +10,8 @@ module MovieOrganizer
     end
 
     def process!
-      settings = Settings.new
-      target_dir = File.join(
-        settings[:movies][:directory],
-        "#{title} (#{year})"
-      )
-      FileUtils.mkdir_p(target_dir, noop: dry_run?)
-      target_file = File.join(
-        target_dir,
-        processed_filename
-      )
+      target_dir = File.join(MovieOrganizer.movie_directory, "#{title} (#{year})")
+      target_file = File.join(target_dir, processed_filename)
       logger.info("    target dir: [#{target_dir}]")
       logger.info("    target file: [#{target_file.green.bold}]")
       fc = FileCopier.new(filename, target_file, options)

data/lib/movie_organizer/tv_show.rb

@@ -17,13 +17,12 @@ module MovieOrganizer
     def process!
       return nil if should_skip?
       # rename the file
-      fail "Show not configured #{basename}" if title.nil?
+      raise "Show not configured #{basename}" if title.nil?
       target_dir = File.join(
-        settings[:tv_shows][:directory],
+        MovieOrganizer.tv_shows_directory,
         title,
         "Season #{season.sub(/^0+/, '')}"
       )
-      FileUtils.mkdir_p(target_dir, noop: dry_run?)
       target_file = File.join(target_dir, processed_filename)
       logger.info("    target dir: [#{target_dir}]")
       logger.info("    target file: [#{target_file.green.bold}]")
@@ -33,7 +32,7 @@ module MovieOrganizer
         force: true, noop: dry_run?
       )
     rescue ArgumentError => err
-      raise err unless err.message.match(/^same file:/)
+      raise err unless err.message =~ /^same file:/
     end
 
     # Standardize the filename

data/lib/movie_organizer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MovieOrganizer
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'.freeze
 end

data/lib/movie_organizer/video.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'string'
+
 module MovieOrganizer
   class Video < Media
     attr_reader :settings
@@ -9,12 +11,12 @@ module MovieOrganizer
       super
     end
 
-    def process!
-      binding.pry
-      FileUtils.mkdir_p(target_dir, noop: dry_run?)
+    def process!(file_copier = nil)
+      target_file = File.join(target_dir, processed_filename)
       logger.info("    target dir: [#{target_dir}]")
       logger.info("    target file: [#{target_file.green.bold}]")
-      FileUtils.move(filename, target_file, force: true, noop: dry_run?)
+      fc = file_copier || FileCopier.new(filename, target_file, options)
+      fc.copy
     end
 
     def processed_filename
@@ -23,13 +25,13 @@ module MovieOrganizer
 
     def title
       @title ||= begin
-        temp = MovieOrganizer.prompt_for(
-          <<-STRING.here_with_pipe(' ')
-            |Please enter a friendly title for this video: [#{filename}]
-            |or just hit enter to keep the current title
-          STRING
-        )
-        binding.pry
+        prompt = <<-STRING.here_with_pipe(' ')
+          |Enter a friendly title for this video: [#{basename}]
+          |or hit enter to keep the current title
+        STRING
+        new_title = MovieOrganizer.prompt_for(prompt, '')
+        return File.basename(filename, ext) if new_title.nil? || new_title.empty?
+        new_title
       end
     end
 
@@ -41,7 +43,7 @@ module MovieOrganizer
     # private
 
     def target_dir
-      File.join(settings[:videos][:directory], "#{title} (#{date_time})")
+      File.join(MovieOrganizer.video_directory, "#{title} (#{date_time})")
     end
   end
 end

data/lib/movie_organizer.rb

@@ -45,6 +45,33 @@ module MovieOrganizer
     settings[:movies][:tmdb_key]
   end
 
+  def self.movie_directory(settings = Settings.new, test_response = nil)
+    return settings[:movies][:directory] if settings[:movies] && settings[:movies][:directory]
+    settings[:movies] ||= {}
+    settings[:movies][:directory] =
+      prompt_for('Movie destination directory', test_response)
+    settings.save
+    settings[:movies][:directory]
+  end
+
+  def self.tv_shows_directory(settings = Settings.new, test_response = nil)
+    return settings[:tv_shows][:directory] if settings[:tv_shows] && settings[:tv_shows][:directory]
+    settings[:tv_shows] ||= {}
+    settings[:tv_shows][:directory] =
+      prompt_for('TV show destination directory', test_response)
+    settings.save
+    settings[:tv_shows][:directory]
+  end
+
+  def self.video_directory(settings = Settings.new, test_response = nil)
+    return settings[:videos][:directory] if settings[:videos] && settings[:videos][:directory]
+    settings[:videos] ||= {}
+    settings[:videos][:directory] =
+      prompt_for('Video destination directory', test_response)
+    settings.save
+    settings[:videos][:directory]
+  end
+
   #:nocov:
   def self.prompt_for(message = '', test_response = nil)
     prompt = "#{message.dup}\n? "

data/spec/fixtures/.movie_organizer.yml

@@ -15,5 +15,8 @@
   - The Blacklist
 :movies:
   :directory: "/Users/cblackburn/Code/ruby/Gems/movie_organizer/tmp/files/movies"
+  :tmdb_key: asdfasdf
 :new_media_directories:
 - "/Users/djohnson/Downloads"
+:videos:
+  :directory: "/tmp/videos"

data/spec/lib/movie_organizer/tv_show_spec.rb

@@ -63,14 +63,6 @@ module MovieOrganizer
 
     context '.process!' do
       it 'moves the file to the configured location' do
-        settings = Settings.new
-        binding.pry if settings.nil?
-        target_dir = File.join(
-          settings[:tv_shows][:directory],
-          tv_show.title,
-          "Season #{tv_show.season.sub(/^0+/, '')}"
-        )
-        expect(FileUtils).to receive(:mkdir_p).with(target_dir, noop: true).and_return(nil)
         expect(FileUtils).to receive(:move).and_return(nil)
         tv_show.process!
       end

data/spec/lib/movie_organizer/video_spec.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+# rubocop:disable Metrics/BlockLength
+module MovieOrganizer
+  RSpec.describe Video, type: :lib do
+    include_context 'media_shared'
+
+    let(:filename) do
+      create_test_file(
+        filename: 'Vacation in Florida',
+        extension: 'mp4'
+      ).first
+    end
+    let(:video) { Video.new(filename, default_options) }
+
+    context '#new' do
+      it 'returns a child of the Media class' do
+        expect(video).to be_a(Media)
+      end
+
+      it 'is a Video' do
+        expect(video).to be_a(Video)
+      end
+
+      it 'sets filename accessor' do
+        expect(video.filename).to eq(filename)
+      end
+    end
+
+    context '.processed_filename' do
+      it 'returns a string' do
+        expect(video.processed_filename).to be_a(String)
+      end
+    end
+
+    context '.process!' do
+      it 'moves the file to the configured location' do
+        fc = FileCopier.new('/tmp/bogus', '/tmp/bogus2', default_options)
+        expect(fc).to receive(:copy).and_return(nil)
+        video.process!(fc)
+      end
+    end
+  end
+end
+# rubocop:enable Metrics/BlockLength

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: movie_organizer
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Chris Blackburn
@@ -280,6 +280,7 @@ files:
 - spec/lib/movie_organizer/movie_spec.rb
 - spec/lib/movie_organizer/organizer_spec.rb
 - spec/lib/movie_organizer/tv_show_spec.rb
+- spec/lib/movie_organizer/video_spec.rb
 - spec/lib/movie_organizer_spec.rb
 - spec/spec_helper.rb
 - spec/support/filename_mappings.yml
@@ -325,6 +326,7 @@ test_files:
 - spec/lib/movie_organizer/movie_spec.rb
 - spec/lib/movie_organizer/organizer_spec.rb
 - spec/lib/movie_organizer/tv_show_spec.rb
+- spec/lib/movie_organizer/video_spec.rb
 - spec/lib/movie_organizer_spec.rb
 - spec/spec_helper.rb
 - spec/support/filename_mappings.yml