rmpv 0.0.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2487a11670195f3fabd534f591db039da2f8cbe3
-  data.tar.gz: 124790e8faaaa875dac591e596eac4989d90a594
+  metadata.gz: 14cc0292b7e89738dd567e5f3d5ead179b58f41e
+  data.tar.gz: 87eee049d1d0b4e91e9d89ed55ff5e943dc45e77
 SHA512:
-  metadata.gz: 6285a576b1893bc58b7cb59a03acc14f75608461e602c27c3fcd2f248a22e8921d50710e7255158d5000cd7d8267a8609e915403a361bc95e1329f5bae5b5437
-  data.tar.gz: a9d559488ac547789bc35da11500c0a4ababdd99626fb76f41a58602ba658f0d05ef17c1eaad83b42629aba1f88d0296ec3164a5158a5f62b4fcfdc95228a3bb
+  metadata.gz: d46482ddee8fde0b9b1e956a39f1a35c849a95450526faaea843b25b2febca0bcb4b46a2dfee7d175229a1e6a1bd93fff039e5a0a8e2df480d42ec8ef7d45112
+  data.tar.gz: 864a9f3116a8643104aec6897496529c4fbc02baa1681e8c38440981119d557c5948fc02e18ac7199632fbbd5d2ebcd3587a1e9c6bfb60b639296dfdf42b2a23

data/README.md

@@ -21,6 +21,23 @@ Or install it yourself as:
 
 ## Usage
 
+First create a `.rmpvrc` file (which BTW is just a yaml file) in your home directory and add the following content:
+
+```yaml
+trakt:
+  username: TRAKT_USERNAME
+  password: SHA1_HASH_OF_YOUR_PASSWORD
+myanimelist:
+  username: MYANIMELIST_USERNAME
+  password: MYANIMELIST_PASSWORD
+```
+
+You can use the following command to generate the SHA1 hash of your password:
+
+```sh
+echo -n trakt_password | sha1sum | awk '{print toupper($1)}'
+```
+
      Usage: rmpv [options]
 
      -+, --vol=VOL                    increase volume by VOL
@@ -30,15 +47,12 @@ Or install it yourself as:
      -s, --size STR                   set size of the player
      -y, --youtube                    youtube mode
      -a, --audio                      audio mode
-     -t, --trakt                      scrobble to trakt
+     -c, --scrobble STR               scrobble 'movie' or 'show' to trakt or 'anime' to myanimelist
      
 
-TODO: Write usage instructions here
-
 ## Todo
 
 - Add myanimelist scrobble support
