movie_organizer 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a28b7b48ec7f557670cc640b987534dba854888ecb6fa82652edb99af1999e61
-  data.tar.gz: 6274d25406a319fb04e31c599b17941d5d9b860fa55752f38db5296e375f7913
+  metadata.gz: 3e79b66679e3034ba041b6a74648f9588579e177bb6aeeba31f6ea4dc55648ec
+  data.tar.gz: e01ff240650b55d4237431b30fb1988ffb640a129fa5261448ab0dd4fee6add7
 SHA512:
-  metadata.gz: aa2d1fff8f2f40c78d3c661261cae8aa292b0f703ca46c75fafd302be6d81f7a1374eebb8a58b4c54162c64b2734168c9f889d7628ed05d9edca96bfd8dd100c
-  data.tar.gz: 55b058b03139ae43e85e1c81b99ecaafaa546a54a0a880d92cce972457510af6e8fcd2b95bca8e860cf4b0dfb3c2a50b3642fa6c73eb2e0f77a8094bb1c8726f
+  metadata.gz: f52967cf08b3d97695c63960cea76713ac99d55154ffe8c9674153a9a5907ed1057e676fce98169ff76c4a84353ee1185bfb8a3d3f28779d0342135aa087cb10
+  data.tar.gz: 245370271ea233c8c3f43da77860534b5b6527dcd835238454fddcfcf45233f6cf9345b2e078b2b4603aeb421dc2fc7bb21bf89e14fd64cf33d4ddfb586700a6

data/CHANGELOG

@@ -1,3 +1,9 @@
+*0.1.11* (March 27, 2018)
+
+* Fix bug where it wouldn't always autoload net-scp.
+* Search directory name if a movie filename has no year embedded in it.
+* Allow TV Shows to be copied to remote servers using SCP.
+
 *0.1.10* (March 14, 2018)
 
 * Strip 'WebRip' from filenames

data/lib/movie_organizer/file_copier.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'net/scp'
+
 module MovieOrganizer
   class FileCopier
     attr_accessor :filename, :target_file, :options

data/lib/movie_organizer/media.rb

@@ -40,7 +40,8 @@ module MovieOrganizer
       return @movie unless @movie.nil?
       @movie = false
       Tmdb::Api.key(MovieOrganizer.tmdb_key)
-      title = sanitize(File.basename(filename, ext)).gsub(/\d\d\d\d/, '').strip
+      # Remove the year and sanitize
+      title = sanitize(File.basename(filename, ext)).gsub(/[\s\.\-\_]\(?\d\d\d\d\)?/, '').strip
       matches = Tmdb::Movie.find(title)
       @movie = matches.any?
       @movie
@@ -48,6 +49,8 @@ module MovieOrganizer
 
     def year
       md = basename.match(/\((\d\d\d\d)\)|(19\d\d)|(20\d\d)/)
+      # try dirname if filename has no year
+      md = dirname.match(/\((\d\d\d\d)\)|(19\d\d)|(20\d\d)/) if md.nil?
       md ? md.captures.compact.first : nil
     end
 
@@ -61,6 +64,10 @@ module MovieOrganizer
       File.extname(filename)
     end
 
+    def dirname
+      File.dirname(filename)
+    end
+
     def verbose?
       options[:verbose]
     end
@@ -70,26 +77,34 @@ module MovieOrganizer
     end
 
     # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def sanitize(str)
       cleanstr = str.gsub(/-\s*-/, '')
       cleanstr = cleanstr.gsub(/\[?1080p\]?/, '').strip
-      cleanstr = cleanstr.gsub(/\[?720p\]?/, '').strip
+      cleanstr = cleanstr.gsub(/m?\[?720p\]?/, '').strip
       cleanstr = cleanstr.gsub(/\[[^\]]+\]/, '').strip
       cleanstr = cleanstr.gsub(/EXTENDED/, '').strip
       cleanstr = cleanstr.gsub(/YIFY/, '').strip
       cleanstr = cleanstr.gsub(/VPPV/, '').strip
       cleanstr = cleanstr.gsub(/BluRay/i, '').strip
       cleanstr = cleanstr.gsub(/BrRip/i, '').strip
+      cleanstr = cleanstr.gsub(/[\s\.]Br[\s\.]?/i, '').strip
+      cleanstr = cleanstr.gsub(/BdRip/i, '').strip
       cleanstr = cleanstr.gsub(/ECI/i, '').strip
       cleanstr = cleanstr.gsub(/HDTV/i, '').strip
       cleanstr = cleanstr.gsub(/WEBRip/i, '').strip
       cleanstr = cleanstr.gsub(/x264/, '').strip
