dxmms2 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c0558d7e7c3d2afdfce8c3cda5a5d462b19fb1e2
-  data.tar.gz: 717ae54b84456c746f9486f3c5703776250c7ae1
+SHA256:
+  metadata.gz: 9e61c4e0f10fc0beb482c379d0f1372dbc67b64c9228ffb71644c2d86fd22cb9
+  data.tar.gz: 1cc2a18957934ac95e0d1d07abaa27b589c2aa8c3de450176f0c5b3dec8fb7e9
 SHA512:
-  metadata.gz: abe3d53027584aa876d6114c529e1820fa91d92e8499afed04cb143167f030ce8c94f1ea60a5cf550375a517d6a8419e0b45fe4bf0fc1896dce0c2e00797bef4
-  data.tar.gz: 54e52c04408e46a6da49a815ee1d819d53f4091759d418154dea49efb61725d3e75e0b2b7fb288a2a6fe30ce20782c81db33771b4da3f4c49ab7154289172638
+  metadata.gz: 4fdfc9ff13a2d073f1a3069d0a19e43bd92d4f31c0b5823f1af5daa0140407901003f79095a8c03b7f182845fdace37cf7204ec12d71aa8d8801c13cefc0310c
+  data.tar.gz: 8dc76fbe4a8e853f082f7f6ab17229bd678e2fedf35d21015a40bce009bba0bf171fb93dc4c2cebc47d02e7ab84b69698d9bd430dd59a8848dda160ee5345127

data/Makefile

@@ -3,4 +3,4 @@ gem:: dxmms2.gemspec
 	gem build $<
 
 install::
-	gem install --user dxmms2-*.gem
+	gem install --install-dir $(HOME)/.gem/ruby/3.1.0 dxmms2-*.gem

data/bin/dxmms2

@@ -18,14 +18,17 @@ end
 # for dmenu              #
 ##########################
 
+# XXX: I ruby doesn't designate keyword arguments with =, it just helps me
+# remember what some arguments are
+
 $xc = Xmms::client("dxmms2")
 
-$COMMAND_SIG = "@"
+$COMMAND_SIG = ","
 # default configs {{{
 $SCREEN_WIDTH=Integer(ENV.fetch('DXMMS2_MENU_WIDTH', 600))
 $FONT_WIDTH=Integer(ENV.fetch('DXMMS2_FONT_WIDTH', 13)) #in pixels)
 $BG_COLOR=ENV.fetch('DMENU_BG_COLOR', '#000000')
-$FG_COLOR=ENV.fetch('DMENU_FG_COLOR', '#dc322f')
+$FG_COLOR=ENV.fetch('DMENU_FG_COLOR', '#268bd2')
 $SEL_BG_COLOR=ENV.fetch('DMENU_SEL_BG_COLOR', $FG_COLOR)
 $SEL_FG_COLOR=ENV.fetch('DMENU_SEL_FG_COLOR', $BG_COLOR)
 if $GLIB
@@ -37,7 +40,7 @@ if $GLIB
     $MUSIC_DIRECTORY = ENV.fetch('DXMMS2_MUSIC_DIRECTORY', fallback)
 end
 
-$FONT = ENV.fetch('DMENU_FONT', 'Noto Sans Mono CJK JP Regular')
+$FONT = ENV.fetch('DMENU_FONT', 'Noto Sans Mono CJK JP Bold')
 $FONT = $FONT + ':pixelsize=' + $FONT_WIDTH.to_s
 $LIST_ENTRIES_PER_PAGE = 15
 $LINE_HEIGHT=10
@@ -48,9 +51,10 @@ $LINE_HEIGHT=10
 #fi
 class Integer
     def ms_to_time_string
-        minutes=(self / 60000)
-        seconds=(self % 60000) / 1000
-        "%d:%02d" % [minutes, seconds]
+        sgn = self >= 0 ? '' : '-'
+        minutes=(self.abs / 60000)
+        seconds=(self.abs % 60000) / 1000
+        "%s%d:%02d" % [sgn, minutes, seconds]
     end
 end
 
@@ -58,14 +62,16 @@ def time_string_to_ms(str)
     res = 0
     s = 1
     for n in str.split(":").reverse do
