diff --git a/.gitignore b/.gitignore index eab186f..ee4e20f 100644 --- a/.gitignore +++ b/.gitignore @@ -142,5 +142,5 @@ dmypy.json .pyre/ /ftp/ -# log files -*.log +# inkycal logs +*inkycal.log* diff --git a/docs/about.md b/docs/about.md index 2830be9..c114971 100644 --- a/docs/about.md +++ b/docs/about.md @@ -1,5 +1,5 @@ # About Inkycal - + Inkycal is a python3 software for selected E-Paper displays. It's open-source (non-commercially), fully modular, user friendly and even runs @@ -27,5 +27,5 @@ Open source means we work for nothing, but it doesn't mean we don't need anything. We invest a large amount of time, effort and coffee to develop Inkycal. -Please support Inkycal via a **[DONATION](https://www.paypal.me/SaadNaseer)** +Please support Inkycal via a **[DONATION](https://www.paypal.me/aceinnolab)** to help us keep this project alive. Thank You! diff --git a/docs/quickstart.md b/docs/quickstart.md index a591c59..24ceb75 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -1,5 +1,5 @@ # Quickstart - + ## Installing Inkycal diff --git a/inkycal/custom/functions.py b/inkycal/custom/functions.py index 84cb310..144da9f 100644 --- a/inkycal/custom/functions.py +++ b/inkycal/custom/functions.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 # -*- coding: utf-8 -*- """ -Inky-Calendar custom-functions for ease-of-use +Inkycal custom-functions for ease-of-use Copyright by aceisace """ diff --git a/inkycal/display/display.py b/inkycal/display/display.py index 04938f5..3575665 100644 --- a/inkycal/display/display.py +++ b/inkycal/display/display.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 # -*- coding: utf-8 -*- """ -Inky-Calendar epaper functions +Inkycal ePaper driving functions Copyright by aceisace """ from importlib import import_module diff --git a/inkycal/modules/__init__.py b/inkycal/modules/__init__.py old mode 100644 new mode 100755 index d97106e..00969b1 --- a/inkycal/modules/__init__.py +++ b/inkycal/modules/__init__.py @@ -6,5 +6,4 @@ from .inkycal_todoist import Todoist from .inkycal_image import Inkyimage from .inkycal_jokes import Jokes from .inkycal_stocks import Stocks -from .inkycal_slideshow import Slideshow -# from .inkycal_server import Inkyserver +from .inkycal_slideshow import Slideshow \ No newline at end of file diff --git a/inkycal/modules/dev_module.py b/inkycal/modules/dev_module.py old mode 100644 new mode 100755 diff --git a/inkycal/modules/ical_parser.py b/inkycal/modules/ical_parser.py old mode 100644 new mode 100755 index 8a6361d..5d92160 --- a/inkycal/modules/ical_parser.py +++ b/inkycal/modules/ical_parser.py @@ -1,7 +1,7 @@ #!python3 """ -iCalendar (parsing) module for Inky-Calendar Project +Inkycal iCalendar parsing module Copyright by aceisace """ import urllib diff --git a/inkycal/modules/inky_image.py b/inkycal/modules/inky_image.py old mode 100644 new mode 100755 index c78dff6..2135a30 --- a/inkycal/modules/inky_image.py +++ b/inkycal/modules/inky_image.py @@ -8,14 +8,12 @@ images. Copyright by aceisace """ +import logging +import os +import numpy +import requests from PIL import Image -import requests -import numpy -import os -import logging - -from PIL.Image import Resampling filename = os.path.basename(__file__).split('.py')[0] logger = logging.getLogger(filename) @@ -170,7 +168,7 @@ class Inkyimage: """Resize an image to desired width or height""" if self._image_loaded(): - if width == None and height == None: + if not width and not height: logger.error('no height of width specified') return @@ -180,7 +178,7 @@ class Inkyimage: initial_width = image.width wpercent = (width / float(image.width)) hsize = int((float(image.height) * float(wpercent))) - image = image.resize((width, hsize), Resampling.LANCZOS) + image = image.resize((width, hsize), Image.LANCZOS) logger.info(f"resized image from {initial_width} to {image.width}") self.image = image @@ -188,7 +186,7 @@ class Inkyimage: initial_height = image.height hpercent = (height / float(image.height)) wsize = int(float(image.width) * float(hpercent)) - image = image.resize((wsize, height), Resampling.LANCZOS) + image = image.resize((wsize, height), Image.LANCZOS) logger.info(f"resized image from {initial_height} to {image.height}") self.image = image diff --git a/inkycal/modules/inkycal_agenda.py b/inkycal/modules/inkycal_agenda.py old mode 100644 new mode 100755 index 2920571..0254711 --- a/inkycal/modules/inkycal_agenda.py +++ b/inkycal/modules/inkycal_agenda.py @@ -1,7 +1,7 @@ #!python3 """ -Agenda module for Inky-Calendar Project +Inkycal Agenda Module Copyright by aceisace """ diff --git a/inkycal/modules/inkycal_calendar.py b/inkycal/modules/inkycal_calendar.py old mode 100644 new mode 100755 index 313d05b..9432ba0 --- a/inkycal/modules/inkycal_calendar.py +++ b/inkycal/modules/inkycal_calendar.py @@ -1,7 +1,7 @@ #!python3 """ -Calendar module for Inky-Calendar Project +Inkycal Calendar Module Copyright by aceisace """ from inkycal.modules.template import inkycal_module diff --git a/inkycal/modules/inkycal_image.py b/inkycal/modules/inkycal_image.py old mode 100644 new mode 100755 index f07722a..728c3d0 --- a/inkycal/modules/inkycal_image.py +++ b/inkycal/modules/inkycal_image.py @@ -1,7 +1,7 @@ #!python3 """ -Image module for Inkycal Project +Inkycal Image Module Copyright by aceisace """ diff --git a/inkycal/modules/inkycal_jokes.py b/inkycal/modules/inkycal_jokes.py old mode 100644 new mode 100755 diff --git a/inkycal/modules/inkycal_server.py b/inkycal/modules/inkycal_server.py old mode 100644 new mode 100755 diff --git a/inkycal/modules/inkycal_slideshow.py b/inkycal/modules/inkycal_slideshow.py old mode 100644 new mode 100755 index d8e85c2..929bb15 --- a/inkycal/modules/inkycal_slideshow.py +++ b/inkycal/modules/inkycal_slideshow.py @@ -1,7 +1,7 @@ #!python3 """ -Image module for Inkycal Project +Inkycal Slideshow Module Copyright by aceisace """ import glob diff --git a/inkycal/modules/inkycal_stocks.py b/inkycal/modules/inkycal_stocks.py old mode 100644 new mode 100755 index c354b6e..0aedfcf --- a/inkycal/modules/inkycal_stocks.py +++ b/inkycal/modules/inkycal_stocks.py @@ -1,5 +1,4 @@ #!python3 - """ Stocks Module for Inkycal Project diff --git a/inkycal/modules/inkycal_weather.py b/inkycal/modules/inkycal_weather.py old mode 100644 new mode 100755 index 2b3d875..2fa458d --- a/inkycal/modules/inkycal_weather.py +++ b/inkycal/modules/inkycal_weather.py @@ -1,7 +1,7 @@ #!python3 """ -Weather module for Inky-Calendar software. +Inkycal weather module Copyright by aceisace """ diff --git a/inkycal/modules/template.py b/inkycal/modules/template.py old mode 100644 new mode 100755 diff --git a/inkycal/tests/helper_functions.py b/inkycal/tests/helper_functions.py old mode 100644 new mode 100755 index 2397ac5..519df66 --- a/inkycal/tests/helper_functions.py +++ b/inkycal/tests/helper_functions.py @@ -10,15 +10,15 @@ import sys from os.path import exists from inkycal.modules.inky_image import Inkyimage -preview = Inkyimage.preview +preview = Inkyimage.preview merge = Inkyimage.merge def get_environment(): - # Check if this is running on the Raspberry Pi - environment = None - envir_path = '/sys/firmware/devicetree/base/model' - if exists(envir_path): - with open(envir_path) as file: - if 'Raspberry' in file.read(): - environment = 'Raspberry' - return environment + # Check if this is running on the Raspberry Pi + environment = None + envir_path = '/sys/firmware/devicetree/base/model' + if exists(envir_path): + with open(envir_path) as file: + if 'Raspberry' in file.read(): + environment = 'Raspberry' + return environment diff --git a/inkycal/tests/ical_parser_test.py b/inkycal/tests/ical_parser_test.py old mode 100644 new mode 100755 diff --git a/inkycal/tests/inkycal_agenda_test.py b/inkycal/tests/inkycal_agenda_test.py old mode 100644 new mode 100755 diff --git a/inkycal/tests/inkycal_calendar_test.py b/inkycal/tests/inkycal_calendar_test.py old mode 100644 new mode 100755 diff --git a/inkycal/tests/inkycal_feeds_test.py b/inkycal/tests/inkycal_feeds_test.py old mode 100644 new mode 100755 diff --git a/inkycal/tests/inkycal_image_test.py b/inkycal/tests/inkycal_image_test.py old mode 100644 new mode 100755 diff --git a/inkycal/tests/inkycal_jokes_test.py b/inkycal/tests/inkycal_jokes_test.py old mode 100644 new mode 100755 diff --git a/inkycal/tests/inkycal_slideshow_test.py b/inkycal/tests/inkycal_slideshow_test.py old mode 100644 new mode 100755 index 05d0715..5268e0d --- a/inkycal/tests/inkycal_slideshow_test.py +++ b/inkycal/tests/inkycal_slideshow_test.py @@ -33,7 +33,6 @@ for count, url in enumerate(im_urls): test_path = "tmp" - tests = [ { "name": "Slideshow", diff --git a/inkycal/tests/inkycal_stocks_test.py b/inkycal/tests/inkycal_stocks_test.py old mode 100644 new mode 100755 diff --git a/inkycal/tests/inkycal_weather_test.py b/inkycal/tests/inkycal_weather_test.py old mode 100644 new mode 100755 diff --git a/inkycal/tests/main_test.py b/inkycal/tests/main_test.py old mode 100644 new mode 100755