diff --git a/inkycal/modules/inky_image.py b/inkycal/modules/inky_image.py index 5795f0e..7d0bd57 100755 --- a/inkycal/modules/inky_image.py +++ b/inkycal/modules/inky_image.py @@ -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: diff --git a/tests/test_inkycal_agenda.py b/tests/test_inkycal_agenda.py index 685bb86..8758fd2 100755 --- a/tests/test_inkycal_agenda.py +++ b/tests/test_inkycal_agenda.py @@ -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() diff --git a/tests/test_inkycal_calendar.py b/tests/test_inkycal_calendar.py index 434d5d8..7d62beb 100755 --- a/tests/test_inkycal_calendar.py +++ b/tests/test_inkycal_calendar.py @@ -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() diff --git a/tests/test_inkycal_feeds.py b/tests/test_inkycal_feeds.py index ccf4481..f88435e 100755 --- a/tests/test_inkycal_feeds.py +++ b/tests/test_inkycal_feeds.py @@ -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() diff --git a/tests/test_inkycal_image.py b/tests/test_inkycal_image.py index 9e72b09..1c6c80b 100755 --- a/tests/test_inkycal_image.py +++ b/tests/test_inkycal_image.py @@ -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() diff --git a/tests/test_inkycal_jokes.py b/tests/test_inkycal_jokes.py index a4455ef..790e107 100755 --- a/tests/test_inkycal_jokes.py +++ b/tests/test_inkycal_jokes.py @@ -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() diff --git a/tests/test_inkycal_slideshow.py b/tests/test_inkycal_slideshow.py index 9c811b9..ee6a7b9 100755 --- a/tests/test_inkycal_slideshow.py +++ b/tests/test_inkycal_slideshow.py @@ -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') diff --git a/tests/test_inkycal_textfile_to_display.py b/tests/test_inkycal_textfile_to_display.py index 7c99f8e..0545809 100644 --- a/tests/test_inkycal_textfile_to_display.py +++ b/tests/test_inkycal_textfile_to_display.py @@ -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): diff --git a/tests/test_inkycal_tindie.py b/tests/test_inkycal_tindie.py index ff9389c..f2e3eaf 100755 --- a/tests/test_inkycal_tindie.py +++ b/tests/test_inkycal_tindie.py @@ -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() diff --git a/tests/test_inkycal_todoist.py b/tests/test_inkycal_todoist.py index 44c3041..ac208ce 100644 --- a/tests/test_inkycal_todoist.py +++ b/tests/test_inkycal_todoist.py @@ -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') diff --git a/tests/test_inkycal_weather.py b/tests/test_inkycal_weather.py index dce3297..d512d88 100755 --- a/tests/test_inkycal_weather.py +++ b/tests/test_inkycal_weather.py @@ -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 diff --git a/tests/test_inkycal_webshot.py b/tests/test_inkycal_webshot.py index 073a437..a75c603 100755 --- a/tests/test_inkycal_webshot.py +++ b/tests/test_inkycal_webshot.py @@ -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')