Merge remote-tracking branch 'prism/master'

6 files changed, 97 insertions, 7 deletions

diff --git a/makefu/2configs/ham/androidtv/adbshell.nix b/makefu/2configs/ham/androidtv/adbshell.nix
index f5b96c859..0fadeeb05 100644
--- a/makefu/2configs/ham/androidtv/adbshell.nix
+++ b/makefu/2configs/ham/androidtv/adbshell.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "adb_shell";
-  version = "0.0.8";
+  version = "0.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01f9jinhfyjldg9793gz2i7gcd9xyx0a62r7a5ijssklcnn2rwnm";
+    sha256 = "0a4mjrnw2lrhsakb1vjb5l6m3cr1ii7fibs7020nwv08cyx6pq6q";
   };
 
   propagatedBuildInputs = [
diff --git a/makefu/2configs/ham/androidtv/default.nix b/makefu/2configs/ham/androidtv/default.nix
index 8f3bdc1f3..9899b2dd3 100644
--- a/makefu/2configs/ham/androidtv/default.nix
+++ b/makefu/2configs/ham/androidtv/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "androidtv";
-  version = "0.0.34";
+  version = "0.0.39";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "13078i2a9hglpv4ldycph5n5485np21vs6z2qn830hybmx8kfxsw";
+    sha256 = "06lrjj74g2f3pkhsn3c8h13mkykgqqf4g9q6x5yv23z6ghjnk2dz";
   };
 
   propagatedBuildInputs = [
diff --git a/makefu/2configs/ham/androidtv/purepythonadb.nix b/makefu/2configs/ham/androidtv/purepythonadb.nix
index d4e763b70..c9b1ff5e8 100644
--- a/makefu/2configs/ham/androidtv/purepythonadb.nix
+++ b/makefu/2configs/ham/androidtv/purepythonadb.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "pure-python-adb";
-  version = "0.2.3.dev0";
+  version = "0.2.2.dev0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "88e5a4578435197799aa368fb1a5d87fe43e02a888cb7e85c2ad66173b383c89";
+    sha256 = "1xigv6c8xyb4g852nr3smz0137rnp81jvlikza071y7rc6pdzwza";
   };
 
   meta = with lib; {
@@ -18,4 +18,4 @@ buildPythonPackage rec {
     license = licenses.mit;
     # maintainers = [ maintainers. ];
   };
-}
\ No newline at end of file
+}
diff --git a/makefu/2configs/ham/default.nix b/makefu/2configs/ham/default.nix
index 53723299c..2db4ad4de 100644
--- a/makefu/2configs/ham/default.nix
+++ b/makefu/2configs/ham/default.nix
@@ -14,6 +14,7 @@ let
   #flurlicht = import ./multi/flurlicht.nix;
   kurzzeitwecker = import ./multi/kurzzeitwecker.nix;
   firetv_restart = import ./multi/firetv_restart.nix;
+  the_playlist = import ./multi/the_playlist.nix;
 #   switch
 #   automation
 #   binary_sensor
@@ -34,6 +35,7 @@ in {
       ];
     };
     config = {
+      config = {};
       input_select = zigbee.input_select; # dict
       timer = zigbee.timer // kurzzeitwecker.timer; # dict
       homeassistant = {
@@ -49,6 +51,8 @@ in {
       logger = {
         default = "info";
       };
+      rest_command = {}
+      // the_playlist.rest_command;
       tts = [
         { platform = "google_translate";
           language = "de";
@@ -131,6 +135,7 @@ in {
         # https://www.home-assistant.io/cookbook/automation_for_rainy_days/
       ]
       ++ ((import ./sensor/outside.nix) {inherit lib;})
+      ++ the_playlist.sensor
       ++ zigbee.sensor ;
       frontend = { };
       # light = flurlicht.light;
@@ -140,6 +145,7 @@ in {
         ++ (import ./automation/firetv_restart.nix)
         ++ kurzzeitwecker.automation
         #++ flurlicht.automation
+        ++ the_playlist.automation
         ++ zigbee.automation;
         script =
         { }
diff --git a/makefu/2configs/ham/multi/the_playlist.nix b/makefu/2configs/ham/multi/the_playlist.nix
new file mode 100644
index 000000000..ad090938c
--- /dev/null
+++ b/makefu/2configs/ham/multi/the_playlist.nix
@@ -0,0 +1,83 @@
+# Inputs:
+#  binary_sensor.playlist_button_good
+#  binary_sensor.playlist_button_bad
+
+# outputs
+#  rest_command
+#  automation
+#  sensor
+{
+  rest_command = {
+    good_song = {
+      url = "http://prism.r:8001/good";
+      method = "POST";
+    };
+    bad_song = {
+      url = "http://prism.r:8001/skip";
+      method = "POST";
+    };
+  };
+  automation = [
+    {
+      alias = "playlist song publish";
+      trigger = {
+        #platform = "event";
+        #event_data.entity_id = "sensor.the_playlist_song";
+        platform = "state";
+        entity_id = "sensor.the_playlist_song";
+      };
+      action = {
+        service = "mqtt.publish";
+        data = {
+          topic = "/ham/the_playlist/song";
+          payload_template = "{{ states.sensor.the_playlist_song.state }}";
+        };
+      };
+    }
+    {
+      alias = "playlist upvote on button";
+      trigger = {
+        platform = "state";
+        entity_id = "binary_sensor.playlist_button_good";
+        from = "off";
+        to = "on";
+      };
+      action.service = "rest_command.good_song";
+    }
+    {
+      alias = "playlist downvote on button";
+      trigger = {
+        platform = "state";
+        entity_id = "binary_sensor.playlist_button_bad";
+        from = "off";
+        to = "on";
+      };
+      action.service = "rest_command.bad_song";
+    }
+  ];
+  sensor =  [
+    { platform = "rest";
+      name = "pl";
+      resource = "http://prism.r:8001/current";
+      scan_interval = 30;
+      value_template = "1";
+      json_attributes = [ "name" "filename" "youtube" ];
+    }
+    { platform = "template";
+      sensors = {
+        the_playlist_song = {
+          friendly_name = "Current Song";
+          value_template = ''{{ states.sensor.pl.attributes['name'] }}'';
+        };
+        the_playlist_url = {
+          friendly_name = "Song Youtube URL";
+          value_template = ''{{ states.sensor.pl.attributes['youtube'] }}'';
+        };
+        the_playlist_filename = {
+          friendly_name = "Song Filename";
+          value_template = ''{{ states.sensor.pl.attributes['filename'] }}'';
+        };
+      };
+    }
+  ];
+}
diff --git a/makefu/2configs/ham/zigbee2mqtt/default.nix b/makefu/2configs/ham/zigbee2mqtt/default.nix
index 7c55326f9..84d32c872 100644
--- a/makefu/2configs/ham/zigbee2mqtt/default.nix
+++ b/makefu/2configs/ham/zigbee2mqtt/default.nix
@@ -17,4 +17,5 @@
     volumes = ["/var/lib/zigbee2mqtt:/app/data"];
   };
   state = [ "/var/lib/zigbee2mqtt/configuration.yaml" "/var/lib/zigbee2mqtt/state.json" ];
+  systemd.services.docker-zigbee2mqtt.after = [ "home-assistant.service" "docker.service" "network-online.target" ];
 }