douban_fm_hotkey 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ea50a236e70efc8eadc2521d0d4b71dfc7958aa
-  data.tar.gz: 89d8172e0e38078b13fb6ed39453f7dbb5fce28d
+  metadata.gz: d948984d0443ce13dc2b7e3ab74dceaf2cdad183
+  data.tar.gz: 5afbee5ee50c18eb1d04e2945b5d41b926c5e7c4
 SHA512:
-  metadata.gz: 123341314c1668ff2c92edf3e7608f4379727d08ef22aeda1173da6be0e235312a389b88c8a0392a4ae4a664cc9751d53545dabf8e53beb94e707a1a0249a86c
-  data.tar.gz: 70de7fe52097fb0854298c1b8c1d97eebf8203960e78f4365ff100a19268f8f0b3b870d83b146b338ce56a6fad566033e5fea43f8ca0235c8834861cecbb6268
+  metadata.gz: bd4003f2878db1f770bdecacfe12b0f3d0f3e2cffc1355ce2d118182b2d567a0a7be4c78be1045feae381366b87d8d6a01b6182b2dbea7664a44bf57b0df9e8e
+  data.tar.gz: 59615351cea6d2281c98b68869d66f604f8fb660b239ff1e3a16f149691f1bb95803fae853c205c1d7915e38f6f5b1c5d75eaac429c33e209c5bfbcd71f1d866

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    douban_fm_hotkey (1.0.2)
+    douban_fm_hotkey (1.1.0)
       faye
       sinatra
       thin

data/lib/douban_fm_hotkey/server/public/client.js

@@ -0,0 +1,100 @@
+(function() {
+
+  var client = new Faye.Client('http://localhost:1988/faye');
+
+  client.subscribe('/hotkey', function(msg) {
+    var songInfo = getSongInfo();
+    if (msg.cmd == 'info') {
+      sendNotification(songInfo.song.coverUrl, songInfo.song.artistName, songInfo.song.songName);
+    } else {
+      window.DBR.act(msg.cmd);
+      if (msg.cmd == 'pause' || msg.cmd == 'love') {
+        publishSongInfo(songInfo);
+        if (msg.cmd == 'love') {
+          var img;
+          if (window.DBR.selected_like()) {
+            img = 'like.png'
+          } else {
+            img = 'unlike.png'
+          }
+          sendNotification('http://localhost:1988/' + img, songInfo.song.artistName, songInfo.song.songName);
+        }
+      }
+    }
+  });
+
+  client.subscribe('/get_info', function() {
+    publishSongInfo(getSongInfo());
+  });
+
+  var interval = window.setInterval(function() {
+    if (window.extStatusHandler) {
+      clearInterval(interval);
+      var originExtStatusHandler = window.extStatusHandler;
+      window.extStatusHandler = function(info) {
+        var parsedInfo = $.parseJSON(info);
+        if (parsedInfo.type == 'start') {
+          var songInfo = {
+            song: {
+              artistName: parsedInfo.song.artist,
+              channelName: getChannelName(parsedInfo.channel),
+              coverUrl: parsedInfo.song.picture,
+              songName: parsedInfo.song.title
+            },
+            radio: {
+              is_paused: false,
+              selected_like: parsedInfo.song.like
+            }
+          };
+          publishSongInfo(songInfo);
+          sendNotification(songInfo.song.coverUrl, songInfo.song.artistName, songInfo.song.songName);
+        }
+        originExtStatusHandler(info);
+      };
+    }
+  }, 100);
+
+  var getSongInfo = function() {
+    return {
+      song: window.FM.getCurrentSongInfo(),
+      radio: {
+        is_paused: window.DBR.is_paused(),
+        selected_like: window.DBR.selected_like()
+      }
+    };
+  };
+
+  var sendNotification = function(image, title, content) {
+    if (window.webkitNotifications.checkPermission() == 0) {
+      var notification = window.webkitNotifications.createNotification(
+        image, title, content
+      );
+      notification.onshow = function() {
+        setTimeout(function() {
+          notification.close()
+        }, 5000);
+      };
+      notification.show();
+    } else {
+      window.webkitNotifications.requestPermission();
+    }
+  };
+
+  var publishSongInfo = function(info) {
+    client.publish('/info', info);
+  };
+
+  var getChannelName = function(id) {
+    id = parseInt(id, 10);
+    if (id === 0 || id === -9) {
+      return "私人兆赫"
+    } else {
+      if (id === -3 || id === -8) {
+        return "红心兆赫"
+      } else {
+        return $("#fm-channel-list .channel[cid=" + id + "] .chl_name").first().text()
+      }
+    }
+  }
+
+})();

data/lib/douban_fm_hotkey/server/public/{app.js → server.js}

@@ -2,7 +2,7 @@ $(function() {
 
   var client = new Faye.Client('/faye');
 
-  client.subscribe('/state', function(message) {
+  client.subscribe('/info', function(message) {
     console.log(message);
     $pause_button = $('button.pause');
     $love_button = $('button.love');
@@ -22,7 +22,7 @@ $(function() {
     $('#song-name').html('歌名: ' + message.song.songName);
   });
 
-  client.publish('/get_state', {ping: 1});
+  client.publish('/get_info', { get: 1 });
 
   $buttons = $('button');
   $buttons.click(function() {

data/lib/douban_fm_hotkey/server/views/layout.erb

@@ -5,7 +5,7 @@
   <title>Douban FM Hotkey</title>
   <script type="text/javascript" src="faye.js"></script>
   <script type="text/javascript" src="jquery.js"></script>
-  <script type="text/javascript" src="app.js"></script>
+  <script type="text/javascript" src="server.js"></script>
   <link rel="stylesheet" href="style.css" />
 </head>
 <body>

data/lib/douban_fm_hotkey/server.rb

@@ -34,7 +34,7 @@ module DoubanFMHotkey
       erb :index
     end
 
-    %w{skip pause love ban}.each do |cmd|
+    %w{skip pause love ban info}.each do |cmd|
       get "/#{cmd}" do
         @client.publish('/hotkey', {cmd: cmd})
       end

data/lib/douban_fm_hotkey/version.rb

@@ -1,3 +1,3 @@
 module DoubanFMHotkey
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: douban_fm_hotkey
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Wei Zhu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye
@@ -95,9 +95,12 @@ files:
 - bin/douban_fm_hotkey
 - douban_fm_hotkey.gemspec
 - lib/douban_fm_hotkey/server.rb
-- lib/douban_fm_hotkey/server/public/app.js
+- lib/douban_fm_hotkey/server/public/client.js
 - lib/douban_fm_hotkey/server/public/jquery.js
+- lib/douban_fm_hotkey/server/public/like.png
+- lib/douban_fm_hotkey/server/public/server.js
 - lib/douban_fm_hotkey/server/public/style.css
+- lib/douban_fm_hotkey/server/public/unlike.png
 - lib/douban_fm_hotkey/server/views/index.erb
 - lib/douban_fm_hotkey/server/views/layout.erb
 - lib/douban_fm_hotkey/version.rb