Merge pull request #6 from maddox/network-logos

Network Logos

.gitignore

@@ -16,3 +16,6 @@ vendor/bundle
 .DS_Store
 log
 config/favorite_channels.json
+app/public/logos/*png
+app/public/logos/*gif
+app/public/logos/*jpg

README.md

@@ -134,6 +134,22 @@ The port that the server will run on.
 ##### `hd_start`
 The start channel of your HD channels. Most providers start all of their HD channels at a certain number. Providing this number will let you browse JUST your HD channels.
 
+### Network Logos
+
+Wallop supports the serving of Network Logos if you configure your channels to use them. Within the `config.toml` file, you can map your channels to images. Just map the channel number to a file name and place those files into `/app/public/logos`. Wallop will send the logo urls along in its JSON response to services talking to it.
+
+```
+[channel_logos]
+506 = "cbs.png"
+508 = "abc.png"
+511 = "fox.png"
+512 = "nbc.png"
+```
+
+you can see that `cbs.png` corresponds to:
+
+![](/app/public/logos/cbs.png)
+
 ## Logs
 
 Logs are written out to the `log` directory.

app/app.rb

@@ -11,6 +11,7 @@ class App < Sinatra::Base
       end
 
       before do
+        Wallop.request_host = request.host
         content_type :json
       end
 

config/config.toml

@@ -3,3 +3,9 @@ ffmpeg_path = "/usr/local/bin/ffmpeg"
 transcoding_path = "./tmp"
 port = "8888"
 hd_start = 500
+
+[channel_logos]
+506 = "cbs.png"
+508 = "abc.png"
+511 = "fox.png"
+512 = "nbc.png"

docs/README.md

@@ -21,7 +21,8 @@ Wallop will return your available channels as well as keep track of your favorit
 ``` json
 {
 "GuideNumber":"570",
-"GuideName":"ESPN HD"
+"GuideName":"ESPN HD",
+"LogoUrl":"http://192.168.1.23:888/logos/cbs.png"
 }
 ```
 

lib/wallop.rb

@@ -5,6 +5,18 @@ module Wallop
   OLD_LOG_PATH = 'log/wallop.old.log'
   FAVORITE_CHANNELS_PATH = 'config/favorite_channels.json'
 
+  def self.request_host
+    @request_host
+  end
+
+  def self.request_host=(host)
+    @request_host = host
+  end
+
+  def self.request_url
+    "http://#{request_host}:8888"
+  end
+
   def self.logger
     @logger ||= Logger.new(LOG_PATH)
   end
@@ -86,7 +98,14 @@ def self.hdhomerun_lineup_url
   end
 
   def self.lineup
-    JSON.parse(open(hdhomerun_lineup_url).read)
+    lineup = JSON.parse(open(hdhomerun_lineup_url).read)
+    lineup.each do |l|
+      if config['channel_logos'][l['GuideNumber']]
+        l['LogoUrl'] = "#{request_url}/logos/#{config['channel_logos'][l['GuideNumber']]}"
+      else
+        l['LogoUrl'] = nil
+      end
+    end
   end
 
   def self.hd_lineup