From 2001874ecb399416fe75691fac283e77bb0850d7 Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Fri, 3 Nov 2023 11:57:46 +0100
Subject: [PATCH] testing on rpi

---
 deploy/deploy.playbook.yml | 27 ++++++++++++++++++++++-----
 deploy/setup.playbook.yml  | 11 ++++++++---
 image_show.py              |  2 +-
 main.py                    | 15 ++++++++++-----
 4 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/deploy/deploy.playbook.yml b/deploy/deploy.playbook.yml
index 41c4ccd..bba8d1c 100644
--- a/deploy/deploy.playbook.yml
+++ b/deploy/deploy.playbook.yml
@@ -1,22 +1,37 @@
 - name: Basic setup tasks for Raspberry Pi
-  hosts: raspberrypi
-  become: true
+  hosts: all
+  user: remy
+  # become: true
+
   vars:
-    code_dest: /home/pi/eink
+    code_dest: /home/remy/eink
     service_target_dir: /etc/systemd/system/
 
   tasks:
     - name: Pull the latest version of the code
       git:
-        repo: https://git.kluster.moll.re/remoll/eink.git
+        repo: https://git.kluster.moll.re/remoll/rpi-eink-picture-frame
         dest: "{{ code_dest }}"
         version: main
+
+    - name: Install pillow dependencies
+      apt:
+        name:
+          - libjpeg-dev
+          - zlib1g
+        state: present
+      become: true
     
     - name: Install from the pipenv-file
       command: "pipenv install --system --deploy --categories=\"packages prod-packages\""
       args:
         chdir: "{{ code_dest }}"
 
+    - name: Copy keys python file
+      copy:
+        src: ../keys.py
+        dest: "{{ code_dest }}/keys.py"
+
     - name: Copy unit files
       template:
         src: ./templates/{{ item }}.j2
@@ -24,6 +39,7 @@
       loop:
         - eink-show.service
         - eink-show.timer
+      become: true
 
     - name: Enable units
       systemd:
@@ -33,4 +49,5 @@
         enabled: yes
       loop:
         - eink-show.service
-        - eink-show.timer      
\ No newline at end of file
+        - eink-show.timer
+      become: true
\ No newline at end of file
diff --git a/deploy/setup.playbook.yml b/deploy/setup.playbook.yml
index 37ac297..21d56ec 100644
--- a/deploy/setup.playbook.yml
+++ b/deploy/setup.playbook.yml
@@ -1,5 +1,6 @@
 - name: Basic setup tasks for Raspberry Pi
-  hosts: raspberrypi
+  hosts: all
+  user: remy
   become: true
 
   tasks:
@@ -19,13 +20,18 @@
       apt:
         name:
           - git
-          - python3-pipenv
+          - python3-pip
           - python3-dev
           - python3-setuptools
           - python3-rpi.gpio
           - python3-spidev
         state: present
 
+    - name: Pip install pipenv
+      pip:
+        name: pipenv
+        state: present
+
     - name: Enable SPI and I2C interfaces
       lineinfile:
         path: /boot/config.txt
@@ -38,7 +44,6 @@
 
     - name: Reboot the Raspberry Pi
       reboot:
-        delay: 5
         connect_timeout: 20
         reboot_timeout: 300
 
diff --git a/image_show.py b/image_show.py
index b7de130..5243616 100644
--- a/image_show.py
+++ b/image_show.py
@@ -27,7 +27,7 @@ class ImageShow:
 
         self.__init__()
         # possibly include a blank image to clear screen
-
+        print("Displaying image")
         self.epd.display(self.epd.getbuffer(image))
         self.epd.sleep()
         
diff --git a/main.py b/main.py
index eef5d0a..f2d4e51 100644
--- a/main.py
+++ b/main.py
@@ -1,12 +1,17 @@
 from image_convert import ImageShrink
 from image_get import ImageGetter
-# from image_show import ImageShow
-
+try:
+    from image_show import ImageShow
+except ImportError:
+    print("ImageShow not found. Image will not be displayed.")
+    show_image = False
+  
 get = ImageGetter()
 convert = ImageShrink()
-# show = ImageShow()
+if show_image:
+    show = ImageShow()
 
 image = get.get_random_image()
 image = convert.convert(image)
-
-# show.show_image(image)
\ No newline at end of file
+if show_image:
+    show.show_image(image) 
\ No newline at end of file