RubyGems - shroom - Versions diffs - 0.0.6 → 0.0.7 - Mend

shroom 0.0.6 → 0.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

data/Rakefile +1 -1
data/lib/sh_cover_art.rb +1 -1
data/lib/sh_global.rb +50 -15
data/lib/sh_lyrics.rb +40 -10
data/lib/sh_main.rb +5 -0
data/lib/sh_player.rb +44 -87
data/lib/sh_plugin.rb +44 -0
data/lib/sh_song.rb +11 -7
data/lib/sh_tagreader.rb +16 -15
data/lib/sh_util.rb +22 -1
data/lib/sh_view.rb +114 -35
data/lib/shroom-res/cover_unavailable.png +0 -0
data/lib/shroom-res/cover_unavailable.svg +152 -0
data/lib/shroom-res/plugins/lastfm_scrobbler.rb +71 -0
data/lib/shroom-res/shroom.glade +135 -0
metadata +7 -2

data/lib/shroom-res/cover_unavailable.png ADDED

Binary file

data/lib/shroom-res/cover_unavailable.svg ADDED

@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="381.42856"
+   height="381.42856"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="cover_unavailable.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="320.64007"
+     inkscape:cy="345.12853"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="972"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-78.571434,-149.50504)">
+    <rect
+       style="fill:#f9f9f9;stroke:none"
+       id="rect2443"
+       width="381.42856"
+       height="381.42856"
+       x="78.571434"
+       y="149.50504" />
+    <g
+       id="g2435"
+       style="stroke:none">
+      <path
+         sodipodi:nodetypes="csscc"
+         id="path2383"
+         d="M 291.42857,268.07647 C 242.09733,308.91545 179.32004,340.42259 165.71429,413.79075 C 151.7914,488.86906 234.21959,487.07658 238.57143,448.07646 C 248.05394,363.09655 297.65886,347.77628 361.42857,316.6479 L 291.42857,268.07647 z"
+         style="fill:#f4eed7;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccsc"
+         id="path2385"
+         d="M 196.47008,231.47362 C 182.44969,251.33186 336.04035,423.14066 362.96322,412.13253 C 362.96322,412.13253 441.04616,314.71479 369.23136,243.13276 C 279.66804,153.85971 196.47008,231.47362 196.47008,231.47362 z"
+         style="fill:#e3dbdb;fill-rule:evenodd;stroke:none;stroke-width:0.8903318px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path2397"
+         d="M 369.22334,243.12705 C 360.69876,246.24585 354.9784,252.10661 351.77125,263.60006 C 347.74687,278.02224 371.0174,286.3003 381.73527,284.45769 C 385.65493,283.78382 389.66033,281.84031 393.16416,279.13981 C 388.41962,266.81197 380.76555,254.63185 369.22334,243.12705 z"
+         style="fill:#f9f9f9;fill-rule:evenodd;stroke:none;stroke-width:0.8903318px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="csscc"
+         id="path2387"
+         d="M 254.94698,226.67275 C 247.95049,238.38788 268.22351,248.90106 275.64028,250.71507 C 289.18069,254.02679 298.84971,249.45522 309.88972,243.90691 C 320.43777,238.60585 319.25221,226.4191 313.56774,219.81466 C 292.68145,203.64386 272.15885,203.78965 254.94698,226.67275 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:0.6542201px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path2402"
+         d="M 263.76512,285.09005 C 251.72283,284.64748 240.52368,290.44177 237.104,301.73991 C 246.93918,313.80633 257.82903,326.29465 269.01783,338.41223 C 276.64461,337.92525 284.43932,335.36996 292.20342,332.18825 C 314.27336,323.14402 296.49686,303.58325 285.11016,292.98682 C 278.6965,287.93922 271.08217,285.35897 263.76512,285.09005 z"
+         style="fill:#f9f9f9;fill-rule:evenodd;stroke:none;stroke-width:0.8903318px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path2389"
+         d="M 377.31848,353.24079 C 366.98476,339.56774 353.52338,317.37162 335.95136,331.55225 C 325.0707,340.33295 343.24109,361.05816 348.37485,367.41969 C 357.51566,378.74658 369.77322,378.17982 377.82544,367.51752 C 380.28838,364.25622 377.74719,355.20072 377.31848,353.24079 z"
+         style="fill:#f9f9f9;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:51.94473648px;font-style:normal;font-weight:normal;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="274.08447"
+       y="316.94168"
+       id="text2424"><tspan
+         sodipodi:role="line"
+         id="tspan2426"
+         x="274.08447"
+         y="316.94168"
+         style="font-weight:bold;text-align:center;text-anchor:middle;fill:#4d4d4d;-inkscape-font-specification:Bitstream Vera Sans Bold">Cover</tspan><tspan
+         sodipodi:role="line"
+         x="274.08447"
+         y="381.87259"
+         id="tspan2428"
+         style="font-weight:bold;text-align:center;text-anchor:middle;fill:#4d4d4d;-inkscape-font-specification:Bitstream Vera Sans Bold">Unavailable</tspan></text>
+    <text
+       id="text2445"
+       y="312.65598"
+       x="270.37018"
+       style="font-size:51.94473648px;font-style:normal;font-weight:normal;fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       xml:space="preserve"><tspan
+         style="font-weight:bold;text-align:center;text-anchor:middle;fill:#e6e6e6;-inkscape-font-specification:Bitstream Vera Sans Bold"
+         y="312.65598"
+         x="270.37018"
+         id="tspan2447"
+         sodipodi:role="line">Cover</tspan><tspan
+         style="font-weight:bold;text-align:center;text-anchor:middle;fill:#e6e6e6;-inkscape-font-specification:Bitstream Vera Sans Bold"
+         id="tspan2449"
+         y="377.58688"
+         x="270.37018"
+         sodipodi:role="line">Unavailable</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:51.94473648px;font-style:normal;font-weight:normal;fill:#999999;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="272.37018"
+       y="314.65598"
+       id="text2412"><tspan
+         sodipodi:role="line"
+         id="tspan2414"
+         x="272.37018"
+         y="314.65598"
+         style="font-weight:bold;text-align:center;text-anchor:middle;fill:#999999;-inkscape-font-specification:Bitstream Vera Sans Bold">Cover</tspan><tspan
+         sodipodi:role="line"
+         x="272.37018"
+         y="379.58688"
+         id="tspan2416"
+         style="font-weight:bold;text-align:center;text-anchor:middle;fill:#999999;-inkscape-font-specification:Bitstream Vera Sans Bold">Unavailable</tspan></text>
+  </g>
+</svg>

data/lib/shroom-res/plugins/lastfm_scrobbler.rb ADDED

@@ -0,0 +1,71 @@
+require 'ping'
+require 'thread'
+Sh::Plugin.define "lastfm_scrobbler" do
+  name "Last.fm Scrobbler"
+  description "This plugin submits listening data to Last.fm (http://last.fm/)."
+  author "Aiden Nibali"
+  version "0.0.1"
+  @scrobble_queue = []
+  # This method is called when a song stops playing (not paused, but stopped)
+  def on_player_stopped player
+    if Sh::Global.prefs[:lastfm]
+      song, play_time, duration = player.song, player.play_time, player.duration
+      if play_time > 240 or (play_time > duration / 2 and duration > 30)
+        @scrobble_queue.insert 0, {
+          :artist => song.artist.name,
+          :track => song.title,
+          :album => song.album.title,
+          :time => Time.new,
+          :length => duration,
+          :track_number => song.track_num
+        }
+        # Scrobble if Audioscrobbler is reachable
+        submit_scrobbles! if Ping.pingecho("post.audioscrobbler.com", 10)
+      end
+    end
+  end
+  def submit_scrobbles!
+    (@mutex ||= Mutex.new).synchronize do
+      auth = @scrobble_auth
+      if not auth or auth.status.strip.upcase != 'OK'
+        user, pass = Sh::Global.prefs[:lastfm_user], Sh::Global.prefs[:lastfm_password]
+        begin
+          auth = @scrobble_auth = Scrobbler::SimpleAuth.new(:user => user, :password => pass)
+          auth.handshake!
+          puts "Last.fm authentication status: #{auth.status}"
+        rescue
+        end
+      end
+      # No point attempting to scrobble without authentication
+      if auth.status and auth.status.strip.upcase == 'OK'
+        failed_scrobbles = []
+        until @scrobble_queue.empty?
+          hash = @scrobble_queue.pop
+          hash[:session_id] = auth.session_id
+          hash[:submission_url] = auth.submission_url
+          scrobble = nil
+          begin
+            scrobble = Scrobbler::Scrobble.new(hash)
+            scrobble.submit!
+          rescue
+            scrobble = nil
+          end
+          if scrobble and scrobble.status.strip.upcase == 'OK'
+            puts "Scrobble for '#{scrobble.track}' succeeded"
+          else
+            puts "Warning: Scrobble for '#{scrobble.track}' failed"
+            failed_scrobbles.insert 0, hash
+          end
+        end
+        @scrobble_queue.push *failed_scrobbles
+      end
+    end
+  end
+end

data/lib/shroom-res/shroom.glade CHANGED

@@ -527,4 +527,139 @@
       </widget>
     </child>
   </widget>
+  <widget class="GtkDialog" id="dlg_plugins">
+    <property name="border_width">5</property>
+    <property name="type_hint">normal</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox4">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkHPaned" id="hpaned1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="position">250</property>
+            <child>
+              <widget class="GtkScrolledWindow" id="scrolledwindow1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <child>
+                  <widget class="GtkTreeView" id="lst_plugins">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="resize">False</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox1">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <widget class="GtkLabel" id="lbl_name">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Foobar&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="lbl_version">
+                    <property name="visible">True</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">&lt;i&gt;0.0.0&lt;/i&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkScrolledWindow" id="scrolledwindow2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <child>
+                      <widget class="GtkTextView" id="txt_description">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="editable">False</property>
+                        <property name="wrap_mode">word</property>
+                        <property name="text" translatable="yes">Description goes here, and may be fairly long.</property>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkButton" id="btn_preferences">
+                    <property name="label" translatable="yes">gtk-preferences</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_stock">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="resize">True</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area4">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <widget class="GtkButton" id="btn_ok">
+                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shroom
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Aiden Nibali
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-08-08 00:00:00 +10:00
+date: 2009-08-18 00:00:00 +10:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -134,6 +134,7 @@ files:
 - lib/sh_playlist.rb
 - lib/sh_song.rb
 - lib/sh_artist.rb
+- lib/sh_plugin.rb
 - lib/sh_cover_art.rb
 - lib/sh_tagreader.rb
 - lib/sh_lyrics.rb
@@ -141,10 +142,14 @@ files:
 - lib/sh_util.rb
 - lib/sh_mmkeys.rb
 - lib/shroom-res
+- lib/shroom-res/cover_unavailable.png
 - lib/shroom-res/icon_16x16.png
+- lib/shroom-res/plugins
+- lib/shroom-res/plugins/lastfm_scrobbler.rb
 - lib/shroom-res/icon.svg
 - lib/shroom-res/icon_128x128.png
 - lib/shroom-res/shroom.glade
+- lib/shroom-res/cover_unavailable.svg
 - lib/sh_player.rb
 - lib/sh_view.rb
 has_rdoc: true