movie_organizer 0.1.11 → 1.0.1

data/spec/support/vcr.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'vcr'
+
+# WebMock.allow_net_connect!
+
+VCR.configure do |c|
+  c.cassette_library_dir = MovieOrganizer.root.join('spec', 'fixtures', 'vcr_cassettes')
+  c.hook_into :webmock
+  c.default_cassette_options = { record: :new_episodes }
+  # c.default_cassette_options = { record: :once }
+  c.configure_rspec_metadata!
+  c.allow_http_connections_when_no_cassette = true
+  c.ignore_localhost         = true
+  c.debug_logger             = File.open(File.join('tmp', 'vcr.log'), 'w+')
+  # config.debug_logger = $stderr
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: movie_organizer
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 1.0.1
 platform: ruby
 authors:
 - Chris Blackburn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,21 +137,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colored
+  name: titleize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '1.3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: fileutils
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: fileutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,33 +221,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: themoviedb
+  name: ruby-filemagic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
-  name: titleize
+  name: themoviedb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -255,36 +283,50 @@ files:
 - lib/movie_organizer.rb
 - lib/movie_organizer/file_copier.rb
 - lib/movie_organizer/logger.rb
-- lib/movie_organizer/media.rb
 - lib/movie_organizer/media_list.rb
+- lib/movie_organizer/medium.rb
 - lib/movie_organizer/movie.rb
+- lib/movie_organizer/options.rb
 - lib/movie_organizer/organizer.rb
 - lib/movie_organizer/settings.rb
 - lib/movie_organizer/string.rb
+- lib/movie_organizer/tmdb_instance.rb
 - lib/movie_organizer/tv_show.rb
+- lib/movie_organizer/tvdb_instance.rb
 - lib/movie_organizer/version.rb
 - lib/movie_organizer/video.rb
 - movie_organizer.gemspec
-- spec/files/The.Walking.Dead.S04E08.HDTV.x264-2HD.mp4
+- spec/files/Dunkirk.2017.BluRay.1080p.mp4
+- spec/files/bad.flv
+- spec/files/bad.mp4
+- spec/files/good.3gp
+- spec/files/good.mov
+- spec/files/good.mp4
+- spec/files/good.ogv
+- spec/files/good.webm
 - spec/files/movies/Dunkirk.2017.BluRay.1080p/Dunkirk.2017.BluRay.1080p.mp4
 - spec/files/movies/The Matrix (1999) [BluRay] [1080p]/The Matrix (1999) [BluRay]
   [1080p].mp4
 - spec/files/short_video.mp4
+- spec/files/tv_shows/The.Walking.Dead.S04E08.HDTV.x264-2HD.mp4
 - spec/fixtures/.blank_settings.yml
 - spec/fixtures/.movie_organizer.yml
 - spec/fixtures/.no_source_directories.yml
 - spec/lib/movie_organizer/file_copier_spec.rb
 - spec/lib/movie_organizer/logger_spec.rb
 - spec/lib/movie_organizer/media_list_spec.rb
-- spec/lib/movie_organizer/media_spec.rb
+- spec/lib/movie_organizer/medium_spec.rb
 - spec/lib/movie_organizer/movie_spec.rb
 - spec/lib/movie_organizer/organizer_spec.rb
+- spec/lib/movie_organizer/tmdb_instance_spec.rb
 - spec/lib/movie_organizer/tv_show_spec.rb
+- spec/lib/movie_organizer/tvdb_instance_spec.rb
 - spec/lib/movie_organizer/video_spec.rb
 - spec/lib/movie_organizer_spec.rb
 - spec/spec_helper.rb
 - spec/support/filename_mappings.yml
 - spec/support/shared_contexts/media_shared.rb
+- spec/support/vcr.rb
 - tmdb-logo-primary-green.png
 homepage: https://github.com/midwire/movie_organizer
 licenses:
@@ -311,23 +353,34 @@ signing_key:
 specification_version: 4
 summary: Automatically organize movies, tv shows and home videos.
 test_files:
-- spec/files/The.Walking.Dead.S04E08.HDTV.x264-2HD.mp4
+- spec/files/Dunkirk.2017.BluRay.1080p.mp4
+- spec/files/bad.flv
+- spec/files/bad.mp4
+- spec/files/good.3gp
+- spec/files/good.mov
+- spec/files/good.mp4
+- spec/files/good.ogv
+- spec/files/good.webm
 - spec/files/movies/Dunkirk.2017.BluRay.1080p/Dunkirk.2017.BluRay.1080p.mp4
 - spec/files/movies/The Matrix (1999) [BluRay] [1080p]/The Matrix (1999) [BluRay]
   [1080p].mp4
 - spec/files/short_video.mp4
+- spec/files/tv_shows/The.Walking.Dead.S04E08.HDTV.x264-2HD.mp4
 - spec/fixtures/.blank_settings.yml
 - spec/fixtures/.movie_organizer.yml
 - spec/fixtures/.no_source_directories.yml
 - spec/lib/movie_organizer/file_copier_spec.rb
 - spec/lib/movie_organizer/logger_spec.rb
 - spec/lib/movie_organizer/media_list_spec.rb
