Merge pull request #380 from aceinnolab/feature/#378

Feature/#378

inkycal/main.py

@@ -345,8 +345,12 @@ async def run(self, run_once=False):
                 logger.info("All images generated successfully!")
             del errors
 
-            if self.battery_capacity < 20:
-                self.info += "Low battery!  "
+            if self.use_pi_sugar:
+                self.battery_capacity = self.pisugar.get_battery() or 0
+                if self.battery_capacity < 20:
+                    self.info += f"Low battery! ({self.battery_capacity})% "
+                else:
+                    self.info += f"Battery: {self.battery_capacity}% "
 
             # Assemble image from each module - add info section if specified
             self._assemble()

inkycal/modules/inky_image.py

@@ -71,22 +71,6 @@ def clear(self):
             self.image = None
             logger.info("cleared previous image")
 
-    def _preview(self):
-        """Preview the image on gpicview (only works on Rapsbian with Desktop)"""
-        if self._image_loaded():
-            path = "/home/pi/Desktop/"
-            self.image.save(path + "temp.png")
-            os.system("gpicview " + path + "temp.png")
-            os.system("rm " + path + "temp.png")
-
-    @staticmethod
-    def preview(image):
-        """Previews an image on gpicview (only works on Rapsbian with Desktop)."""
-        path = "~/temp"
-        image.save(path + "/temp.png")
-        os.system("gpicview " + path + "/temp.png")
-        os.system("rm " + path + "/temp.png")
-
     def _image_loaded(self):
         """returns True if image was loaded"""
         if self.image:

tests/test_inkycal_agenda.py

@@ -8,7 +8,6 @@
 from inkycal.modules.inky_image import Inkyimage
 from tests import Config
 
-preview = Inkyimage.preview
 merge = Inkyimage.merge
 
 logger = logging.getLogger(__name__)
@@ -72,4 +71,4 @@ def test_generate_image(self):
             im_black, im_colour = module.generate_image()
             logger.info('OK')
             if Config.USE_PREVIEW:
-                preview(merge(im_black, im_colour))
+                merge(im_black, im_colour).show()

tests/test_inkycal_calendar.py

@@ -8,7 +8,6 @@
 from inkycal.modules.inky_image import Inkyimage
 from tests import Config
 
-preview = Inkyimage.preview
 merge = Inkyimage.merge
 
 sample_url = Config.SAMPLE_ICAL_URL
@@ -77,4 +76,4 @@ def test_generate_image(self):
             im_black, im_colour = module.generate_image()
             print('OK')
             if Config.USE_PREVIEW:
-                preview(merge(im_black, im_colour))
+                merge(im_black, im_colour).show()

tests/test_inkycal_feeds.py

@@ -7,7 +7,6 @@
 from inkycal.modules.inky_image import Inkyimage
 from tests import Config
 
-preview = Inkyimage.preview
 merge = Inkyimage.merge
 
 logger = logging.getLogger(__name__)
@@ -53,5 +52,5 @@ def test_generate_image(self):
             im_black, im_colour = module.generate_image()
             logger.info('OK')
             if Config.USE_PREVIEW:
-                preview(merge(im_black, im_colour))
+                merge(im_black, im_colour).show()
 

tests/test_inkycal_image.py

@@ -11,7 +11,6 @@
 from inkycal.modules.inky_image import Inkyimage
 from tests import Config
 
-preview = Inkyimage.preview
 merge = Inkyimage.merge
 
 url ="https://raw.githubusercontent.com/aceinnolab/Inkycal/assets/tests/Inkycal_cover.png"
@@ -113,4 +112,4 @@ def test_generate_image(self):
             im_black, im_colour = module.generate_image()
             logger.info('OK')
             if Config.USE_PREVIEW:
-                preview(merge(im_black, im_colour))
+                merge(im_black, im_colour).show()

tests/test_inkycal_jokes.py

@@ -8,7 +8,6 @@
 from inkycal.modules.inky_image import Inkyimage
 from tests import Config
 
-preview = Inkyimage.preview
 merge = Inkyimage.merge
 
 logger = logging.getLogger(__name__)
