popcorn 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f1ab2f5b749fd2276eb04eeb223e08bd0b2d57a
-  data.tar.gz: dcb6ab92d54e5cc5655c47704e5ab64e90a39c80
+  metadata.gz: 2c6623cc711bdeeb364429d1b8bbcb5e805d27ca
+  data.tar.gz: fc7e14fe7ff039f694334cb55feaf61f01469fe2
 SHA512:
-  metadata.gz: 3c9fa114aae40fd3cb32c1c254429ebeeb2cd10f07a6ba0b01e9193a1474404259849433794aa7506302692ea198c8da21423ad30632667971af0263073cfa59
-  data.tar.gz: 8de3ecbd30c0dce4695d9e98af69a8ce2840155cfb231d09a5a19d5c689e33b6817682e012a058c6d6ef310ed088e09e1d01b0ead288983d2aa62946ecada2e4
+  metadata.gz: 6286ac1d285bd811cde716bb691c699fde147f375e3b6976319605638026014268b12f4e1cfa1a503648b1226617f9169b025e6b79e0dfb80a91f36e5debbc77
+  data.tar.gz: a93945e0ebcc3f277de750d774cae7876b60a2b3a5b61eba5bbc2dcf0dfc0c66fe5d3c854176ff683a541148ace1144529cd3bb3dec535b6306cb1540fd99923

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/lib/popcorn.rb

@@ -8,17 +8,19 @@ require 'popcorn/settings'
 class Popcorn::Driver < Thor
 
   desc "import MOVIE", "Move movie file into library."
-  def import(movie)
+  def import(movie_filename)
     @moviemgr = Popcorn::MovieManager.new
 
     while true
-      @moviemgr.lookup(movie)
+      puts "Please enter search term for movie name: "
+      movie = STDIN.gets.chomp
+
+      @moviemgr.lookup(movie, movie_filename)
       puts
       puts "Looking up #{movie}"
       unless @moviemgr.movie.nil?
         puts "Title:   #{@moviemgr.movie[:title]}"
         puts "Year:    #{@moviemgr.movie[:year]}"
-        puts "Art URL: #{@moviemgr.movie[:poster_url]}"
         print "Is this correct? (y/n): "
         if STDIN.gets.chomp =~ /y/i
           begin
@@ -28,9 +30,6 @@ class Popcorn::Driver < Thor
             puts e.message
           end
           break
-        else
-          print "Please enter new search term: "
-          movie = STDIN.gets.chomp
         end
       end
     end

data/lib/popcorn/movies.rb

@@ -15,11 +15,11 @@ module Popcorn
       @imdb = ImdbParty::Imdb.new
     end
 
-    def lookup(movie)
+    def lookup(movie, movie_filename)
       if @path.nil?
-        @path = Pathname.new(movie)
+        @path = Pathname.new(movie_filename)
       end
-      movie = File.basename(movie, '.*')
+      #movie = File.basename(movie, '.*')
       @movie = @imdb.find_by_title(movie)[0]
     end
 
@@ -27,8 +27,8 @@ module Popcorn
       unless @path.exist?
         raise "Error: File does not exist #{@path}"
       end
-      to_dir = "#{Settings.library}/#{@movie[:title]}/"
-      filename = "#{@movie[:title]}#{@path.extname}"
+      to_dir = "#{Settings.library}/#{@movie[:title]} (#{@movie[:year]})/"
+      filename = "#{@movie[:title]} (#{@movie[:year]})#{@path.extname}"
       to_path = "#{to_dir}#{filename}"
       FileUtils.mkdir(to_dir)
       puts "Moving #{@path} to #{to_path}"

data/popcorn.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: popcorn 1.1.1 ruby lib
+# stub: popcorn 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "popcorn"
-  s.version = "1.1.1"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Blaine Pace"]
-  s.date = "2017-03-18"
+  s.date = "2017-04-01"
   s.description = "Popcorn handles movie library management for you."
   s.email = "blainepace@gmail.com"
   s.executables = ["popcorn"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: popcorn
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Blaine Pace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor