somadic 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd60324d1c5fe7d3a5c68e875726425dd502bfeb
-  data.tar.gz: 01443ef9a424ca6ab52d99672b1b72413b977989
+  metadata.gz: ca4d0b5f1262c05f4c93871065843f3a08b16da5
+  data.tar.gz: dd8035445c3828512c2acfe0a80faf62e68020d7
 SHA512:
-  metadata.gz: 10dcd6dc6e4ea32ef9b3f21292781c54be5f50918db340b6fd76c5b8c73e920c98dda4ce65f8ad666313c099dacff05e3784f0568290281fd0a8b6b28e354d5d
-  data.tar.gz: 6de3b6f5669d335f936dabf10a4c28c7ec9f1ff1536777da20e8d6638a540ff9f08d24bce47e7fcc382807a4d10f33d94ace1827fa69e4e6946181941ac9ca35
+  metadata.gz: 824df614dc6f57756a05a79e1fc3e149e9e7ed78c14c2d852f81d1b517ebaac14e590b51f115a4b7d1715369df7b4316fa29b7bda4e7329e04d077196af75202
+  data.tar.gz: 3e1fb4eafd3569ed18942bc4c483041593209aa405df7c0da4cb6cae2f60452069515bf75b00a98f7f1bd59d43e44437ec105923b98dab15e3619ff830faf3c7

data/README.md

@@ -1,7 +1,7 @@
 # Somadic
 
-Somadic is a bare-bones terminal-based player for somafm.com and di.fm. It uses `mplayer` to
-do the heavy lifting.
+Somadic is a bare-bones terminal-based player for [somafm.com](http://somafm.com) and [di.fm](http://di.fm). 
+It uses `mplayer` to do the heavy lifting.
 
 ```
 $ somadic-curses di:breaks
@@ -17,17 +17,9 @@ $ somadic-curses di:breaks
 
 ## Installation
 
-Clone the repo:
-
-    $ git clone https://github.com/devshane/somadic.git
-
-Build the gem:
-
-    $ gem build somadic.gemspec
-
-Install the gem:
-
-    $ gem install somadic-0.0.1.gem
+```
+$ gem install somadic
+```
 
 ## Usage
 
@@ -58,6 +50,25 @@ s       - Search Google for the current track
 /       - Goto site:channel
 ```
 
+#### Presets
+
+You can create preset files rather than listing multiple channels on the command line. Create
+a YAML file in `~/.somadic/presets`, say `chill.yaml`, with the following content:
+
+```
+---
+- di:breaks
+- soma:secretagent
+- di:psychill
+- soma:lush
+```
+
+You can then start somadic with the preset's name:
+
+```
+$ somadic chill
+```
+
 #### Examples
 
 **Listen to breaks on DI**

data/lib/somadic/audio_addict.rb

@@ -6,8 +6,8 @@ module Somadic
     end
 
     def refresh_playlist
-      f = open(@url)
-      page = f.read
+      page = open(@url).read
+      Somadic::Logger.debug("page=#{page}")
       data = JSON.parse(page[page.index("(") + 1..-3])
 
       symbolized_data = []

data/lib/somadic/channel/di.rb

@@ -1,3 +1,5 @@
+require 'pp'
+
 module Somadic
   module Channel
     class DI < Somadic::BaseChannel
@@ -14,9 +16,7 @@ module Somadic
       # Overrides BaseChannel
       def find_channel(name)
         Somadic::Logger.debug("DI#find_channel(#{name})")
-        @channels.each do |c|
-          return c if c[:name] == name
-        end
+        @channels.each { |c| return c if c[:name] == name }
         nil
       end
 
@@ -24,6 +24,8 @@ module Somadic
       #
       # TODO: time isn't used, song isn't required
       def update(time, song)
+        return unless @channel
+
         @song = song if song
         aa = Somadic::AudioAddict.new(@channel[:id])
         songs = aa.refresh_playlist
@@ -66,16 +68,12 @@ module Somadic
         APICache.get('di_fm_channel_list', cache: ONE_DAY, timeout: API_TIMEOUT) do
           Somadic::Logger.debug('DI#load_channels')
           channels = []
-          f = open('http://www.di.fm')
-          page = f.read
-          chan_ids = page.scan(/data-channel-id="(\d+)"/).flatten
-          chans = page.scan(/data-tunein-url="http:\/\/www.di.fm\/(.*?)"/).flatten
-          zipped = chan_ids.zip(chans)
-          zipped.each do |z|
-            channels << {id: z[0], name: z[1]}
-          end
-          channels.sort_by! {|k, _| k[:name]}
-          channels.uniq! {|k, _| k[:name]}
+          page = open('http://www.di.fm').read
+          app_start = page.scan(/di\.app\.start\((.*?)\);/).flatten[0]
+          json = JSON.parse(app_start)
+          json['channels'].each { |c| channels << {id: c['id'], name: c['key']} }
+
+          channels
         end
       end
     end

data/lib/somadic/version.rb

@@ -1,3 +1,3 @@
 module Somadic
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: somadic
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Shane Thomas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mono_logger
@@ -218,3 +218,4 @@ test_files:
 - spec/lib/somadic/mplayer_spec.rb
 - spec/lib/somadic_spec.rb
 - spec/spec_helper.rb
+has_rdoc: