cinema 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5d225844e5eceadc94ca34949f795de82bacdb5
-  data.tar.gz: e563cc3990759300cc0195594388636804cf540d
+  metadata.gz: 40198843fe3c5d3b28ff47d8f262003c8a31ff97
+  data.tar.gz: bd9fe004867afdb96c052cdc3c92f7ef52f33474
 SHA512:
-  metadata.gz: ea4a757678da6db59842ed64c5cf3352deb35c6cf60bd8379903edcfb5c68992e44b1cbd17c7777cf5c7161fa2df36e423220ebfbd4a5ebed5e7273b93b38073
-  data.tar.gz: 4767c973f7322eccd6458c36c61880a09191ff021ebb0210e412ffb8577c472cd57e0823192932be39a496516fc15cb31c4e2ac6d252ffd7e252b5c23330b076
+  metadata.gz: 8b00d6cbcb7b576bcad702bf33aa4822633151706117b6b949c9b4bf6b6501f0bd9c99436cae180cebe02b87c70cb814012a7fe98e4f2eeb0d304975cf401262
+  data.tar.gz: 3244358108007330ec72320b8398204b028e3c1126bb9cea806b0e9922362a7c961c97c360bd4dfa9ed78871fa021cf6ec352b07519adb2576ecdb1ce24c9e70

data/lib/cinema.rb

@@ -11,19 +11,23 @@ module Cinema
     APP_ID="69f18bbaff859f035d934888f846b7ae3653e223a2b0f15629bcc9b836d3996b"
     APP_SECRET="077edf5024fca4102295263e802631f52f8cebd404f612194279f059bc5d9b8d"
 
-    def ask_and_play
-      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
+    def get_sorting_options(sample)
+      sample.reduce([]) do |result, (k,v)|
+        if v.is_a? Hash
+          child_sorting_options = get_sorting_options(v).map do |name, accessor|
+            ["#{k} #{name}", ->(x){ accessor.(x[k]) }]
+          end
+          result.concat child_sorting_options
+        else
+          result << [k.to_s, ->(x){ x[k] }]
+        end
       end
-      torrent = select("Select quality", torrents(imdb_id), ->(x){ x["quality"] })["url"]
-      downloader = select("Select downloader", ["peerflix", "qbittorrent", "wget", "echo"], ->(x){x})
+    end
+
+    def run_torrent(downloader, torrent)
       case downloader
       when 'peerflix'
-        player = select("Select player", ["mplayer","vlc"], ->(x){x})
+        player = select("Select player", ["mplayer","vlc"])
         system downloader, torrent, "--#{player}"
       when 'qbittorrent'
         system "sh", "-c", "#{downloader} #{torrent} &"
@@ -32,20 +36,36 @@ module Cinema
       end
     end
 
-    def select(title, items, title_proc)
-      menu_items = items.each_with_index.map{|x,i| [i.to_s, title_proc.(x)]}
+    def ask_and_play
+      watchlist = get_watchlist
+      sorting_options = get_sorting_options(watchlist.first)
+      sort_getter = select("Order movie list by", sorting_options, &:first).last
+
+      imdb_id = select("Select movie", watchlist.sort_by{|x| sort_getter.(x)}){ |x|
+        "#{sort_getter.(x)}: #{x["movie"]["title"]}"
+      }["movie"]["ids"]["imdb"]
+
+      torrent = select("Select quality", torrents(imdb_id)){|x| x["quality"] }["url"]
+      downloader = select("Select downloader", ["peerflix", "qbittorrent", "wget", "echo"])
+      run_torrent(downloader, torrent)
+    end
+
+    def select(title, items, &title_proc)
+      menu_items = items.each_with_index.map do |x,i|
+        [i.to_s, (title_proc ? title_proc.(x) : x)]
+      end
       index = capture_stderr do
         success = system 'dialog', '--title', title,
           '--menu', '', '0', '0', '0',
           *menu_items.flatten
         unless success
-          return nil
+          exit 0
         end
       end
       items[index.to_i] if index
     end
 
-    def watchlist
+    def get_watchlist
       with_unreliable_api do
         puts "Requesting watchlist..."
         trakt_request(:get, "sync/watchlist/movies")

data/lib/cinema/version.rb

@@ -1,3 +1,3 @@
 module Cinema
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cinema
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Ales Guzik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2016-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler