ektoplayer 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d45cf3f25e3f52e0d259b0396903d2bee9ae811
-  data.tar.gz: cee36a784279f4b0698adadfa8fb99df16b979be
+  metadata.gz: 2f582176b442c800e228430df528410b4da17417
+  data.tar.gz: 79c3b9f12acb319956f5d47aa98ca00795ed73ca
 SHA512:
-  metadata.gz: 82df89a2a491c4171a7f91f0d46d42e630d1ab1f942785a02ae570d13ecd9ac6f993eddfe720555c0b8bb256810c4d43a96bd2a6da5e24721b5123209e454bab
-  data.tar.gz: a553baadb74b75f7053a7dca15bb2305887482ff9596d04fb70acc68b4b22415655480d70a2554da70995c4caeafb0ed0cde08f19acc58093c54af627f7d933c
+  metadata.gz: 1772fa75068b45cb11c0ae4dad2e060459eab414f05a93adf774ccb2451b1918c11a915c0d367369006dd66d9a2cf054ff9ac5e83463994ab7c0c9675e3816dd
+  data.tar.gz: 06e9ac4671e584d4a647e3b88939c4154fa90719e05a6e0535728c535e760430430c44463aa0c4c93ffe2d778b2834ac3b455a388a2c03ee6af9b202282c4448

data/README.md

@@ -18,9 +18,10 @@ It allows you to
 
 ## Screenshots
 
