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

Use .show instead of extra preview function

Browse Source
This commit is contained in:
Ace
2024-09-21 00:21:55 +02:00
parent b91d5ff62a
commit a3f4a18654
12 changed files with 14 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
inkycal/modules/inky_image.py
View File

@@ -71,22 +71,6 @@ class Inkyimage:
self.image = None self.image = None
logger.info("cleared previous image") 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): def _image_loaded(self):
"""returns True if image was loaded""" """returns True if image was loaded"""
if self.image: 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 inkycal.modules.inky_image import Inkyimage
from tests import Config from tests import Config
preview = Inkyimage.preview
merge = Inkyimage.merge merge = Inkyimage.merge
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -72,4 +71,4 @@ class TestAgenda(unittest.TestCase):
im_black, im_colour = module.generate_image() im_black, im_colour = module.generate_image()
logger.info('OK') logger.info('OK')
if Config.USE_PREVIEW: 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 inkycal.modules.inky_image import Inkyimage
from tests import Config from tests import Config
preview = Inkyimage.preview
merge = Inkyimage.merge merge = Inkyimage.merge
sample_url = Config.SAMPLE_ICAL_URL sample_url = Config.SAMPLE_ICAL_URL
@@ -77,4 +76,4 @@ class TestCalendar(unittest.TestCase):
im_black, im_colour = module.generate_image() im_black, im_colour = module.generate_image()
print('OK') print('OK')
if Config.USE_PREVIEW: 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 inkycal.modules.inky_image import Inkyimage
from tests import Config from tests import Config
preview = Inkyimage.preview
merge = Inkyimage.merge merge = Inkyimage.merge
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -53,5 +52,5 @@ class TestFeeds(unittest.TestCase):
im_black, im_colour = module.generate_image() im_black, im_colour = module.generate_image()
logger.info('OK') logger.info('OK')
if Config.USE_PREVIEW: 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 inkycal.modules.inky_image import Inkyimage
from tests import Config from tests import Config
preview = Inkyimage.preview
merge = Inkyimage.merge merge = Inkyimage.merge
url ="https://raw.githubusercontent.com/aceinnolab/Inkycal/assets/tests/Inkycal_cover.png" 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() im_black, im_colour = module.generate_image()
logger.info('OK') logger.info('OK')
if Config.USE_PREVIEW: 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 inkycal.modules.inky_image import Inkyimage
from tests import Config from tests import Config
preview = Inkyimage.preview
merge = Inkyimage.merge merge = Inkyimage.merge
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -57,4 +56,4 @@ class TestJokes(unittest.TestCase):
im_black, im_colour = module.generate_image() im_black, im_colour = module.generate_image()
logger.info('OK') logger.info('OK')
if Config.USE_PREVIEW: 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 inkycal.modules.inky_image import Inkyimage
from tests import Config from tests import Config
preview = Inkyimage.preview
merge = Inkyimage.merge merge = Inkyimage.merge
if not os.path.exists("tmp"): if not os.path.exists("tmp"):
@@ -144,21 +143,21 @@ class TestSlideshow(unittest.TestCase):
im_black, im_colour = module.generate_image() im_black, im_colour = module.generate_image()
logger.info('OK') logger.info('OK')
if Config.USE_PREVIEW: if Config.USE_PREVIEW:
preview(merge(im_black, im_colour)) merge(im_black, im_colour).show()
def test_switch_to_next_image(self): def test_switch_to_next_image(self):
logger.info(f'testing switching to next images..') logger.info(f'testing switching to next images..')
module = Slideshow(tests[0]) module = Slideshow(tests[0])
im_black, im_colour = module.generate_image() im_black, im_colour = module.generate_image()
if Config.USE_PREVIEW: if Config.USE_PREVIEW:
preview(merge(im_black, im_colour)) merge(im_black, im_colour).show()
im_black, im_colour = module.generate_image() im_black, im_colour = module.generate_image()
if Config.USE_PREVIEW: if Config.USE_PREVIEW:
preview(merge(im_black, im_colour)) merge(im_black, im_colour).show()
im_black, im_colour = module.generate_image() im_black, im_colour = module.generate_image()
if Config.USE_PREVIEW: if Config.USE_PREVIEW:
preview(merge(im_black, im_colour)) merge(im_black, im_colour).show()
logger.info('OK') 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 inkycal.modules.inky_image import Inkyimage
from tests import Config from tests import Config
preview = Inkyimage.preview
merge = Inkyimage.merge merge = Inkyimage.merge
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -100,7 +99,7 @@ class TestTextToDisplay(unittest.TestCase):
im_black, im_colour = module.generate_image() im_black, im_colour = module.generate_image()
logger.info('OK') logger.info('OK')
if Config.USE_PREVIEW: if Config.USE_PREVIEW:
preview(merge(im_black, im_colour)) merge(im_black, im_colour).show()
def tearDown(self): def tearDown(self):
if os.path.exists(self.temp_path): 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 inkycal.modules.inky_image import Inkyimage
from tests import Config from tests import Config
preview = Inkyimage.preview
merge = Inkyimage.merge merge = Inkyimage.merge
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -69,4 +68,4 @@ class TestTindie(unittest.TestCase):
im_black, im_colour = module.generate_image() im_black, im_colour = module.generate_image()
logger.info('OK') logger.info('OK')
if Config.USE_PREVIEW: 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 inkycal.modules.inky_image import Inkyimage
from tests import Config from tests import Config
preview = Inkyimage.preview
merge = Inkyimage.merge merge = Inkyimage.merge
api_key = Config.TODOIST_API_KEY api_key = Config.TODOIST_API_KEY
@@ -42,6 +42,6 @@ class TestTodoist(unittest.TestCase):
im_black, im_colour = module.generate_image() im_black, im_colour = module.generate_image()
print('OK') print('OK')
if Config.USE_PREVIEW: if Config.USE_PREVIEW:
preview(merge(im_black, im_colour)) merge(im_black, im_colour).show()
else: else:
print('No api key given, omitting test') 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 inkycal.modules.inky_image import Inkyimage
from tests import Config from tests import Config
preview = Inkyimage.preview
merge = Inkyimage.merge merge = Inkyimage.merge
owm_api_key = Config.OPENWEATHERMAP_API_KEY 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__) logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
preview = Inkyimage.preview
merge = Inkyimage.merge merge = Inkyimage.merge
tests = [ tests = [
@@ -70,5 +69,5 @@ class TestWebshot(unittest.TestCase):
module = Webshot(test) module = Webshot(test)
im_black, im_colour = module.generate_image() im_black, im_colour = module.generate_image()
if Config.USE_PREVIEW: if Config.USE_PREVIEW:
preview(merge(im_black, im_colour)) merge(im_black, im_colour).show()
logger.info('OK') logger.info('OK')