-        s = 60 * s
         res = res + s * (n.to_i)
+        s = 60 * s
     end
-    return res.to_i
+    return res.to_i * 1000
 end
 
-def my_dmenu (entries, prompt='dxmms2', height=entries.count, width=$SCREEN_WIDTH)
-    height = [height, 20].min
+def my_dmenu(entries, prompt='dxmms2', height=nil, width=$SCREEN_WIDTH)
+    if height.nil?
+        height = [entries.length, 20].min
+    end
     Dmenu::dmenu(entries, prompt, height, width,
           $FG_COLOR,
           $BG_COLOR,
@@ -100,8 +106,8 @@ def list_ids(entries, prompt, start=0, nentries=nil, commands=nil)
     # XXX: Create a list object to pass to user-supplied commands
     #      list object allows for setting list start, page size, list content,
     #      whether to redisplay the list, and maybe other things
-    morestring,endstring,startstring,backstring =
-        %w[more end start back].map{|w| $COMMAND_SIG + w}
+    morestring,endstring,startstring,backstring,allstring,pagedstring =
+        %w[more end start back all paged].map{|w| $COMMAND_SIG + w}
     if commands.nil?
         commands = Hash.new
     end
@@ -111,9 +117,10 @@ def list_ids(entries, prompt, start=0, nentries=nil, commands=nil)
         c1[$COMMAND_SIG + k] = v
     end
     listing=1
-    nentries = (nentries.nil? ? $LIST_ENTRIES_PER_PAGE : nentries)
+    nentries = nentries_orig = (nentries.nil? ? $LIST_ENTRIES_PER_PAGE : nentries)
     pos = nil
     list_start = start
+    paged = true
     while ( listing == 1 ) do
         start_clamped = false
         end_clamped = false
@@ -125,7 +132,7 @@ def list_ids(entries, prompt, start=0, nentries=nil, commands=nil)
         list_end = list_start + nentries
 
         #clamps end
-        (list_end > entries.length) and (list_end = entries.length ; end_clamped = true)
+        (list_end >= entries.length) and (list_end = entries.length ; end_clamped = true)
 
 
         nw = list_end.to_s.length
@@ -147,11 +154,20 @@ def list_ids(entries, prompt, start=0, nentries=nil, commands=nil)
             items << morestring
         end
 
+        if nentries < entries.length or list_start != 0
+            items << allstring
+        end
+
+        if nentries == entries.length
+            items << pagedstring
+        end
+
         c1.keys.each do |d|
             items << d
         end
 
-        choice = my_dmenu(items, prompt, items.length).gsub(/^\s+|\s+$/, "")
+        list_len = paged ? items.length : 20
+        choice = my_dmenu(items, prompt, list_len).gsub(/^\s+|\s+$/, "")
         pos = choice[/^-?\d+|#{$COMMAND_SIG}[a-zA-Z0-9\-_.]+/]
 
         case pos
@@ -163,6 +179,14 @@ def list_ids(entries, prompt, start=0, nentries=nil, commands=nil)
             list_start = entries.length - nentries
         when startstring
             list_start = 0
+        when allstring
+            list_start = 0
+            nentries = entries.length
+            paged = false
+        when pagedstring
+            list_start = start
+            nentries = nentries_orig
+            paged = true
         when *(c1.keys)
             f = c1[pos]
             f.call(entries)
@@ -189,7 +213,11 @@ def xmms2_ids_to_display_list_strings(ids, fields=%w[artist title url duration])
     ids.map do |id|
         my_info = $xc.extract_medialib_info(id, *fields)
         artist_part = my_info[:artist]
-        some_title = (my_info[:title] or File.basename(my_info[:url]))
+        begin
+          some_title = (my_info[:title] or File.basename(my_info[:url]))
+        rescue Exception
+          some_title = "!!NO TITLE!!"
+        end
         duration = my_info[:duration].to_i.ms_to_time_string
         "#{artist_part}|||#{some_title} [#{duration}]"
     end
@@ -298,7 +326,9 @@ def match_collection(field, pattern, base_coll=nil)
         coll.operands << Xmms::Collection.universe
     end
     coll.attributes["field"] = field
-    coll.attributes["value"] = pattern
+    if !pattern.nil?
+        coll.attributes["value"] = pattern
+    end
     coll
 end
 
@@ -356,10 +386,9 @@ while true do
     when "list"
         pos = pl_list(nil, nil, "Play Track:")
         if not pos.nil?
-            puts "moving to positon #{pos}"
             play_new_track($xc, pos)
+            break
         end
-        break
     when "add"
         d = Dir.new($MUSIC_DIRECTORY)
         add_dir = $COMMAND_SIG + 'add-dir'
@@ -371,7 +400,7 @@ while true do
                     x
                 end
             end
-            choice = my_dmenu(entries.sort << add_dir, "Add entries", d.entries.length)
+            choice = my_dmenu(entries.sort << add_dir, "Add entries")
             path = File.join(d, choice)
             if choice.empty?
                 d = nil
@@ -426,7 +455,7 @@ while true do
                 [k,v]
             }]
             while true