-![Screenshot 2017-03-18](http://pixelbanane.de/yafu/1384751165/ekto1.gif)
-![Screenshot 2017-03-18](http://pixelbanane.de/yafu/3868182865/ekto2.gif)
-![Screenshot 2017-03-18](http://pixelbanane.de/yafu/2446075869/ekto3.gif)
+![Screenshot 2017-03-20](http://pixelbanane.de/yafu/454463454/ekto1.gif)
+![Screenshot 2017-03-20](http://pixelbanane.de/yafu/1213960318/ekto2.gif)
+![Screenshot 2017-03-20](http://pixelbanane.de/yafu/1573688123/ekto3.gif)
+![Screenshot 2017-03-20](http://pixelbanane.de/yafu/3388136564/ekto4.gif)
 
 ## Requirements
 

data/lib/ektoplayer/application.rb

@@ -10,7 +10,7 @@ require 'date'
 
 module Ektoplayer
    class Application
-      VERSION = '0.1.5'.freeze
+      VERSION = '0.1.6'.freeze
       GITHUB_URL = 'https://github.com/braph/ektoplayer'.freeze
       EKTOPLAZM_URL = 'http://www.ektoplazm.com'.freeze
 
@@ -153,7 +153,7 @@ module Ektoplayer
                end
 
                if (n = Config[:playlist_load_newest]) > 0
-                  r = client.database.select(order_by: 'date', limit: n)
+                  r = client.database.select(order_by: 'date desc,album,number', limit: n)
                   playlist.add(*r)
                end
 

data/lib/ektoplayer/bindings.rb

@@ -75,12 +75,12 @@ module Ektoplayer
                :'playlist.show'           => [?1                             ],
                :'browser.show'            => [?2                             ],
                :'info.show'               => [?3                             ],
-               :'help.show'               => [?4                             ],
+               :'help.show'               => [?4,      Curses::KEY_F1        ],
 
-               :'playinginfo.toggle'      => [         Curses::KEY_F2        ],
-               :'progressbar.toggle'      => [         Curses::KEY_F3        ],
-               :'tabbar.toggle'           => [         Curses::KEY_F4        ],
-               :'volumemeter.toggle'      => [         Curses::KEY_F5        ],
+               :'playinginfo.toggle'      => [?!,      Curses::KEY_F2        ],
+               :'progressbar.toggle'      => [?%,      Curses::KEY_F3        ],
+               :'tabbar.toggle'           => [?=,      Curses::KEY_F4        ],
+               :'volumemeter.toggle'      => [?~,      Curses::KEY_F5        ],
 
                :'player.forward'          => [?f,      Curses::KEY_RIGHT     ],
                :'player.backward'         => [?b,      Curses::KEY_LEFT      ],
@@ -90,8 +90,8 @@ module Ektoplayer
                :'playlist.play_next'      => [?>                             ],
                :'playlist.play_prev'      => [?<                             ],
 
-               :'tabs.next'               => [?l                             ],
-               :'tabs.prev'               => [?h                             ],
+               :'tabs.next'               => [?l, ?}, 9                      ],
+               :'tabs.prev'               => [?h, ?{, 353                    ],
 
                :quit                      => [?q                             ],
                :refresh                   => ['^l'                           ],
@@ -134,7 +134,7 @@ module Ektoplayer
                :'browser.search_down'     => [?/                             ],
                # browser
                :'browser.add_to_playlist' => [' ', ?a                        ],
-               :'browser.enter'           => [?E,      Curses::KEY_ENTER     ],
+               :'browser.enter'           => [         Curses::KEY_ENTER     ],
                :'browser.back'            => [?B,      Curses::KEY_BACKSPACE ]},
             help: {
                :'help.top'                => [?g,      Curses::KEY_HOME      ],

data/lib/ektoplayer/browsepage.rb

@@ -1,6 +1,7 @@
 #!/bin/ruby
 
 require 'nokogiri'
+require 'date'
 require 'base64'
 require 'scanf'
 require 'open-uri'
@@ -50,7 +51,7 @@ module Ektoplayer
 
          doc.xpath('//div[starts-with(@id, "post-")]').each do |post|
             album = { tracks: [] }
-            album[:date] = post.at_css('.d').text        rescue nil
+            album[:date] = Date.parse(post.at_css('.d').text).iso8601 rescue nil
             album[:category] = post.at_css('.c a').text  rescue nil
 
             album[:styles] = []

data/lib/ektoplayer/config.rb

@@ -50,19 +50,19 @@ module Ektoplayer
       CONFIG_DIR  = File.join(Dir.home, '.config', 'ektoplayer').freeze
       CONFIG_FILE = File.join(CONFIG_DIR, 'ektoplayer.rc').freeze
 
-      DEFAULT_PLAYLIST_FORMAT = (
-         '<number size="3" fg="magenta" />' +
-         '<artist rel="25" fg="blue"    />' +
-         '<album  rel="30" fg="red"     />' +
-         '<title  rel="33" fg="yellow"  />' +
-         '<styles rel="20" fg="cyan"    />' +
-         '<bpm    size="4" fg="green" justify="right" />').freeze
+      DEFAULT_PLAYLIST_FORMAT = %{
+         <number size="3" fg="magenta" />
+         <artist rel="25" fg="blue"    />
+         <album  rel="30" fg="red"     />
+         <title  rel="33" fg="yellow"  />
+         <styles rel="20" fg="cyan"    />
+         <bpm    size="4" fg="green" justify="right" />}.squeeze(' ').freeze
 
       DEFAULT_PLAYINGINFO_FORMAT1 =
          '<text fg="black">&lt;&lt; </text><title bold="on" fg="yellow" /><text fg="black"> &gt;&gt;</text>'.freeze
 
       DEFAULT_PLAYINGINFO_FORMAT2 = 
-         '<artist bold="on" fg="blue" /><text> - </text><album bold="on" fg="red" /><text> (</text><date fg="cyan" /><text>)</text>'.freeze
+         '<artist bold="on" fg="blue" /><text> - </text><album bold="on" fg="red" /><text> (</text><year fg="cyan" /><text>)</text>'.freeze
 
       def register(key, description, default, method=nil)
          # parameter `description` is used by tools/mkconfig.rb, but not here
@@ -118,7 +118,7 @@ module Ektoplayer
 
          reg :playlist_load_newest,
             %{How many tracks from database should be added to
-              the playlist on application start.}, 100
+              the playlist on application start.}, 300
 
          reg :use_cache,
             %{Enable/disable local mp3 cache.

data/lib/ektoplayer/controllers/browser.rb

@@ -26,15 +26,17 @@ module Ektoplayer
             end
 
             # TODO: mouse?
-            view.mouse.on(65536) do view.scroll_up(3) end
-            view.mouse.on(2097152) do view.scroll_down(3) end
+            view.mouse.on(65536) do view.up(5) end
+            view.mouse.on(2097152) do view.down(5) end
 
-            view.mouse.on(Curses::BUTTON1_DOUBLE_CLICKED) do |mevent|
-               view.select_from_cursorpos(mevent.y)
-               view_operations.send(:'browser.enter')
+            [Curses::BUTTON1_DOUBLE_CLICKED, Curses::BUTTON3_CLICKED].each do |btn|
+               view.mouse.on(btn) do |mevent|
+                  view.select_from_cursorpos(mevent.y)
+                  view_operations.send(:'browser.enter')
+               end
             end
 
-            [Curses::BUTTON1_CLICKED, Curses::BUTTON2_CLICKED, Curses::BUTTON3_CLICKED].
+            [Curses::BUTTON1_CLICKED, Curses::BUTTON2_CLICKED].
                each do |button|
                view.mouse.on(button) do |mevent|
                   view.select_from_cursorpos(mevent.y)

data/lib/ektoplayer/controllers/playlist.rb

@@ -40,19 +40,21 @@ module Ektoplayer
             end
 
             # TODO: mouse?
-            view.mouse.on(65536) do view.scroll_up(3) end
-            view.mouse.on(2097152) do view.scroll_down(3) end
+            view.mouse.on(65536) do view.up(5) end
+            view.mouse.on(2097152) do view.down(5) end
 
-            [Curses::BUTTON1_CLICKED, Curses::BUTTON2_CLICKED, Curses::BUTTON3_CLICKED].
+            [Curses::BUTTON1_CLICKED, Curses::BUTTON2_CLICKED].
                each do |button|
                view.mouse.on(button) do |mevent|
                   view.select_from_cursorpos(mevent.y)
                end
             end
 
-            view.mouse.on(Curses::BUTTON1_DOUBLE_CLICKED) do |mevent|
-               view.select_from_cursorpos(mevent.y)
-               view_operations.send('playlist.play')
+            [Curses::BUTTON1_DOUBLE_CLICKED, Curses::BUTTON3_CLICKED].each do |btn|
+               view.mouse.on(btn) do |mevent|
+                  view.select_from_cursorpos(mevent.y)
+                  view_operations.send('playlist.play')
+               end
             end
          end
       end

data/lib/ektoplayer/database.rb

@@ -37,6 +37,10 @@ module Ektoplayer
             a.votes           AS votes,
             a.download_count  AS download_count,
 
+            strftime('%%Y', date)  AS year,
+            strftime('%%m', date)  AS month,
+            strftime('%%d', date)  AS day,
+
             a_s.style         AS style,
 
             (

data/lib/ektoplayer/models/browser.rb

@@ -6,12 +6,13 @@ module Ektoplayer
          PARENT_DIRECTORY = '..'.freeze
 
          PATHS = {
-            style:          [:style      ].freeze,
             artist:         [:artist     ].freeze,
             album:          [:album      ].freeze,
+            style:          [:style      ].freeze,
+            year:           [:year       ].freeze,
+            title:          [].freeze,
             released_by:    [:released_by].freeze,
-            posted_by:      [:posted_by  ].freeze,
-            tracks:         [].freeze
+            posted_by:      [:posted_by  ].freeze
          }.freeze
 
          def initialize(client)
@@ -119,7 +120,9 @@ module Ektoplayer
             end
 
             def tracks(index)
-               @database.select()
+               @database.select(
+                  order_by: CONTENTS[index].to_s + ",album,year,number".sub(",#{CONTENTS[index]}", '')
+               )
             end
          end
       end

data/lib/ektoplayer/ui/widgets/listwidget.rb

@@ -104,8 +104,8 @@ module UI
       def bottom;      self.selected=(index_last)                 end
       def page_up;     self.scroll_up(size.height)                end
       def page_down;   self.scroll_down(size.height)              end
-      def up;          self.selected=(selected - 1)               end
-      def down;        self.selected=(selected + 1)               end
+      def up(n=1)      self.selected=(selected - n)               end
+      def down(n=1)    self.selected=(selected + n)               end
       def center;      self.force_cursorpos(@size.height / 2)     end
 
       def list=(list)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ektoplayer
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Benjamin Abendroth