cinema 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba917e49edd5b86cf329e6eb52852e37e02bd4c2
-  data.tar.gz: aafb7012609bdb0c9f2b076fa4020710f82f85d5
+  metadata.gz: 4ce1d18103a051c4c254f219fb75481a5428a32d
+  data.tar.gz: cd3f665f2c78c8cdd4e9e470542c03b78e441b0f
 SHA512:
-  metadata.gz: 6c2c5bda97f19fe58baa324463dc972a7925c0c69a38e372dc109871fc8f1fc6d8ad7063a832a4216897bf0cb8261b3ae5d83861c50f408fb5117ff9d4938fa1
-  data.tar.gz: 3c7f8c122f2e2dcf1d6a6cdccfe068b56f0441d69e6cb612d2731a3500c617da1f4017e731f46e64cec38a54a20d9daf1b4970eca4e3d9240d5f5a6d90b5ab04
+  metadata.gz: edec0ccc0659b10ba8c38dd4b59168f3ba4b979b7c92d393e86752d6b1ad7e3e3a3e9c374113701d41d81abd42eb5e19764027669dce01189f84d056aa59c55e
+  data.tar.gz: 9173da777e32df964b8d196dca177ea435b9574a111c38895eed387fea8f23be70b8d1f8722336c4e6a61f0461df122ca22dd758bc604422e5c20a085e448e65

data/cinema.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_dependency "traktr", ">=0.7.0"
-  spec.add_dependency "yify", ">=0.0.1"
+  spec.add_dependency "rest-client"
+  spec.add_dependency "launchy"
 end

data/lib/cinema.rb

@@ -1,20 +1,34 @@
-require "cinema/version"
+require 'cinema/version'
+require 'rest_client'
+require 'launchy'
 require 'tempfile'
-require 'traktr'
 require 'yify'
 require 'yaml'
+require 'pry'
 
 module Cinema
   class << self
+    APP_ID="69f18bbaff859f035d934888f846b7ae3653e223a2b0f15629bcc9b836d3996b"
+    APP_SECRET="077edf5024fca4102295263e802631f52f8cebd404f612194279f059bc5d9b8d"
+
     def ask_and_play
-      imdb_id = select("Select movie", watchlist, ->(x){ x["title"] })["imdb_id"]
-      torrent = select("Select quality", torrents(imdb_id), ->(x){ x.quality })["torrent_url"]
-      downloader = select("Select downloader", ["peerflix","qbittorrent","wget","echo"], ->(x){x})
-      if downloader == 'peerflix'
+      imdb_id = select("Select movie",
+                       watchlist.sort_by{|x| x["released"]},
+                       ->(x){ x["movie"]["title"] })["movie"]["ids"]["imdb"]
+      unless imdb_id
+        print "imdb id: "
+        imdb_id = gets.chomp
+      end
+      torrent = select("Select quality", torrents(imdb_id), ->(x){ x["quality"] })["url"]
+      downloader = select("Select downloader", ["peerflix", "qbittorrent", "wget", "echo"], ->(x){x})
+      case downloader
+      when 'peerflix'
         player = select("Select player", ["mplayer","vlc"], ->(x){x})
         system downloader, torrent, "--#{player}"
-      else
+      when 'qbittorrent'
         system "sh", "-c", "#{downloader} #{torrent} &"
+      else
+        system downloader, torrent
       end
     end
 
@@ -25,24 +39,24 @@ module Cinema
           '--menu', '', '0', '0', '0',
           *menu_items.flatten
         unless success
-          puts "\nCancelled"
-          exit 0
+          return nil
         end
-      end.to_i
-      items[index]
+      end
+      items[index.to_i] if index
     end
 
     def watchlist
       with_unreliable_api do
         puts "Requesting watchlist..."
-        trakt.user.watchlist.movies.sort_by{|x| x["title"]}
+        trakt_request(:get, "calendars/my/movies/1900-01-01/1000000")
       end
     end
 
     def torrents(imdb_id)
       with_unreliable_api do
         puts "Searching torrents..."
-        yify.list_imdb(imdb_id: imdb_id).result
+        response = RestClient.get("http://yts.to/api/v2/list_movies.json?query_term=#{imdb_id}").body
+        JSON.parse(response)["data"]["movies"].first["torrents"]
       end
     end
 
@@ -50,17 +64,79 @@ module Cinema
       @yify ||= Yify::Client.new
     end
 
-    def trakt
-      @trakt ||= Traktr::Client.new config['api_key'], config['username'], config['password']
+    def redirect_uri
+      'urn:ietf:wg:oauth:2.0:oob'
+    end
+
+    def pin_to_token(pin)
+      response =
+        RestClient.post('https://trakt.tv/oauth/token', {
+                          code: pin,
+                          client_id: APP_ID,
+                          client_secret: APP_SECRET,
+                          redirect_uri: redirect_uri,
+                          grant_type: 'authorization_code'
+                        }).body
+      JSON.parse(response).values_at('access_token', 'refresh_token')
+    end
+
+    def initial_authorize
+      loop do
+        capture_stderr do
+          Launchy.open("https://trakt.tv/oauth/authorize?client_id=#{APP_ID}&redirect_uri=#{redirect_uri}&response_type=code")
+        end
+        print "Please authorize the app and enter PIN: "
+        pin = gets.chomp
+        if pin.size == 8
+          return pin_to_token(pin)
+        end
+      end
+    end
+
+    def write_config(access_token, refresh_token)
+      File.write config_file, {access_token: access_token, refresh_token: refresh_token}.to_yaml
+    end
+
+    def initial_authorize_and_save_config
+      write_config(*initial_authorize)
+    end
+
+    def refresh_access_token
+      response =
+        RestClient.post('https://trakt.tv/oauth/token', {
+                          refresh_token: config[:refresh_token],
+                          client_id: APP_ID,
+                          client_secret: APP_SECRET,
+                          redirect_uri: redirect_uri,
+                          grant_type: 'refresh_token'
+                        }).body
+      write_config *JSON.parse(response).values_at('access_token', 'refresh_token')
+    end
+
+    def trakt_request(method, path, payload=nil)
+      params = {
+        method: method,
+        url: "https://api-v2launch.trakt.tv/#{path}",
+        payload: payload,
+        headers: {
+          "Content-Type" => "application/json",
+          "Authorization" => "Bearer #{config[:access_token]}",
+          "trakt-api-version" => "2",
+          "trakt-api-key" => APP_ID,
+        }
+      }
+      JSON.parse RestClient::Request.execute(params).body
+    rescue RestClient::Unauthorized
+      puts 'Unauthorized. Trying to refresh token.'
+      refresh_access_token
+      retry
     end
 
     def config
-      @config ||= if File.exist? config_file
-                    YAML.load_file config_file
-                  else
-                    STDERR.puts "#{config_file} not found"
-                    exit 255
-                  end
+      unless File.exist? config_file
+        initial_authorize_and_save_config
+      end
+      YAML.load_file config_file
     end
 
     def config_file

data/lib/cinema/version.rb

@@ -1,3 +1,3 @@
 module Cinema
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cinema
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ales Guzik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: traktr
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yify
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
 description: ''
 email:
 - me@aguzik.net
@@ -103,9 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Select movie from trakt.tv watchlist and stream it from torrents
 test_files: []
-has_rdoc: