videoinfo 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a86593efef4a57d606da91d247d826ee4fb153ba
-  data.tar.gz: 97f1924ce62876d15b980c9083f93466a0d9fc11
+  metadata.gz: 33e98615cb1b94110418f42ea3028e4770c1c078
+  data.tar.gz: 4e69fa05d0c0f9639057da5e4e5af7cf738d6732
 SHA512:
-  metadata.gz: 7710e0b861920c50b3689ae184a7dc5484627367bcf4f87ea1b31cbcc11bf982cee21f0359826318ec3ba2dfd2ea74b50fc65a70cc85286b145230f2aa9382e2
-  data.tar.gz: 1cc9288f163af5cf4f0b2beb0403a75ef824f6233bb535986e6a3aa75c44a2ed59fc0ed1d6d51e2b3a5ea806669db97594ba747ebe319157751420a8097e9e54
+  metadata.gz: 1d70fe7bb03a34f7302904d7d948183604a67f353c09da91a60a7d9ad1e65bf74ac006ff1ac5d965f18994afb310f61ee19d36e68e218dff9e2b72bb6def4b9d
+  data.tar.gz: d778dab1561ec8bc158cdf9159c1794662d5e25a8a2e9fd8d462a58abfd982dbdf334e82e542bfdfe18be1b4d2aae660e9f3860c223b099a7be13becfac92e68

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## CHANGELOG
 
+#### Version 0.5.0 (September 29, 2015)
+ * Add support for TV episodes
+
 #### Version 0.4.0 (August 8, 2014)
  * Fixed using custom image hosts from the command line
 

data/README.md

@@ -38,9 +38,10 @@ Videoinfo.interactive      = true                  # defaults to true when using
 
 ```
 $ videoinfo -h
-Usage: videoinfo [options] "MOVIENAME" file
-    -i, --image-host=IMAGEHOST       The ImageHost to use for uploading screenshots. Default: Imgur
+Usage: videoinfo [options] "MOVIENAME/SHOWNAME" file
+    -i, --image-host=IMAGEHOST       The image host to use for uploading screenshots. Default: Imgur
     -s, --screenshots=SCREENSHOTS    The number of screenshots to create, max 7. Default: 2
+    -e, --episode=EPISODE            The TV show episode or season number. Formats: S01E01 or S01
     -n, --no-prompt                  Disable interactive mode
     -h, --help                       Show this message
 
@@ -85,6 +86,13 @@ movie.capture_screenshots         # => [#<Tempfile:/var/folders/l1/qf5v1rlj6n99n
 Videoinfo.upload_screenshot(file) # => "https://i.imgur.com/SoBhWfQ.png"
 ```
 