-- Use trakt scrobble rather than trakt seen for scrobbling. (This requires that we add scrobble support to [traktr](https://github.com/joelanford/traktr)).
 
 ## Contributing
 

data/bin/rmpv

@@ -5,43 +5,108 @@
 require "shellwords"
 require "to_name"
 require "rmpv"
+require 'highline/import'
 
-options = {
-  volume: 0,
-  speed: 1.0,
-}
-
-cmd = ["mpv"]
-
-# save position on exit
-cmd << "--save-position-on-quit"
-
-pwd = Dir.pwd
+def yesno(prompt = 'Continue?', default = true)
+  a = ''
+  s = default ? '[Y/n]' : '[y/N]'
+  d = default ? 'y' : 'n'
+  until %w[y n].include? a
+    a = ask("#{prompt} #{s} ") { |q| q.limit = 1; q.case = :downcase }
+    a = d if a.length == 0
+  end
+  a == 'y'
+end
 
 # check if there is a .mp file in the current directory and add it as options
-
 if File.exists? ".mp"
   File.open(".mp", "r").each do |line|
     ARGV << line.chomp
   end
-end 
+end
 
 # parse options
-cmd, options = Rmpv::Option.parse(ARGV, cmd, options)
-
+cmd, options = Rmpv::Option.parse(ARGV)
 cmd = Rmpv::Option.command(cmd, options)
 
 # begin execution
 file = Shellwords.shelljoin(ARGV)
-
 mpv = cmd.join(" ") + " " + file
-
 puts "running '#{mpv}'..."
-system mpv
+
+progress = 0
+time = 0
+
+# set as watching
+if options[:method] == 'show'
+  show = ToName.to_name(file)
+  @trak = Rmpv::Trakt.new
+  wat = Thread.new do
+    loop do
+      duration = @trak.watching(show, progress)
+      sleep(600) # wait for 10 minutes
+      time += 10
+      progress = time*100/duration
+      puts progress
+    end
+  end
+end
+
+if options[:method] == 'movie'
+  movie = ToName.to_name(file)
+  @trak = Rmpv::Trakt.new
+  wat = Thread.new do
+    loop do
+      duration = @trak.watching(movie, progress, 'movie')
+      sleep(900) # wait for 15 minutes
+      time += 10
+      progress = time*100/duration
+      puts progress
+    end
+  end
+end
+
+
+pid = spawn(mpv)
+Process.wait(pid)
+
+Thread.kill(wat)
 
 # mark as seen on trakt
-if options[:trakt]
+if options[:method] == 'show'
   show = ToName.to_name(file)
-  trak = Rmpv::Trakt.new
-  trak.scrobble(show)  
+  @trak = Rmpv::Trakt.new
+  puts progress
+  if progress>=50
+    @trak.scrobble(show, progress)
+  else
+    choice = yesno("Did not complete. Do you still want to scrobble?", false)
+    if choice == 'y'
+      @trak.scrobble(show, progress)
+    else
+      exit
+    end
+  end
+end
+
+if options[:method] == 'movie'
+  movie = ToName.to_name(file)
+  @trak = Rmpv::Trakt.new
+  puts progress
+  if progress>=50
+    @trak.scrobble(movie, progress, 'movie')
+  else
+    choice = yesno("Did not complete. Do you still want to scrobble?", false)
+    if choice == 'y'
+      @trak.scrobble(movie, progress, 'movie')
+    else
+      exit
+    end
+  end
+end
+
+if options[:method] == 'anime'
+  @anime = Rmpv::Myanimelist.new
+  ani, ep = Rmpv::Myanimelist.parse(file)
+  @anime.scrobble(ani, ep)
 end

data/lib/rmpv/build.rb

@@ -0,0 +1,3 @@
+module Rmpv
+  BUILD = "Dec 25 2013"
+end

data/lib/rmpv/myanimelist.rb

@@ -5,6 +5,57 @@
 #
 # Copyright rejuvyesh <mail@rejuvyesh.com>, 2013
 
+require 'yaml'
+require 'myanimelist'
+require 'httparty'
+
 module Rmpv
-  
+  class MALRequester
+    include HTTParty
+    base_uri 'myanimelist.net'
+    # headers 'User-Agent' => "api-team-f894427cc1c571f79da49605ef8b112f"
+  end
+
+  class Myanimelist
+    ##
+    # Initialize the Myanimelist client
+    def initialize
+      myanimeconfig = YAML.load File.open("#{Dir.home}/.rmpvrc")
+      MyAnimeList.configure do |config|
+        config.username = myanimeconfig["myanimelist"]["username"]
+        config.password = myanimeconfig["myanimelist"]["password"]
+      end
+    end
+
+    ##
+    # Parse the file names
+    #
+    # @param [String] file name
+    # @return [String, Fixnum] name of the show and episode number
+    def parse(file)
+      raw_name = file
+      raw_name = raw_name[0, raw_name.rindex(/\./)] # remove extension
+      raw_name = raw_name.gsub(/(\.|_|\-)/, '')  # Chars used in filenames as a substitute for spaces
+      raw_name = raw_name.gsub(/\(.*?\)/, '') # Remove anything surrounded by paranthesis
+      raw_name = raw_name.gsub(/\[.*?\]/, '') # Remove anything surrounded by paranthesis
+      ep = /(\d+)/.match(raw_name)[1]
+      name = raw_name.gsub(/(\d+)/, '').strip!
+      episode = ep.nil? ? 1 : ep.to_i
+      return name, episode
+    end
+
+    def scrobble(anime, ep)
+      tries = 5
+      begin
+        info = MyAnimeList.search_anime(anime)
+      rescue Exception => e
+        tries -= 1
+        if tries > 0
+          retry
+        else
+          puts "Couldn't connect to Myanimelist servers: #{e}"
+        end
+      end
+    end
+  end
 end

data/lib/rmpv/option.rb

@@ -15,20 +15,19 @@ module Rmpv
     ##
     # Parses the commandline options
     # args : the arguments to be passed
-    # cmd  : variable to which options are being added
-    # options : value of the options
     #
     # returns the new cmd and options
-    
-    def self.parse args, cmd, options
+
+    def self.parse(args)
+      cmd = ['mpv']
+      options = { volume: 0, speed: 1.0, }
       begin
         OptionParser.new do |opts|
-          opts.banner = "Usage: rmpv [options]"
+          opts.banner = 'Usage: rmpv [options]'
 
           opts.on("-+", "--vol=VOL", Integer, "increase volume by VOL") do |v|
             options[:volume]   = v
           end
-
           opts.on("-l", "--top-left",     "play in top-left corner of the screen") do |tl|
             options[:position] = :top_left
           end
@@ -38,56 +37,60 @@ module Rmpv
           opts.on("-x", "--speed SPEED",  Float, "increase speed by SPEED") do |x|
             options[:speed]    = x
           end
-          opts.on("-s", "--size STR",     "set size of the player") do |sa| 
+          opts.on("-s", "--size STR",     "set size of the player") do |sa|
             options[:size]     = sa
           end
           opts.on("-y", "--youtube",      "youtube mode") do |y|
+            options[:mode] = 'youtube'
             options[:speed]    = 1.5
-            cmd << "--cache-default=2048"
           end
           opts.on("-a", "--audio",        "audio mode") do |a|
-            cmd << "--audio-display=no --gapless-audio"
+            options[:mode] = 'audio'
           end
-          opts.on("-t", "--trakt",        "scrobble to trakt") do |t| 
-            options[:trakt]    = true;
+          opts.on("-c", "--scrobble STR",     "scrobble 'movie' or 'show' to trakt or 'anime' to myanimelist") do |sa|
+            options[:method]  = sa.downcase
           end
         end.parse!
-
       rescue OptionParser::InvalidOption => e
-        cmd << e.to_s.sub(/^invalid option:\s+/, "")
+        cmd << e.to_s.sub(/^invalid option:\s+/, '')
       end
-
       return cmd, options
     end
 
     ##
     # Adds options to the command to be passed to mpv
-    
-    def self.command cmd, options
+
+    def self.command(cmd, options)
+      ## Saner defaults
+      # save position on exit
+      cmd << '--save-position-on-quit'
+      # audio filter
+      # Remove chirping at higher speed
+      cmd << "--af=scaletempo"
+
       # size
-      if options[:size]
-        cmd << "--autofit='#{options[:size]}'"
-      end
+      cmd << "--autofit='#{options[:size]}'" if options[:size]
 
+      # position
       if options[:position] == :top_left
         cmd << "--geometry='0:17'"
       elsif options[:position] == :bottom_right
         cmd << "--geometry='100%:97%'"
       end
 
-      # audio filter
-      # Remove chirping at higher speed
-      cmd << "--af=scaletempo"  
-      if options[:volume].nonzero?
-        cmd << "--af=volume=#{options[:volume]}"
-      end
+      # audio
+      cmd << "--af=volume=#{options[:volume]}" if options[:volume].nonzero?
+
+      cmd << "--audio-display=no --gapless-audio" if options[:mode] == 'audio'
 
       # speed increase
-      if options[:speed] != 1.0
-        cmd << "--speed=#{options[:speed]}"
-      end
+      cmd << "--speed=#{options[:speed]}" if options[:speed] != 1.0
+
+      # youtube mode
+
+      cmd << "--cache-default=2048" if options[:mode] == 'youtube'
 
-      return cmd
+      cmd
     end
   end
 end

data/lib/rmpv/trakt.rb

@@ -5,36 +5,73 @@
 #
 # Copyright rejuvyesh <mail@rejuvyesh.com>, 2013
 
-require "traktr"
-require "yaml"
+require 'traktr'
+require 'yaml'
+require 'rmpv/version'
 
 module Rmpv
   class Trakt
 
     ##
     # Initialize the trakt client
-    
+    TRAKTAPIKEY = '5d7b4164188a3974e0ff4f0c571058dcd3a06f47'
+
     def initialize
-      traktconfig = YAML.load File.open("#{Dir.home}/.traktrc")
-      @trakt = Traktr::Client.new(traktconfig["api_key"], traktconfig["username"], traktconfig["password"], true)
+      traktconfig = YAML.load File.open("#{Dir.home}/.rmpvrc")
+      @trakt = Traktr::Client.new(TRAKTAPIKEY, \
+                                  traktconfig["trakt"]["username"], \
+                                  traktconfig["trakt"]["password"], true)
+    end
+
+    ##
+    # Set as watching
+
+    def watching(show, progress, type='show')
+      tries = 5
+      begin
+        if type == 'show'
+          info = @trakt.search.shows(show.name)
+          res = @trakt.show.watching(info[0], show.series, show.episode, \
+                                     progress, Rmpv::VERSION, Rmpv::BUILD)
+        elsif type == 'movie'
+          info = @trakt.search.movies(show.name)
+          res = @trakt.movie.watching(info[0], progress, \
+                                      Rmpv::VERSION, Rmpv::BUILD)
+        end
+        puts "Watching to trakt (Y) - #{show.name}"
+      rescue Exception => e
+        tries -= 1
+        if tries > 0
+          retry
+        else
+          puts "Couldn't connect to trakt servers: #{e}, #{res}"
+        end
+      end
+      info[0].runtime # return duration
     end
 
     ##
     # Scrobble the show
-    
-    def scrobble show
+
+    def scrobble(show, progress, type='show')
       tries = 5
       begin
-        info = @trakt.search.shows(show.name)
-        @episodes = @trakt.show.season(info[0].title, show.series)
-        res = @trakt.show.episode.seen(info[0], @episodes[show.episode-1..show.episode-1])
-        puts "Scrobbled to trakt (Y)"
+        if type == 'show'
+          info = @trakt.search.shows(show.name)
+          res  = @trakt.show.scrobble(info[0], show.series, show.episode,\
+                                      progress, Rmpv::VERSION, Rmpv::BUILD)
+        elsif type == 'movie'
+          info = @trakt.search.movies(show.name)
+          res = @trakt.movie.scrobble(info[0], progress, \
+                                      Rmpv::VERSION, Rmpv::BUILD)
+        end
+        puts "Scrobbled to trakt (Y) - #{show.name}"
       rescue Exception => e
         tries -= 1
         if tries > 0
           retry
         else
-          puts "Couldn't connect to trakt servers: #{res}"
+          puts "Couldn't connect to trakt servers: #{e}, #{res}"
         end
       end
     end

data/lib/rmpv/version.rb

@@ -1,3 +1,3 @@
 module Rmpv
-  VERSION = "0.0.5"
+  VERSION = "0.1.7"
 end

data/rmpv.gemspec

@@ -13,16 +13,23 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://github.com/rejuvyesh/rmpv"
   spec.license       = "MIT"
 
-  spec.rdoc_options     = ['--charset=UTF-8']
+  spec.has_rdoc         = 'yard'
   spec.extra_rdoc_files = %w[README.md]
+  
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.post_install_message = 'Please report any issues at: ' \
+        'https://github.com/rejuvyesh/rmpv/issues/new'
+  
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-
+  spec.add_development_dependency "yard"
+  
   spec.add_dependency "traktr"
+  spec.add_dependency "myanimelist"
   spec.add_dependency "toname"
+  spec.add_dependency "highline"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmpv
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.7
 platform: ruby
 authors:
 - rejuvyesh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: traktr
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: myanimelist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: toname
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby wrapper for mpv
 email:
 - mail@rejuvyesh.com
@@ -82,6 +124,7 @@ files:
 - Rakefile
 - bin/rmpv
 - lib/rmpv.rb
+- lib/rmpv/build.rb
 - lib/rmpv/myanimelist.rb
 - lib/rmpv/option.rb
 - lib/rmpv/trakt.rb
@@ -91,9 +134,8 @@ homepage: http://github.com/rejuvyesh/rmpv
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
-rdoc_options:
-- "--charset=UTF-8"
+post_install_message: 'Please report any issues at: https://github.com/rejuvyesh/rmpv/issues/new'
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -113,4 +155,4 @@ signing_key:
 specification_version: 4
 summary: A ruby wrapper around mpv with trakt and myanimelist scobble support
 test_files: []
-has_rdoc: 
+has_rdoc: yard