-                field = my_dmenu(info.map {|k,v| "#{k} |||#{v[0]}"}, "Info", info.size)
+                field = my_dmenu(info.map {|k,v| "#{k} |||#{v[0]}"}, "Info")
                 if field.empty?
                     break
                 else
@@ -477,29 +506,50 @@ while true do
             edit_metadata(ids.map{ |id| $xc.extract_medialib_info(id, "url")[:url] })
         end
 
-        current_collection = Xmms::Collection.universe # TODO: Support searching multiple fields as in xmmsfs
+        def drop_ids(ids)
+            ids.each do |id|
+                $xc.medialib_entry_remove(id).wait
+            end
+        end
+
         refine = false
+        completed = false
         cs = {
-            'add' => proc { |k| add(k) },
-            'edit-metadata' => proc { |k| edit_ids_metadata(k) },
-            'new-playlist' => proc { |k| new_playlist_prompt(k) },
-            'refine' => proc { |k| refine=true }
+            'add' => proc { |k| add(k) ; completed = true },
+            'edit-metadata' => proc { |k| edit_ids_metadata(k) ; completed = true},
+            'new-playlist' => proc { |k| new_playlist_prompt(k) ; completed = true},
+            'refine' => proc { |k| refine=true },
+            'drop' => proc { |k| drop_ids(k) ; completed=true },
         }
 
+        collection_stack = []
+        search_stack = []
         while true
-            field = my_dmenu(fields, prompt="Field")
+            search_path = search_stack.map{|x| "#{x[0]}:#{x[1]}"}.join("/")
+            if not search_path.empty?
+                search_path += "  "
+            end
+            field = my_dmenu(fields, "#{search_path}Field")
             if field.empty?
-                break
+                if collection_stack.empty?
+                    break
+                else
+                    collection_stack.pop
+                    search_stack.pop
+                    next
+                end
+            end
+            current_collection = collection_stack[-1]
+            if current_collection.nil?
+                current_collection = Xmms::Collection.universe
             end
             field_sym = field.to_sym
             options = Set.new(get_collection_info(current_collection, field).map{|x| x.fetch(field_sym, "UNDEF")}).to_a.sort
-
             lists = [options]
             search_string = ""
-            # XXX: Save and display past searches
             begin
                 lists.each_with_index do |x, i|
-                    search_string = my_dmenu(x, prompt="Search string (#{i}/#{lists.length})", [x.length, 20].min)
+                    search_string = my_dmenu(x, "Search string (#{i}/#{lists.length})")
                     break
                 end
             rescue Exception
@@ -510,18 +560,17 @@ while true do
             if !options.include?(search_string)
                 search_string.gsub!(" ","*")
             elsif field == 'url'
-                search_string = Xmms::encode_url(search_string)
+                search_string = Xmms::encode_xmms2_url(search_string)
             end
 
             if search_string.empty?
-                break
+                next
             end
-            search_string = "*#{search_string}*"
-            puts search_string
-            coll = match_collection(field, search_string, current_collection)
+            coll = match_collection(field, search_string == "UNDEF" ? nil : "*#{search_string}*", current_collection)
             d = $xc.coll_query_ids(coll,"artist,album,tracknr").wait.value
             d = d.reverse