+It works with TV shows too:
+
+```ruby
+result = Videoinfo.analyze_tv('survivor s01e01', 'survivor.s01e01.mkv', 0) # => #<Videoinfo::Results::TvResult>
+tv = Videoinfo::Videos::Tv.new('survivor s01e01', 'survivor.s01e01.mkv', 3)
+````
+
 ## Contributing
 
 You are welcome to submit patches with bug fixes or feature additions. Please

data/lib/videoinfo.rb

@@ -11,9 +11,11 @@ require 'videoinfo/image_host'
 require 'videoinfo/image_hosts/imgur'
 require 'videoinfo/result'
 require 'videoinfo/results/movie_result'
+require 'videoinfo/results/tv_result'
 require 'videoinfo/version'
 require 'videoinfo/video'
 require 'videoinfo/videos/movie'
+require 'videoinfo/videos/tv'
 
 module Videoinfo
 
@@ -22,6 +24,11 @@ module Videoinfo
     Videos::Movie.new(name, file, screenshots).populate_result!
   end
 
+  # Helper method to analyze a tv episode or season.
+  def self.analyze_tv(name, file, screenshots = 0)
+    Videos::Tv.new(name, file, screenshots).populate_result!
+  end
+
   # Performs a google search and returns the top 10 results.
   def self.google(term)
     uri = URI("https://www.google.com/search?hl=en&q=#{CGI.escape(term)}")

data/lib/videoinfo/cli.rb

@@ -10,9 +10,10 @@ module Videoinfo
       Videoinfo.interactive = true
       image_host            = ENV[ENV_IMAGE_HOST] || Videoinfo.image_host.class.to_s.split('::').last
       screenshots           = 2
+      episode               = nil
       option_parser         = OptionParser.new do |opts|
-        opts.banner = 'Usage: videoinfo [options] "MOVIENAME" file'
-        opts.on('-i', '--image-host=IMAGEHOST', "The ImageHost to use for uploading screenshots. Default: #{image_host}") do |host|
+        opts.banner = 'Usage: videoinfo [options] "MOVIENAME/SHOWNAME" file'
+        opts.on('-i', '--image-host=IMAGEHOST', "The image host to use for uploading screenshots. Default: #{image_host}") do |host|
           image_host = host
         end
         opts.on('-s', '--screenshots=SCREENSHOTS', "The number of screenshots to create, max 7. Default: #{screenshots}") do |ss|
@@ -22,6 +23,14 @@ module Videoinfo
             exit 1
           end
         end
+        opts.on('-e', '--episode=EPISODE', 'The TV show episode or season number. Formats: S01E01 or S01') do |ep|
+          if ep =~ /\AS\d{2,3}\z/i || ep =~ /\AS\d{2,3}E\d{2,3}\z/i
+            episode = ep
+          else
+            STDERR.puts opts
+            exit 1
+          end
+        end
         opts.on('-n', '--no-prompt', 'Disable interactive mode') do
           Videoinfo.interactive = false
         end
@@ -41,13 +50,17 @@ module Videoinfo
         exit 1
       end
 
-      if name.to_s == '' || file.to_s == ''
+      if name.to_s.strip == '' || file.to_s.strip == ''
         STDERR.puts option_parser
         exit 1
       end
 
       begin
-        result = Videoinfo.analyze_movie(name, file, screenshots)
+        if episode
+          result = Videoinfo.analyze_tv("#{name} #{episode}".strip, file.strip, screenshots)
+        else
+          result = Videoinfo.analyze_movie(name.strip, file.strip, screenshots)
+        end
         puts result.to_s
       rescue Error => e
         STDERR.puts "ERROR: #{e.message}"

data/lib/videoinfo/results/tv_result.rb

@@ -0,0 +1,50 @@
+module Videoinfo
+  module Results
+    class TvResult < Result
+
+      attr_accessor :imdb_id, :title, :plot, :rating, :genres, :country, :premiered, :season_number, :episode_number, :episode_imdb_id, :episode_title, :episode_url, :episode_rating, :air_date
+
+      def rating_over_ten
+        rating ? "#{rating} / 10" : nil
+      end
+
+      def episode_rating_over_ten
+        episode_rating ? "#{episode_rating} / 10" : nil
+      end
+
+      def imdb_url
+        imdb_id ? "http://www.imdb.com/title/tt#{imdb_id}" : nil
+      end
+
+      def to_s
+        output = ['[b]Description:[/b]', '[quote]', plot, '[/quote]', '']
+        output << '[b]Information:[/b]'
+        output << '[quote]'
+        output << "Show Name: #{title}"
+        output << "Show url: #{imdb_url}"
+        output << "Rating: #{rating_over_ten}"
+        output << "Genres: #{(genres || []).join(' | ')}"
+        output << "Country: #{country}"
+        output << "Premiered: #{premiered}"                    if premiered
+        output << "Season Number: #{season_number}"            if season_number
+        output << "Episode Number: #{episode_number}"          if episode_number
+        output << "Episode Name: #{episode_title}"             if episode_title
+        output << "Episode url: #{episode_url}"                if episode_url
+        output << "Episode Rating: #{episode_rating_over_ten}" if episode_rating_over_ten
+        output << "Air Date: #{air_date}"                      if air_date
+        output << '[/quote]'
+
+        if screenshot_urls && screenshot_urls.size > 0
+          output += ['', '[b]Screenshots:[/b]', '[quote][align=center]']
+          output += screenshot_urls.map { |url| "[img=#{url}]" }
+          output += ['[/align][/quote]']
+        end
+
+        output += ['', '[mediainfo]', mediainfo, '[/mediainfo]']
+
+        output.join("\n")
+      end
+
+    end
+  end
+end

data/lib/videoinfo/version.rb

@@ -1,3 +1,3 @@
 module Videoinfo
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/videoinfo/videos/tv.rb

@@ -0,0 +1,80 @@
+module Videoinfo
+  module Videos
+    class Tv < Video
+
+      attr_reader :episode_string, :season_number, :episode_number
+
+      def result
+        @result ||= Results::TvResult.new
+      end
+
+      def populate_result!
+        result.mediainfo = read_mediainfo
+
+        serie = search_imdb.first
+        if serie
+          result.imdb_id   = serie.id
+          result.title     = serie.title
+          result.plot      = serie.plot
+          result.rating    = serie.rating
+          result.genres    = serie.genres
+          result.country   = serie.countries.first
+          result.premiered = serie.year
+
+          if season_number
+            season = serie.season(season_number.to_i)
+            if season
+              result.season_number = season.season_number
+              if episode_number
+                episode = season.episode(episode_number.to_i)
+                if episode
+                  result.episode_number  = episode.episode
+                  result.episode_imdb_id = episode.id
+                  result.episode_title   = episode.title
+                  result.episode_url     = episode.url
+                  result.episode_rating  = episode.rating
+                  result.air_date        = episode.air_date
+                end
+              end
+            end
+          end
+        end
+
+        result.screenshot_urls = capture_screenshots.map { |ss| Videoinfo.upload_screenshot(ss) }
+
+        result
+      end
+
+      def search_imdb
+        series = []
+        begin
+          series = Imdb::Search.new(name).movies
+        rescue => e
+          raise Error, "could not search IMDB. #{e.message}"
+        end
+
+        return series.map { |s| Imdb::Serie.new(s.id) } unless Videoinfo.interactive?
+
+        series.each do |s|
+          STDERR.print "Is your series \"#{s.title}\" (tt#{s.id})? [Y/n] "
+          return [Imdb::Serie.new(s.id)] if STDIN.gets.strip !~ /^(n|no)$/i
+        end
+
+        []
+      end
+
+      def name=(n)
+        @episode_string = n.slice!(/(\AS\d{2,3}E\d{2,3}\ |\ S\d{2,3}E\d{2,3}\z|\AS\d{2,3}\ |\ S\d{2,3}\z)/i)
+        @name           = n
+
+        if @episode_string
+          @episode_string.strip!
+          @season_number, @episode_number = @episode_string.gsub(/[SE]/i, ' ').split
+        end
+
+        @name
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: videoinfo
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ryan Johns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: imdb
@@ -45,9 +45,11 @@ files:
 - lib/videoinfo/image_hosts/imgur.rb
 - lib/videoinfo/result.rb
 - lib/videoinfo/results/movie_result.rb
+- lib/videoinfo/results/tv_result.rb
 - lib/videoinfo/version.rb
 - lib/videoinfo/video.rb
 - lib/videoinfo/videos/movie.rb
+- lib/videoinfo/videos/tv.rb
 - videoinfo.gemspec
 homepage: https://github.com/ryanjohns/videoinfo
 licenses:
@@ -71,7 +73,7 @@ requirements:
 - mediainfo
 - ffmpeg
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Simple tool for aggregating video metadata and capturing screenshots