-- spec/lib/movie_organizer/media_spec.rb
+- spec/lib/movie_organizer/medium_spec.rb
 - spec/lib/movie_organizer/movie_spec.rb
 - spec/lib/movie_organizer/organizer_spec.rb
+- spec/lib/movie_organizer/tmdb_instance_spec.rb
 - spec/lib/movie_organizer/tv_show_spec.rb
+- spec/lib/movie_organizer/tvdb_instance_spec.rb
 - spec/lib/movie_organizer/video_spec.rb
 - spec/lib/movie_organizer_spec.rb
 - spec/spec_helper.rb
 - spec/support/filename_mappings.yml
 - spec/support/shared_contexts/media_shared.rb
+- spec/support/vcr.rb

data/lib/movie_organizer/media.rb

@@ -1,110 +0,0 @@
-# frozen_string_literal: true
-
-require 'titleize'
-require 'themoviedb'
-
-module MovieOrganizer
-  # This meta-class factory accepts the media filename, and from that
-  # determines if it is likely to be:
-  #
-  # 1. a TV show
-  # 2. a Movie
-  # 3. a home video or other type
-  class Media
-    attr_accessor :filename, :options, :logger, :settings
-
-    def self.subtype(filename, options)
-      instance = new(filename, options)
-      return TvShow.new(filename, options) if instance.tv_show?
-      return Movie.new(filename, options) if instance.movie?
-      Video.new(filename, options)
-    end
-
-    def initialize(filename, options)
-      @filename = filename
-      @options = options
-      @tv_show = nil
-      @logger = Logger.instance
-      @settings = Settings.new
-    end
-
-    def tv_show?
-      return @tv_show unless @tv_show.nil?
-      @tv_show = false
-      @tv_show = true unless filename.match(/S\d+E\d+/i).nil?
-      @tv_show = true unless filename.match(/\d+x\d+/i).nil?
-      @tv_show
-    end
-
-    def movie?
-      return @movie unless @movie.nil?
-      @movie = false
-      Tmdb::Api.key(MovieOrganizer.tmdb_key)
-      # 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
-    end
-
-    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
-
-    protected
-
-    def basename
-      File.basename(filename)
-    end
-
-    def ext
-      File.extname(filename)
-    end
-
-    def dirname
-      File.dirname(filename)
-    end
-
-    def verbose?
-      options[:verbose]
-    end
-
-    def dry_run?
-      options[:dry_run]
-    end
-
-    # rubocop:disable Metrics/AbcSize
-    # rubocop:disable Metrics/MethodLength
-    def sanitize(str)
-      cleanstr = str.gsub(/-\s*-/, '')
-      cleanstr = cleanstr.gsub(/\[?1080p\]?/, '').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/spec/lib/movie_organizer/media_spec.rb

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-# rubocop:disable Metrics/BlockLength
-module MovieOrganizer
-  RSpec.describe Media, type: :lib do
-    include_context 'media_shared'
-
-    context '.subtype' do
-      tv_shows = {
-        'SnnEnn' => 'The.Walking.Dead.S04E08.HDTV.x264-2HD',
-        'nxn'    => 'The.Walking.Dead.4x0.HDTV.x264-2HD',
-        'nnxn'   => 'The.Walking.Dead.12x8.HDTV.x264-2HD',
-        'nnxnn'  => 'The.Walking.Dead.12x08.HDTV.x264-2HD',
-        'nxnn'   => 'The.Walking.Dead.2x18.HDTV.x264-2HD'
-      }
-
-      tv_shows.each_pair do |syntax, filename|
-        it "returns a TvShow with season and episode syntax: #{syntax}" do
-          filename = create_test_file(
-            filename: filename,
-            extension: 'mp4'
-          ).first
-          expect(Media.subtype(filename, default_options)).to be_a(TvShow)
-        end
-      end
-
-      movies = [
-        'Coco.2017.1080p.BluRay.x264-[BOGUS.IT]',
-        'Beetlejuice',
-        'Justice.League.2017.1080p.BluRay.x264-[YTS.AM]',
-        'Jumanji.Welcome.To.The.Jungle.2017.1080p.WEBRip.x264-[YTS.AM].mp4'
-      ]
-
-      movies.each do |filename|
-        it "returns a Movie for '#{filename}'" do
-          expect(Tmdb::Movie).to receive(:find).at_least(1).times.and_return([1])
-          filename = create_test_file(
-            filename: filename
-          ).first
-          expect(Media.subtype(filename, default_options)).to be_a(Movie)
-        end
-      end
-
-      videos = [
-        'IMG_2052',
-        'IMG_3322',
-        'VID_3322',
-        'VIDEO_3322',
-        'Our Summer Vacation',
-        'Tom and Jerry on the Beach'
-      ]
-
-      videos.each do |filename|
-        it "returns a Video for '#{filename}'" do
-          expect(Tmdb::Movie).to receive(:find).at_least(1).times.and_return([])
-          filename = create_test_file(
-            filename: filename
-          ).first
-          expect(Media.subtype(filename, default_options)).to be_a(Video)
-        end
-      end
-    end
-  end
-end
-# rubocop:enable Metrics/BlockLength