+      cleanstr = cleanstr.gsub(/AAC/, '').strip
       cleanstr = cleanstr.gsub(/-lol/i, '').strip
+      cleanstr = cleanstr.gsub(/\+HI/i, '').strip
+      cleanstr = cleanstr.gsub(/muxed/i, '').strip
+      cleanstr = cleanstr.gsub(/\d\d\d+mb/i, '').strip
       # cleanstr = cleanstr.gsub(/[\.\s-]us[\.\s-]/i, ' ').strip
       cleanstr = cleanstr.gsub(/-\s*/, '').strip
       cleanstr = cleanstr.gsub(/\s\s+/, ' ').strip
       cleanstr.gsub(/[\.\+]/, ' ').strip
     end
+    # rubocop:enable Metrics/MethodLength
     # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/movie_organizer/tv_show.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MovieOrganizer
   class TvShow < Media
     S_E_EXPRESSIONS = [
@@ -24,13 +26,9 @@ module MovieOrganizer
         "Season #{season.sub(/^0+/, '')}"
       )
       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 = FileCopier.new(filename, target_file, options)
+      fc.copy
     rescue ArgumentError => err
       raise err unless err.message =~ /^same file:/
     end

data/lib/movie_organizer/version.rb

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

data/spec/lib/movie_organizer/movie_spec.rb

@@ -11,8 +11,9 @@ module MovieOrganizer
         name: 'Coco (2017).mp4'
       },
       'Beetlejuice' => {
-        year: nil,
-        name: 'Beetlejuice ().mp4'
+        directory: 'Beetlejuice (1995)',
+        year: '1995',
+        name: 'Beetlejuice (1995).mp4'
       },
       'Justice.League.2017.1080p.BluRay.x264-[YTS.AM]' => {
         year: '2017',
@@ -21,13 +22,40 @@ module MovieOrganizer
       'Jumanji.Welcome.To.The.Jungle.2017.1080p.WEBRip.x264-[YTS.AM]' => {
         year: '2017',
         name: 'Jumanji Welcome To The Jungle (2017).mp4'
+      },
+      'The.Prestige.2006.m720p.x264' => {
+        year: '2006',
+        name: 'The Prestige (2006).mp4'
+      },
+      'Gone.in.Sixty.Seconds.2000.720p.BrRip.x264.YIFY+HI' => {
+        year: '2000',
+        name: 'Gone in Sixty Seconds (2000).mp4'
+      },
+      'Rain.Man.Br.YIFY' => {
+        directory: 'Rain Man (2000)',
+        year: '2000',
+        name: 'Rain Man (2000).mp4'
+      },
+      'Stealth (2005) BDRip 720p x264-muxed' => {
+        year: '2005',
+        name: 'Stealth (2005).mp4'
+      },
+      'The.Train.Robbers.1973.720p.BluRay.x264.YIFY' => {
+        year: '1973',
+        name: 'The Train Robbers (1973).mp4'
+      },
+      'waterhorse720p.x264' => {
+        year: '2007',
+        directory: 'The Water Horse (2007)',
+        name: 'The Water Horse (2007)'
       }
     }
 
     movies.each_pair do |filename, data|
       context filename do
         before(:each) do
-          @filepath = create_test_file(filename: filename, extension: 'mp4').first
+          dirname = MovieOrganizer.root.join('tmp', data.fetch(:directory, ''))
+          @filepath = create_test_file(filename: filename, extension: 'mp4', dirname: dirname).first
           @expected_filename = data[:name]
           @expected_year = data[:year]
           @movie = Movie.new(@filepath, default_options)

data/spec/support/shared_contexts/media_shared.rb

@@ -32,11 +32,13 @@ shared_context 'media_shared' do
     tvshow    = options.fetch(:tvshow, true)
     count     = options.fetch(:count, 1)
     filename  = options.fetch(:filename, false)
+    dirname   = options.fetch(:dirname, tmpdir)
     extension = options.fetch(:extension, 'mp4')
     files     = []
 
     if filename
-      files = [File.join(tmpdir, "#{filename}.#{extension}")]
+      files = [File.join(dirname, "#{filename}.#{extension}")]
+      FileUtils.mkdir_p(dirname)
       File.open(files.last, 'w') { |f| f.write("Fake Media File\n") }
     else
       count.times do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: movie_organizer
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Chris Blackburn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler