Switch from filenames to classnames for generated images

This commit is contained in:
Ace 2020-05-29 03:59:44 +02:00
parent 7c4fa9357f
commit e7cb176530
6 changed files with 12 additions and 13 deletions

View File

@ -34,7 +34,7 @@ except ModuleNotFoundError:
filename = os.path.basename(__file__).split('.py')[0]
logger = logging.getLogger(filename)
logger.setLevel(level=logging.INFO)
logger.setLevel(level=logging.ERROR)
class iCalendar:
"""iCalendar parsing moudule for inkycal.

View File

@ -32,8 +32,8 @@ class Agenda(inkycal_module):
if not param in section_config:
raise Exception('config is missing {}'.format(param))
# module name
self.name = filename
# class name
self.name = self.__class__.__name__
# module specific parameters
self.date_format = 'ddd D MMM'

View File

@ -31,18 +31,16 @@ class Calendar(inkycal_module):
raise Exception('config is missing {}'.format(param))
# module name
self.name = filename
self.name = self.__class__.__name__
# module specific parameters
self.shuffle_feeds = True
self.num_font = ImageFont.truetype(
fonts['NotoSans-SemiCondensed'], size = self.fontsize)
self.weekstart = self.config['week_starts_on']
self.show_events = True
self.date_format = 'D MMM' # used for dates
self.time_format = "HH:mm" # used for timings
self.language = 'en' # Grab from settings file?
self.date_format = 'D MMM'
self.time_format = "HH:mm"
self.language = 'en'
self.timezone = get_system_tz()
self.ical_urls = self.config['ical_urls']
@ -220,7 +218,7 @@ class Calendar(inkycal_module):
self._upcoming_events = upcoming_events
# delete events which won't be able to fit (more events than lines)
upcoming_events[max_event_lines:]
upcoming_events[:max_event_lines]
# Check if any events were found in the given timerange
@ -262,6 +260,7 @@ class Calendar(inkycal_module):
(event_width_l, line_height), name, font=self.font,
alignment = 'left')
else:
# change this event_width to event_width_s?
write(im_black, (time_width, event_lines[cursor][1]),
(event_width, line_height), time, font=self.font,
alignment = 'left')

View File

@ -37,7 +37,7 @@ class RSS(inkycal_module):
raise Exception('config is missing {}'.format(param))
# module name
self.name = filename
self.name = self.__class__.__name__
# module specific parameters
self.shuffle_feeds = True

View File

@ -39,7 +39,7 @@ class Weather(inkycal_module):
raise Exception('config is missing {}'.format(param))
# module name
self.name = filename
self.name = self.__class__.__name__
# module specific parameters
self.owm = pyowm.OWM(self.config['api_key'])

View File

@ -64,7 +64,7 @@ class simple(inkycal_module):
super().__init__(section_size, section_config)
# module name (required)
self.name = filename
self.name = self.__class__.__name__
# module specific parameters (optional)
self.do_something = True