iicd/Inkycal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Feature/#378
This commit is contained in:
Ace
2024-09-22 18:50:19 +02:00
committed by GitHub
parent 0361d725f1 a3f4a18654
commit 04d122bb35
13 changed files with 20 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
inkycal/main.py
View File

@@ -345,8 +345,12 @@ class Inkycal:
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()

16
inkycal/modules/inky_image.py
View File

@@ -71,22 +71,6 @@ class Inkyimage:
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:

3
tests/test_inkycal_agenda.py
View File

@@ -8,7 +8,6 @@ from inkycal.modules import Agenda
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 @@ class TestAgenda(unittest.TestCase):
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()

3
tests/test_inkycal_calendar.py
View File

@@ -8,7 +8,6 @@ from inkycal.modules import Calendar
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 @@ class TestCalendar(unittest.TestCase):
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()

3
tests/test_inkycal_feeds.py
View File

@@ -7,7 +7,6 @@ from inkycal.modules import Feeds
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 @@ class TestFeeds(unittest.TestCase):
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()

3
tests/test_inkycal_image.py
View File

@@ -11,7 +11,6 @@ from inkycal.modules import Inkyimage as Module
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 @@ class TestInkyImage(unittest.TestCase):
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()

3
tests/test_inkycal_jokes.py
View File

@@ -8,7 +8,6 @@ from inkycal.modules import Jokes
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 @@ class TestJokes(unittest.TestCase):
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()

9
tests/test_inkycal_slideshow.py
View File

@@ -12,7 +12,6 @@ from inkycal.modules import Slideshow
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 @@ class TestSlideshow(unittest.TestCase):
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')

3
tests/test_inkycal_textfile_to_display.py
View File

@@ -10,7 +10,6 @@ from inkycal.modules import TextToDisplay
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 @@ class TestTextToDisplay(unittest.TestCase):
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):

3
tests/test_inkycal_tindie.py
View File

@@ -8,7 +8,6 @@ from inkycal.modules import Tindie
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 @@ class TestTindie(unittest.TestCase):
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()

4
tests/test_inkycal_todoist.py
View File

@@ -8,7 +8,7 @@ from inkycal.modules import Todoist
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 @@ class TestTodoist(unittest.TestCase):
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')

1
tests/test_inkycal_weather.py
View File

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

3
tests/test_inkycal_webshot.py
View File

@@ -12,7 +12,6 @@ from tests import Config
logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.DEBUG)
preview = Inkyimage.preview
merge = Inkyimage.merge
tests = [
@@ -70,5 +69,5 @@ class TestWebshot(unittest.TestCase):
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')