@@ -57,4 +56,4 @@ def test_generate_image(self):
             im_black, im_colour = module.generate_image()
             logger.info('OK')
             if Config.USE_PREVIEW:
-                preview(merge(im_black, im_colour))
+                merge(im_black, im_colour).show()

tests/test_inkycal_slideshow.py

@@ -12,7 +12,6 @@
 from inkycal.modules.inky_image import Inkyimage
 from tests import Config
 
-preview = Inkyimage.preview
 merge = Inkyimage.merge
 
 if not os.path.exists("tmp"):
@@ -144,21 +143,21 @@ def test_generate_image(self):
             im_black, im_colour = module.generate_image()
             logger.info('OK')
             if Config.USE_PREVIEW:
-                preview(merge(im_black, im_colour))
+                merge(im_black, im_colour).show()
 
     def test_switch_to_next_image(self):
         logger.info(f'testing switching to next images..')
         module = Slideshow(tests[0])
         im_black, im_colour = module.generate_image()
         if Config.USE_PREVIEW:
-            preview(merge(im_black, im_colour))
+            merge(im_black, im_colour).show()
 
         im_black, im_colour = module.generate_image()
         if Config.USE_PREVIEW:
-            preview(merge(im_black, im_colour))
+            merge(im_black, im_colour).show()
 
         im_black, im_colour = module.generate_image()
         if Config.USE_PREVIEW:
-            preview(merge(im_black, im_colour))
+            merge(im_black, im_colour).show()
 
         logger.info('OK')

tests/test_inkycal_textfile_to_display.py

@@ -10,7 +10,6 @@
 from inkycal.modules.inky_image import Inkyimage
 from tests import Config
 
-preview = Inkyimage.preview
 merge = Inkyimage.merge
 
 logger = logging.getLogger(__name__)
@@ -100,7 +99,7 @@ def test_generate_image(self):
             im_black, im_colour = module.generate_image()
             logger.info('OK')
             if Config.USE_PREVIEW:
-                preview(merge(im_black, im_colour))
+                merge(im_black, im_colour).show()
 
     def tearDown(self):
         if os.path.exists(self.temp_path):

tests/test_inkycal_tindie.py

@@ -8,7 +8,6 @@
 from inkycal.modules.inky_image import Inkyimage
 from tests import Config
 
-preview = Inkyimage.preview
 merge = Inkyimage.merge
 
 logger = logging.getLogger(__name__)
@@ -69,4 +68,4 @@ def test_generate_image(self):
             im_black, im_colour = module.generate_image()
             logger.info('OK')
             if Config.USE_PREVIEW:
-                preview(merge(im_black, im_colour))
+                merge(im_black, im_colour).show()

tests/test_inkycal_todoist.py

@@ -8,7 +8,7 @@
 
 from inkycal.modules.inky_image import Inkyimage
 from tests import Config
-preview = Inkyimage.preview
+
 merge = Inkyimage.merge
 
 api_key = Config.TODOIST_API_KEY
@@ -42,6 +42,6 @@ def test_generate_image(self):
                 im_black, im_colour = module.generate_image()
                 print('OK')
                 if Config.USE_PREVIEW:
-                    preview(merge(im_black, im_colour))
+                    merge(im_black, im_colour).show()
         else:
             print('No api key given, omitting test')

tests/test_inkycal_weather.py

@@ -8,7 +8,6 @@
 from inkycal.modules.inky_image import Inkyimage
 from tests import Config
 
-preview = Inkyimage.preview
 merge = Inkyimage.merge
 
 owm_api_key = Config.OPENWEATHERMAP_API_KEY

tests/test_inkycal_webshot.py

@@ -12,7 +12,6 @@
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.DEBUG)
 
-preview = Inkyimage.preview
 merge = Inkyimage.merge
 
 tests = [
@@ -70,5 +69,5 @@ def test_generate_image(self):
             module = Webshot(test)
             im_black, im_colour = module.generate_image()
             if Config.USE_PREVIEW:
-                preview(merge(im_black, im_colour))
+                merge(im_black, im_colour).show()
             logger.info('OK')