rubio-radio 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 251dc5095f4659c3598be19ed733cc71ed404957a582071eed209d0ae2d27757
-  data.tar.gz: 8e1583db5b2a5b85838e5c314587a58365b8a74851855dca887a32c2b910a236
+  metadata.gz: 7aae7e45f3433a76e59a907ee6f8ca6c979b0f250236ed86261e841c1f3fd14b
+  data.tar.gz: 270b02be3f3e86878a0d0e4d763ce29a26a148ba3bcee40d1991415c528e3733
 SHA512:
-  metadata.gz: 1866d8bd12d24ab570ab149d73e4ad166246f4160f80050de7ac4f2bf9d719befdf8cd04741593dbee5ac333f33a3b5ff4fa055d308747a490fd673137c21b4b
-  data.tar.gz: bc817eda194e723664ab321c0be218856ac700230d70c0be210fcec78e4e615b5038bdc270dd0c2d696500895638f4338d9ba3fa1a86c8f92173cf29abf0913d
+  metadata.gz: 763eb84cfcee8ea9abb090b0e7b9c8b47e962fcfde3e6a6100b0e0e119d6a2b022e251cf81a6b19609494e3a106b9bc8e53025e525c702095092a84c46fc1947
+  data.tar.gz: 4bba95c7e203ba49c1cc96f6103fa57e4b4e2359141ed81f99e1799b3c81b301254a5a334f15f512326850a3156caa78101a1cb67aad2a57bc85ed327a52ca6a

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 0.0.7
+
+- Add country property to radio stations
+
+## 0.0.6
+
+- Command option `--[no-]margins` to show/hide margins around window content
+- Command option `--[no-]info` to show/hide currently playing (song) info when using `vlc -I rc` backend only [true]
+- Change the default backend to `vlc -I rc` in order to show currently playing song
+- Update command option `--count` to accept `-1` as a valid value for fetching all radio stations
+- Make app fetch all radio stations by default (`--count -1`)
+- Fix issue with bookmark/unbookmark menu items remaining enabled after stopping song
+
 ## 0.0.5
 
 - Upgrade to glimmer-dsl-libui v0.5.22
@@ -7,6 +20,9 @@
 - View menu with "All", "Bookmarks", and "Playing" View menu items
 - Command option `--[no-]bookmarks` to show/hide bookmarks in table
 - Command option `--[no-]gradual` to load radio stations gradually (preventing user from waiting for app to start) or avoid loading gradually
+- Support AND-based filtering with multiple words separated by space treated as WORD1 AND WORD2, ...
+- Support exact term filtering with double-quoted filter term (e.g. "WORD1 WORD2")
+- Support column-based filtering by prefixing a query term with column name + colon (e.g. "language:english"), which can be combined with other words (e.g. "jazz language:english"). Also, there is no need to enter all of the column letters, yet only the first few letters that distinguish it from other columns (e.g. "jazz l:english")
 
 ## 0.0.4
 

data/README.md