-            pos = list_ids(d, prompt="Results", 0, $LIST_ENTRIES_PER_PAGE, cs)
+            refine = false
+            pos = list_ids(d, "Results", 0, $LIST_ENTRIES_PER_PAGE, cs)
 
             # Make the playlist collection
             new_playlist('search-result-list', d)
@@ -531,17 +580,21 @@ while true do
                 pl = $xc.playlist('search-result-list')
                 pl.load.wait
                 play_new_track($xc, pos)
+                completed = true
                 break
             end
 
             if refine
-                current_collection = coll
-            else
-                current_collection = Xmms::Collection.universe
+                collection_stack.push coll
+                search_stack.push [field, search_string]
+            elsif completed
+                break
             end
         end
 
-        break
+        if completed
+          break
+        end
     when "remove"
         while true
             pos = pl_list(nil,nil,"Remove entry:")
@@ -596,14 +649,14 @@ while true do
             while tag_menu(album_ids, [])
             end
         rescue => e
-            puts e
+            $stderr.puts e
         end
 
         break
     when "change-playlist"
         begin
              playlists_prompt do |selected|
-                $xc.playlist(selected).load.wait
+                 puts $xc.playlist(selected).load.wait.value
              end
         end
         break
@@ -642,7 +695,7 @@ while true do
         $xc.quit.wait
         break
     when "seek"
-        print $xc.playback_playtime.wait.value
+        cur = $xc.playback_playtime.wait.value
         id = $xc.playback_current_id.wait.value
         info = $xc.extract_medialib_info(id, :duration)
         dur = info[:duration].to_i
@@ -650,15 +703,20 @@ while true do
         times = []
         times << ["start",  0]
         Range.new(0,dur).step(interval_size).each do |x|
-            times << [x.ms_to_time_string, x]
+          sgn = x-cur >= 0?"+":""
+          offset = (x - cur).ms_to_time_string
+          times << ["  #{x.ms_to_time_string}   #{sgn}#{offset} ", x]
         end
         times << ["end", dur]
         seek_location = my_dmenu(times.map{|x| x[0]}).to_s
-        # FIXME: This math is clearly janky. Sadly I have actual work to do.
-        seek = 20 * time_string_to_ms(seek_location)
-        puts $xc.playback_seek_ms(seek).wait.value
-        $stdout.flush
-        break
+        if !seek_location.empty?
+          thash = Hash[times]
+          seek = thash[seek_location]
+          if !seek.nil?
+            $xc.playback_seek_ms(seek).wait.value
+          end
+          break
+        end
     else
         if not command.empty?
             `xmms2 #{command}`

data/dxmms2.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "dxmms2"
-  spec.version       = "1.0.0"
+  spec.version       = "1.2.0"
   spec.authors       = ["Mark Watts"]
   spec.email         = ["wattsmark2015@gmail.com"]
   spec.summary       = %q{A client for working with xmms2}
@@ -15,9 +15,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["."]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_runtime_dependency "glib2", "~> 3.1.0"
+  spec.add_development_dependency "bundler", "~>2.2", ">= 2.2.10"
+  spec.add_development_dependency "rake", "~>12.3", ">= 12.3.2"
+  spec.add_runtime_dependency "glib2", "~> 3.4.3"
   spec.add_runtime_dependency "xmms2_utils", "~> 0.1.2"
-  spec.add_runtime_dependency "markw-dmenu", "~> 1.0.0"
+  spec.add_runtime_dependency "markw-dmenu", "~> 1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dxmms2
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Mark Watts
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2023-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,54 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.2
 - !ruby/object:Gem::Dependency
   name: glib2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.4.3
 - !ruby/object:Gem::Dependency
   name: xmms2_utils
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
 description: "# dxmms2\n*a dmenu shell for xmms2*\n\nSetting the dmenu width in dxmms2
   requires the patch provided in this repo. The \npatch hasn't been tested--application
   may require manual effort.\n\n  ![dxmms2 screenie](dxmms2.png)\n"
@@ -100,7 +112,7 @@ homepage: http://github.com/mwatts15/xmms2-stuff
 licenses:
 - MPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - "."
@@ -115,9 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
 summary: A client for working with xmms2
 test_files: []