Merge pull request #30 from deckerego/gmusic_list_fix

Fix Google music dying every few days

README.md

@@ -21,7 +21,7 @@ I'm assuming that you are starting with the Raspian Minimal Linux distribution.
 1. Make sure your Raspberry Pi is up to date with the latest packages & firmware with `sudo apt-get update; sudo apt-get dist-upgrade`
 2. Enable I2C by executing `sudo raspi-config` as described in Adafruit's tutorial: https://learn.adafruit.com/adafruits-raspberry-pi-lesson-4-gpio-setup/configuring-i2c
 3. Add the necessary Python and GStreamer dependencies using the command: `sudo apt-get install wiringpi python-bottle python-requests python-oauth2client python-httplib2 python-setuptools python-pip python-dev python-dateutil python-smbus gstreamer0.10-x gstreamer-tools gstreamer0.10-plugins-base gstreamer0.10-plugins-good gstreamer0.10-plugins-bad gstreamer0.10-plugins-ugly python-gst0.10`
-4. Install hack-clock via `wget https://github.com/deckerego/hack-clock/releases/download/2.1.8/python-hackclock_2.1.8-1_all.deb; sudo dpkg -i python-hackclock_2.1.8-1_all.deb`
+4. Install hack-clock via `wget https://github.com/deckerego/hack-clock/releases/download/2.1.9/python-hackclock_2.1.9-1_all.deb; sudo dpkg -i python-hackclock_2.1.9-1_all.deb`
 5. Tweak `/etc/hack-clock.conf` and `/etc/default/hack-clock` to fit your needs (GPIO pins, correct weather station, etc.). A list of observed weather stations is available at http://forecast.weather.gov/stations.php
 6. Reboot your Pi to re-load modules and start the IDE web server
 

debian/changelog

@@ -1,5 +1,5 @@
-hackclock (2.1.8-1) stable; urgency=low
+hackclock (2.1.9-1) stable; urgency=low
 
-  * Filter out explicit songs from Google Music radio streams
+  * Don't re-use the same Google Music playlist
 
- -- DeckerEgo <[email protected]>  Tue, 01 Mar 2017 21:32:00 -0500
+ -- DeckerEgo <[email protected]>  Wed, 29 Mar 2017 21:47:00 -0500

package.sh

@@ -7,7 +7,7 @@ rm home/pi/hack-clock/backups/blocks_clock.*
 
 cd ..
 echo "Compressing file..."
-tar Jcf hackclock_2.1.8.orig.tar.xz hack-clock/
+tar Jcf hackclock_2.1.9.orig.tar.xz hack-clock/
 
 cd hack-clock
 dpkg-buildpackage -rfakeroot -uc -us

setup.py

@@ -27,7 +27,7 @@ def all_files(newroot, oldroot):
 
 setup(
     name='HackClock',
-    version='2.1.8',
+    version='2.1.9',
     description='A hackable alarm clock for the Raspberry Pi',
     author='DeckerEgo',
     author_email='[email protected]',

srv/hackclock/views/blocks/js/generators/audio.js

@@ -33,9 +33,8 @@ Blockly.Python['google_music_radio'] = function(block) {
   Blockly.Python.definitions_['import_speaker'] = 'from hackclock.runapp.Libs.GStreamer import Speaker';
   Blockly.Python.definitions_['import_googlemusic'] = 'from hackclock.runapp.Libs.GoogleMusic import AudioStream';
   Blockly.Python.definitions_['init_speaker'] = 'speaker = Speaker()';
-  Blockly.Python.definitions_['init_googlemusic'] = 'audio_stream = AudioStream()';
 
-  return ['audio_stream', Blockly.Python.ORDER_ATOMIC];
+  return ['AudioStream()', Blockly.Python.ORDER_ATOMIC];
 };
 
 Blockly.Python['play_list'] = function(block) {