@@ -1,17 +1,9 @@
 # rubio-radio
 [![Gem Version](https://badge.fury.io/rb/rubio-radio.svg)](https://badge.fury.io/rb/rubio-radio)
 
-Linux
-
-![linux screenshot](screenshots/rubio-radio-linux.png)
-
-Mac
-
-![mac screenshot](screenshots/rubio-radio-mac.png)
-
-Windows
-
-![windows screenshot](screenshots/rubio-radio-windows.png)
+| Mac | Linux | Windows |
+|:---:|:-----:|:-------:|
+|![mac screenshot](screenshots/rubio-radio-mac.png)|![linux screenshot](screenshots/rubio-radio-linux.png)|![windows screenshot](screenshots/rubio-radio-windows.png)|
 
 :bowtie: Alpha
 
@@ -21,7 +13,7 @@ Windows
 
 **[VLC](https://github.com/videolan/vlc)**
 
-`rubio` uses the `vlc -I dummy` as the audio playback backend.
+`rubio` uses the `vlc -I rc` as the audio playback backend.
 
 On Mac, it is recommended that you install VLC via [Homebrew](https://brew.sh/) to ensure the `vlc` command is added to the PATH environment variable automatically:
 
@@ -45,7 +37,7 @@ Run with this command:
 rubio
 ```
 
-The top 10,000 [Radio Browser](https://www.radio-browser.info/) stations are displayed by default. But, you can customize the count (note that currently, there are only about 32,000 [Radio Browser](https://www.radio-browser.info/) stations total).
+All [Radio Browser](https://www.radio-browser.info/) stations are displayed by default. But, you can customize the count with `--count COUNT` (note that currently, there are only about 33,000 [Radio Browser](https://www.radio-browser.info/) stations total). Setting the count to `-1` will fetch all stations.
 
 ```
 rubio --count 20000
@@ -57,7 +49,7 @@ The stations are fetched gradually (asynchronously) from the [Radio Browser](htt
 rubio --no-gradual
 ```
 
-Default player is `vlc -I dummy`. But, you can use any command line player that can take URL of radio station as its first argument.
+Default player is `vlc -I rc`, which enables showing currently playing song info (except on Windows). But, you can use any command line player that can take URL of radio station as its first argument.
 
 ```
 rubio --backend mpg123
@@ -71,10 +63,10 @@ rubio --help
 
 ```
 Usage: rubio [options]
-        --vlc [STR]         use VLC interface STR on the backend [dummy]
+        --vlc [STR]         use VLC interface STR on the backend [rc]
         --mpg123            use mpg123 on the backend
-    -b, --backend STR       command to use as backend player ['vlc -I dummy']
-    -c, --count INT         number of stations to fetch from radio-browser [10000]
+    -b, --backend STR       command to use as backend player ['vlc -I rc']
+    -c, --count INT         number of stations to fetch from radio-browser or -1 to fetch them all [-1]
         --per-page INT      number of stations per page [20]
     -w, --width INT         main window width
     -h, --height INT        main window height
@@ -82,6 +74,8 @@ Usage: rubio [options]
         --[no-]menu         show/hide menu [true]
         --[no-]bookmarks    show/hide bookmarks [true]
         --[no-]gradual      gradually/non-gradually fetch stations [true]
+        --[no-]margins      show/hide margins [true]
+        --[no-]info         show/hide currently playing (song) info when using 'vlc -I rc' backend only [true]
         --debug             output status of monitored threads
         --help              show this help message
         --version           show the rubio version number
@@ -90,15 +84,15 @@ Usage: rubio [options]
 Examples:
 
 ```
-rubio --vlc              # `vlc -I rc` (interactive command line interface)
-rubio --mpg123           # `rubio --backend mpg123`
+rubio --vlc dummy        # vlc -I dummy (interactive command line interface)
+rubio --mpg123           # rubio --backend mpg123
 rubio --count 1000       # Displays the top 1,000 Radio Browser stations
 ```
 
 Minimalistic Example:
 
 ```
-rubio --per-page 6 --no-menu --no-bookmarks
+rubio --per-page 6 --no-margins --no-info --no-menu --no-bookmarks
 ```
 
 ![small screen linux screenshot](screenshots/rubio-radio-linux-example-small.png)
@@ -111,13 +105,53 @@ rubio --page-count
 
 ![page count mac screenshot](screenshots/rubio-radio-mac-example-page-count.png)
 
+### Filtering
+
+The filter field does AND-based filtering when you enter multiple words separated by spaces:
+
+```
+jazz smooth
+```
+
+Also, the filter field supports exact term filtering if you enter multiple words surrounded by double-quotes.
+
+```
+"bossa nova"
+```
+
+Last but not least, the filter field supports column-specific queries by including a full column name or the first few letters, followed by colon (:), followed by a single word or double-quoted multiple words for exact term matching against the column:
+
+```
+name:talk language:eng
+```
+
+or just:
+
+```
+n:talk l:eng
+```
+
+![advanced filtering mac screenshot](screenshots/rubio-radio-mac-example-advanced-filtering.png)
+
+This advanced example matches the word `FM` against the name column, and language `bahasa indonesia` against the language column.
+
+```
+n:FM l:"bahasa indonesia"
+```
+
+Finally, you can mix different types of filters:
+
+```
+brasil "bossa jazz" l:brazilian l:portuguese
+```
+
 ### Menus
 
 You can use the top menu bar to stop the currently playing radio station, bookmark, unbookmark, view only bookmarked stations, view only currently playing station, and read the about dialog.
 
 ![view book marks mac screenshot](screenshots/rubio-radio-mac-example-view-bookmarks.png)
 
-Bookmarks are stored in `File.join(Dir.home, '.rubio-radio', 'bookmarks.yml')`
+Bookmarks are stored in `~/.rubio-radio/bookmarks.yml`
 
 ## Links
 

data/TODO.md

@@ -1,9 +1,3 @@
 # TODO
 
-- Support OR-based FTS (Full-Text-Search) queries by treating multiple words as WORD1 OR WORD2, etc...
-- Support exact FTS (Full-Text-Search) queries using double-quotes (e.g. "WORD1 WORD2")
-- Support column-based queries by prefixing query term with column name + colon (e.g. "language:english"), which can be combined with FTS queries (e.g. "jazz language:english"). Also, there is no need to enter all of the column letters, yet only the first few letters that distinguish it from other columns (e.g. "jazz l:english")
-
-- Make window margined and provide option to disable margins if preferred (`--no-margins`)
-
-- Show current playing song (use `vlc -I dummy --extraintf http --http-host localhost --http-port 9877 --http-password pass1234` backend, and then make an HTTP request to http://localhost:9877/requests/status.xml in order to obtain song information and update it every second; maybe regenerate a new password on every run) (alternatively, I can use backend `vlc -I rc` and call `info` to obtain song details, parsing the text after `now_playing:` .... can use `io = IO.popen('vlc -I rc http://radio.canstream.co.uk:8075/live.mp3', 'r+')` with `io.puts('inf')` and `io.gets` until all input is done; also use `Timeout::timeout(0.5) {}` to avoid timing out on `gets` when there is no more input)
+N/A

data/exe/rubio

@@ -5,19 +5,20 @@ require 'puts_debuggerer' if ENV['PD'].to_s.downcase == 'true'
 require 'rubio'
 require 'optparse'
 
-options = { backend: 'vlc -I dummy' }
+options = { backend: 'vlc -I rc' }
 
 opt = OptionParser.new
 opt.summary_width = 23
-opt.on('--vlc [STR]', 'use VLC interface STR on the backend [dummy]') do |i|
-  i ||= 'dummy'
+opt.on('--vlc [STR]', 'use VLC interface STR on the backend [rc]') do |i|
+  i ||= 'rc'
   options[:backend] = "vlc -I #{i}"
 end
 opt.on('--mpg123', 'use mpg123 on the backend') { options[:backend] = 'mpg123' }
-opt.on('-b', '--backend STR', String, 'command to use as backend player [\'vlc -I dummy\']') do |b|
+opt.on('-b', '--backend STR', String, 'command to use as backend player [\'vlc -I rc\']') do |b|
   options[:backend] = b
 end
-opt.on('-c', '--count INT', Numeric, 'number of stations to fetch from radio-browser [10000]') do |c|
+opt.on('-c', '--count INT', Numeric,
+       'number of stations to fetch from radio-browser or -1 to fetch them all [-1]') do |c|
   options[:radio_station_count] = c
 end
 opt.on('--per-page INT', Numeric, 'number of stations per page [20]') { |c| options[:table_per_page] = c }
@@ -29,6 +30,11 @@ opt.on('--[no-]bookmarks', TrueClass, 'show/hide bookmarks [true]') { |b| option
 opt.on('--[no-]gradual', TrueClass, 'gradually/non-gradually fetch stations [true]') do |g|
   options[:gradually_fetch_stations] = g
 end
+opt.on('--[no-]margins', TrueClass, 'show/hide margins [true]') { |m| options[:show_margins] = m }
+opt.on('--[no-]info', TrueClass,
+       'show/hide currently playing (song) info when using \'vlc -I rc\' backend only [true]') do |i|
+  options[:show_currently_playing] = i
+end
 opt.on('--debug', 'output status of monitored threads') { options[:debug] = true }
 opt.on('--help', 'show this help message') do
   puts opt
@@ -49,7 +55,7 @@ end
 
 begin
   Rubio::View::Radio.launch(**options)
-rescue StandardError => e
-  Rubio::View::Radio.launched_application&.player&.stop_all
+rescue => e
+  Rubio::View::Radio.launched_application&.presenter&.player&.stop_all
   raise e
 end

data/lib/rubio/model/bookmark.rb

@@ -33,7 +33,7 @@ module Rubio
         def save_all
           bookmarks_yaml = YAML.dump(all)
           File.write(FILE_RUBIO_RADIO_BOOKMARKS, bookmarks_yaml)
-        rescue StandardError => e
+        rescue => e
           puts 'Failed in saving bookmarks!'
           puts all.inspect
           puts e.full_message
@@ -43,7 +43,7 @@ module Rubio
         def load_all
           bookmarks_yaml = File.read(FILE_RUBIO_RADIO_BOOKMARKS)
           YAML.load(bookmarks_yaml)
-        rescue StandardError => e
+        rescue => e
           puts 'Failed in loading bookmarks! Returning empty bookmarks.'
           puts e.full_message
           []

data/lib/rubio/model/player.rb

@@ -3,29 +3,40 @@
 module Rubio
   module Model
     class Player
+      CURRENTLY_PLAYING_NONE = 'None'
+      CURRENTLY_PLAYING_LENGTH_PER_LINE = 90
+
       attr_accessor :backend, :pid, :thr, :status, :history
+      attr_reader :show_currently_playing, :currently_playing
+      alias show_currently_playing? show_currently_playing
 
-      def initialize(backend = OS.linux? ? 'cvlc' : 'vlc -I rc')
+      def initialize(backend = 'vlc -I rc', show_currently_playing: true)
         raise unless backend.is_a?(String)
 
         @backend = backend
+        @show_currently_playing = show_currently_playing
         @pid = nil
         @thr = nil
-        @status = []
+        @status = {}
         @history = []
+        self.currently_playing = CURRENTLY_PLAYING_NONE
       end
 
-      def alive?
-        return false if @thr.nil?
+      def currently_playing=(value)
+        value = "Playing: #{value}"
 
-        @thr.alive?
+        @currently_playing = break_by_lines(value)
+      end
+
+      def alive?
+        @thr&.alive? || (@io && !@io.closed?)
       end
 
       def stop?
         @thr.nil? || @thr.stop?
       end
 
-      def play(url)
+      def play(url, station_name: 'N/A')
         # Do not include spaces in the command line
         # if a space exist :
         #   * sh -c command url # this process with @pid will be killed
@@ -34,25 +45,114 @@ module Rubio
         #   * cmmand url        # will be killed by @pid
         raise if url.match(/\s/)
 
-        @pid = spawn(*backend.split(' '), url)
-        @thr = Process.detach(@pid)
-        @status = [@pid, @thr]
+        @playing_station_name = station_name
+
+        if show_currently_playing? && backend == 'vlc -I rc' && !OS.windows?
+          @io = IO.popen("#{backend} \"#{url}\"", 'r+')
+          update_currently_playing
+          continuously_fetch_currently_playing
+        else
+          @pid = spawn(*backend.split(' '), url)
+          @thr = Process.detach(@pid)
+        end
+
+        @status = { thr: @thr, pid: @pid, io: @io }
         @history << @status
       end
 
-      def stop
-        return unless alive?
+      def continuously_fetch_currently_playing
+        return if @continuously_fetching_currently_playing
 
-        r = Process.kill(OS.windows? ? :KILL : :TERM, pid)
-        @thr = nil
-        @pid = nil
+        @continuously_fetching_currently_playing = true
+
+        Glimmer::LibUI.timer(1) do
+          update_currently_playing
+          @continuously_fetching_currently_playing
+        end
+      end
+
+      def update_currently_playing
+        Glimmer::LibUI.queue_main do
+          self.currently_playing = currently_playing_text if alive?
+        end
+      end
+
+      def currently_playing_text
+        currently_playing_info = info
+        if currently_playing_info && !currently_playing_info.strip.empty?
+          [@playing_station_name, currently_playing_info].join(' - ')
+        else
+          @playing_station_name
+        end
+      end
+
+      def info
+        result = io_command('info')
+        now_playing_line = result.lines.find {|l| l.include?('now_playing:')}
+        if now_playing_line
+          now_playing_line.split('now_playing:').last.chomp.strip
+        end
+      rescue
+        nil
+      end
+
+      def stop(thr: nil, pid: nil, io: nil)
+        thr ||= @thr
+        pid ||= @pid
+        io  ||= @io
+        if thr&.alive?
+          r = Process.kill(OS.windows? ? :KILL : :TERM, pid)
+        elsif io && !io.closed?
+          io.close
+          r = io.closed?
+          self.currently_playing = CURRENTLY_PLAYING_NONE
+        end
+        thr = nil
+        pid = nil
+        io = nil
         r
       end
 
       def stop_all
-        @history.each do |pid, thr|
-          Process.kill(OS.windows? ? :KILL : :TERM, pid) if thr.alive?
+        @continuously_fetching_currently_playing = false
+        @history.each { |history| stop(**history) }
+      end
+
+      private
+
+      def break_by_lines(text, length_per_line: CURRENTLY_PLAYING_LENGTH_PER_LINE)
+        new_text_lines = ['']
+        text.chars.each_with_index do |char, i|
+          if (char != ' ' && new_text_lines[-1].length < length_per_line - 1) ||
+             (char == ' ' && new_text_lines[-1].length < length_per_line)
+            new_text_lines[-1] = new_text_lines[-1] + char
+          else
+            new_text_lines[-1] = new_text_lines[-1] + '-' if new_text_lines[-1][-1] != ' '
+            new_text_lines << char
+          end
+        end
+        new_text_lines.join("\n")
+      end
+
+      def io_command(command)
+        @io.puts(command)
+        io_all_gets
+      end
+
+      def io_all_gets
+        result = ''
+        while gets_result = io_gets
+          result += gets_result.to_s
+        end
+        result
+      end
+
+      def io_gets
+        Timeout.timeout(0.01) do
+          @io.gets
         end
+      rescue
+        nil
       end
     end
   end

data/lib/rubio/model/radio_browser.rb

@@ -19,7 +19,7 @@ module Rubio
         content = URI.parse(base_url + "stations/topvote/#{n}?offset=#{offset}")
         result = []
         JSON[content.read].each_with_index do |s, _i|
-          result << Station.new(s['stationuuid'], s['name'], s['language'], s['url_resolved'])
+          result << Station.new(s['stationuuid'], s['name'], s['language'], s['country'], s['url_resolved'])
         end
         result
       end

data/lib/rubio/model/radio_presenter.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require_relative '../model/radio_browser'
+require_relative '../model/player'
+
+module Rubio
+  module Model
+    # This is a presenter for the Radio view, which is an advanced controller
+    class RadioPresenter
+      attr_reader :player, :initial_width, :initial_height, :options
+      attr_accessor :stations, :current_station, :view, :window_height
+
+      # Initializes with view options below:
+      # :backend, :initial_width, :initial_height, :radio_station_count, :debug,
+      # :show_menu, :show_page_count, :show_bookmarks, :show_margins
+      # :gradually_fetch_stations, :table_per_page
+      def initialize(options = {})
+        @options = options
+        @options[:radio_station_count] = 1_000_000 if options[:radio_station_count] == -1
+        @loaded_station_count = [options[:gradually_fetch_stations] ? 100 : options[:radio_station_count], options[:radio_station_count]].min
+        @loaded_station_offset = 0
+        @stations = Model::RadioBrowser.topvote(@loaded_station_count, offset: @loaded_station_offset)
+        @player = Model::Player.new(options[:backend], show_currently_playing: options[:show_currently_playing])
+        @initial_width = (options[:initial_width] || (options[:show_bookmarks] ? 740 : 620)).to_i
+        @initial_height = (options[:initial_height] || calculate_initial_height).to_i
+        @window_height = @initial_height
+        @view = :all
+
+        Glimmer::DataBinding::Observer::Proc.new do
+          self.window_height = calculate_initial_height
+        end.observe(@player, :currently_playing)
+      end
+
+      def select_station(station)
+        playing = station.playing?
+        stop_station
+        self.current_station = station
+        if playing
+          self.current_station = nil
+        else
+          play_station
+        end
+      end
+
+      def toggle_bookmarked_station(station)
+        return unless station
+
+        station.bookmarked = !station.bookmarked?
+      end
+
+      def play_station
+        @player.play(current_station.url, station_name: current_station.name)
+        current_station.playing = true
+      rescue => e
+        self.current_station = nil
+        raise e
+      end
+
+      def stop_station
+        return if current_station.nil?
+
+        @player.stop
+        current_station.playing = false
+        self.current_station = nil
+      end
+
+      def stations_incomplete?
+        !@all_stations_fetched && @stations.count < options[:radio_station_count]
+      end
+
+      def fetch_more_stations
+        @loaded_station_offset += @loaded_station_count
+        @loaded_station_count *= 2
+        new_station_count = [@loaded_station_count, options[:radio_station_count] - @loaded_station_offset].min
+        old_station_count = @stations.count
+        self.stations += Model::RadioBrowser.topvote(new_station_count, offset: @loaded_station_offset)
+        @all_stations_fetched = @stations.count == old_station_count
+        self.stations
+      end
+
+      private
+
+      def calculate_initial_height
+        window_margin = options[:show_margins] ? (OS.linux? ? 22 : 40) : 0
+        currently_playing_height = options[:show_currently_playing] ? ((@player.currently_playing ? @player.currently_playing.lines.size : 1)*16 + 8) : 0
+        table_per_page = options[:table_per_page].to_i
+        if OS.linux?
+          108 + window_margin + currently_playing_height + (options[:show_menu] ? 26 : 0) + 24 * table_per_page
+        elsif OS.mac? && OS.host_cpu == 'arm64'
+          90 + window_margin + currently_playing_height + 24 * table_per_page
+        elsif OS.mac?
+          85 + window_margin + currently_playing_height + 19 * table_per_page
+        else # Windows
+          95 + window_margin + currently_playing_height + 19 * table_per_page
+        end
+      end
+    end
+  end
+end

data/lib/rubio/model/station.rb

@@ -4,7 +4,7 @@ require_relative 'bookmark'
 
 module Rubio
   module Model
-    Station = Struct.new(:stationuuid, :name, :language, :url, :play, :bookmark) do
+    Station = Struct.new(:stationuuid, :name, :language, :country, :url, :play, :bookmark) do
       attr_reader :playing, :bookmarked
       alias_method :playing?, :playing
       alias_method :bookmarked?, :bookmarked

data/lib/rubio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rubio
-  VERSION = '0.0.5'
+  VERSION = '0.0.7'
 end

data/lib/rubio/view/radio.rb

@@ -2,8 +2,7 @@
 
 require 'glimmer-dsl-libui'
 
-require_relative '../model/radio_browser'
-require_relative '../model/player'
+require_relative '../model/radio_presenter'
 
 module Rubio
   module View
@@ -11,49 +10,60 @@ module Rubio
       include Glimmer::LibUI::Application
 
       options :backend, :initial_width, :initial_height
-      option :radio_station_count, default: 10_000
+      option :radio_station_count, default: -1
       option :debug, default: false
       option :show_menu, default: true
       option :show_page_count, default: false
       option :show_bookmarks, default: true
+      option :show_margins, default: true
+      option :show_currently_playing, default: true
       option :gradually_fetch_stations, default: true
       option :table_per_page, default: 20
 
-      attr_reader :stations, :player
-      attr_accessor :current_station, :view
+      attr_reader :presenter
 
       before_body do
-        @loaded_station_count = [gradually_fetch_stations ? 100 : radio_station_count, radio_station_count].min
-        @loaded_station_offset = 0
-        @stations = Model::RadioBrowser.topvote(@loaded_station_count, offset: @loaded_station_offset)
-        @player = Model::Player.new(backend)
-        @initial_width = (initial_width || (show_bookmarks ? 740 : 620)).to_i
-        @initial_height = (initial_height || calculate_initial_height).to_i
-        @view = :all
+        # options is a method on Glimmer::LibUI::Application that contains all options declared above
+        @presenter = Model::RadioPresenter.new(options)
       end
 
       after_body do
         monitor_thread(debug)
-        async_fetch_stations if gradually_fetch_stations && @stations.count < radio_station_count
+        async_fetch_stations if gradually_fetch_stations && @presenter.stations_incomplete?
       end
 
       body do
         radio_menu_bar
 
-        window('Rubio', @initial_width, @initial_height) do
+        window('Rubio', @presenter.initial_width, @presenter.initial_height / (OS.linux? ? 2.0 : 1)) do
+          margined show_margins
+          height <= [@presenter, :window_height,
+                      on_read: ->(value) {
+                        w = body_root
+                        if w.nil? # window not built yet
+                          # Linux libui is weird. The first time height is set, it must be halved
+                          value / (OS.linux? ? 2.0 : 1)
+                        else
+                          value -= 50 if OS.linux? # more Linux weirdness
+                          value = value > w.height ? value : w.height # grow only, never shrink
+                          value
+                        end
+                      }
+                    ]
+          
           vertical_box do
-            horizontal_box do
-              @station_table = refined_table(
-                table_columns: station_table_columns,
-                model_array: stations,
-                per_page: table_per_page.to_i,
-                visible_page_count: show_page_count
-              )
-            end
+            currently_playing_label
+
+            @station_table = refined_table(
+              table_columns: station_table_columns,
+              model_array: @presenter.stations,
+              per_page: table_per_page.to_i,
+              visible_page_count: show_page_count
+            )
           end
 
           on_closing do
-            @player.stop_all
+            @presenter.player.stop_all
           end
         end
       end
@@ -69,28 +79,28 @@ module Rubio
       def radio_menu
         menu('Radio') do
           menu_item('Stop') do
-            enabled <= [self, 'current_station', { on_read: ->(value) { !!value } }]
-
+            enabled <= [@presenter, 'current_station', on_read: ->(value) { !!value }]
+            
             on_clicked do
-              stop_station
+              @presenter.stop_station
             end
           end
 
           separator_menu_item
 
           menu_item('Bookmark') do
-            enabled <= [self, 'current_station.bookmarked', { on_read: :! }]
-
+            enabled <= [@presenter, 'current_station.bookmarked', on_read: ->(value) { value == false }]
+            
             on_clicked do
-              toggle_bookmarked_station(current_station) if current_station
+              toggle_bookmarked_station
             end
           end
 
           menu_item('Unbookmark') do
-            enabled <= [self, 'current_station.bookmarked']
-
+            enabled <= [@presenter, 'current_station.bookmarked', on_read: ->(value) { value == true }]
+            
             on_clicked do
-              toggle_bookmarked_station(current_station) if current_station
+              toggle_bookmarked_station
             end
           end
 
@@ -106,7 +116,7 @@ module Rubio
 
           quit_menu_item do
             on_clicked do
-              @player.stop_all
+              @presenter.player.stop_all
             end
           end
         end
@@ -115,30 +125,33 @@ module Rubio
       def view_menu
         menu('View') do
           radio_menu_item('All') do
-            checked <=> [self, :view,
-                         { on_read: ->(value) { value == :all },
-                           on_write: ->(_value) { :all } }]
-
+            checked <=> [@presenter, :view,
+                          on_read: ->(value) { value == :all },
+                          on_write: ->(value) { :all },
+                        ]
+            
             on_clicked do
               view_all
             end
           end
 
           radio_menu_item('Bookmarks') do
-            checked <=> [self, :view,
-                         { on_read: ->(value) { value == :bookmarks },
-                           on_write: ->(_value) { :bookmarks } }]
-
+            checked <=> [@presenter, :view,
+                          on_read: ->(value) { value == :bookmarks },
+                          on_write: ->(value) { :bookmarks },
+                        ]
+                        
             on_clicked do
               view_bookmarks
             end
           end
 
           radio_menu_item('Playing') do
-            checked <=> [self, :view,
-                         { on_read: ->(value) { value == :playing },
-                           on_write: ->(_value) { :playing } }]
-
+            checked <=> [@presenter, :view,
+                          on_read: ->(value) { value == :playing },
+                          on_write: ->(value) { :playing },
+                        ]
+                        
             on_clicked do
               view_playing
             end
@@ -158,13 +171,27 @@ module Rubio
         end
       end
 
+      def currently_playing_label
+        return unless show_currently_playing && backend == 'vlc -I rc' && !OS.windows?
+
+        label do
+          stretchy false
+          text <= [@presenter.player, :currently_playing]
+        end
+      end
+
       def station_table_columns
         table_columns = {
           'Play' => {
             button: {
               on_clicked: lambda { |row|
                 station = @station_table.refined_model_array[row]
-                select_station(station)
+                begin
+                  @presenter.select_station(station)
+                rescue => e
+                  puts e.full_message if debug
+                  message_box(e.message)
+                end
               }
             }
           }
@@ -185,66 +212,42 @@ module Rubio
 
         table_columns.merge!(
           'name' => :text,
-          'language' => :text
+          'language' => :text,
+          'country' => :text
         )
       end
 
       def about_message_box
         license = begin
           File.read(File.expand_path('../../../LICENSE.txt', __dir__))
-        rescue StandardError
+        rescue => e
+          puts e.full_message if debug
           ''
         end
         product = "rubio-radio #{Rubio::VERSION}"
         message_box(product, "#{product}\n\n#{license}")
       end
 
-      def select_station(station)
-        playing = station.playing?
-        stop_station
-        self.current_station = station
-        if playing
-          self.current_station = nil
-        else
-          play_station
-        end
-      end
-
-      def toggle_bookmarked_station(station)
-        station.bookmarked = !station.bookmarked?
-        view_bookmarks if view == :bookmarks && !station.bookmarked
-      end
-
-      def play_station
-        @player.play(current_station.url)
-        current_station.playing = true
-      rescue StandardError => e
-        message_box(e.message)
-        self.current_station = nil
-      end
-
-      def stop_station
-        return if current_station.nil?
-
-        @player.stop
-        current_station.playing = false
-        self.current_station = nil
+      def toggle_bookmarked_station(station = nil)
+        station ||= @presenter.current_station
+        @presenter.toggle_bookmarked_station(station)
+        view_bookmarks if @presenter.view == :bookmarks && !station.bookmarked
       end
 
       def view_all
-        @station_table.model_array = stations
+        @station_table.model_array = @presenter.stations
       end
 
       def view_bookmarks
-        @station_table.model_array = stations.select(&:bookmarked?)
+        @station_table.model_array = @presenter.stations.select(&:bookmarked?)
       end
 
       def view_playing
-        @station_table.model_array = stations.select(&:playing?)
+        @station_table.model_array = @presenter.stations.select(&:playing?)
       end
 
       def refresh_view
-        case view
+        case @presenter.view
         when :all
           view_all
         when :bookmarks
@@ -256,39 +259,24 @@ module Rubio
 
       private
 
-      def calculate_initial_height
-        if OS.linux?
-          107 + (show_menu ? 26 : 0) + 24 * table_per_page.to_i
-        elsif OS.mac? && OS.host_cpu == 'arm64'
-          90 + 24 * table_per_page.to_i
-        elsif OS.mac?
-          85 + 19 * table_per_page.to_i
-        else # Windows
-          95 + 19 * table_per_page.to_i
-        end
-      end
-
       def monitor_thread(debug)
         Glimmer::LibUI.timer(1) do
-          p @player.history if debug
-          next if current_station.nil? || @player.alive?
+          p @presenter.player.history if debug
+          next if @presenter.current_station.nil? || @presenter.player.alive?
 
-          message_box("player '#{@player.backend}' stopped!", @player.thr.to_s)
-          stop_station
+          message_box("player '#{@presenter.player.backend}' stopped!", @presenter.player.thr.to_s)
+          @presenter.stop_station
           true
         end
       end
 
       def async_fetch_stations
-        @loaded_station_offset += @loaded_station_count
-        @loaded_station_count *= 2
         Thread.new do
-          new_station_count = [@loaded_station_count, radio_station_count - @loaded_station_offset].min
-          @stations += Model::RadioBrowser.topvote(new_station_count, offset: @loaded_station_offset)
+          @presenter.fetch_more_stations
 
           Glimmer::LibUI.queue_main do
             refresh_view
-            async_fetch_stations if @stations.count < radio_station_count
+            async_fetch_stations if @presenter.stations_incomplete?
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubio-radio
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - kojix2
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-libui
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.22
+        version: 0.5.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.22
+        version: 0.5.24
 description: Rubio is a simple radio player written in Ruby.
 email:
 - 2xijok@gmail.com
@@ -42,6 +42,7 @@ files:
 - lib/rubio/model/bookmark.rb
 - lib/rubio/model/player.rb
 - lib/rubio/model/radio_browser.rb
+- lib/rubio/model/radio_presenter.rb
 - lib/rubio/model/station.rb
 - lib/rubio/version.rb
 - lib/rubio/view/radio.rb
@@ -64,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Rubio - A simple radio player