From 1cdced629848232bf06e1473d0740bb6a0388b2f Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Fri, 8 Dec 2023 13:17:42 +0100 Subject: [PATCH] cleanup --- slic/utils/elog.py | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/slic/utils/elog.py b/slic/utils/elog.py index 5b48254f..57809ecc 100644 --- a/slic/utils/elog.py +++ b/slic/utils/elog.py @@ -1,9 +1,26 @@ -import elog -from getpass import getuser -from getpass import getpass import os -from .screenshot import Screenshot from pathlib import Path +from getpass import getuser, getpass +import elog +from .screenshot import Screenshot + + +class Elog: + + def __init__(self, url, screenshot_directory="", **kwargs): + self.elog, self.user = get_default_elog_instance(url, **kwargs) + self.screenshot = Screenshot(screenshot_directory) + self.read = self.log.read + + def post(self, *args, **kwargs): + if "Author" not in kwargs: + kwargs["Author"] = self.user + return self.log.post(*args, **kwargs) + + def screenshot(self, message="", window=False, desktop=False, delay=3, **kwargs): + filepath = self.screenshot.shoot()[0] + kwargs["attachments"] = [filepath] + self.post(message, **kwargs) def get_default_elog_instance(url, **kwargs): @@ -25,22 +42,4 @@ def get_default_elog_instance(url, **kwargs): return elog.open(url, **kwargs), kwargs["user"] -class Elog: - - def __init__(self, url, screenshot_directory="", **kwargs): - self.elog, self.user = get_default_elog_instance(url, **kwargs) - self.screenshot = Screenshot(screenshot_directory) - self.read = self.log.read - - def post(self, *args, **kwargs): - if "Author" not in kwargs: - kwargs["Author"] = self.user - return self.log.post(*args, **kwargs) - - def screenshot(self, message="", window=False, desktop=False, delay=3, **kwargs): - filepath = self.screenshot.shoot()[0] - kwargs["attachments"] = [filepath] - self.post(message, **kwargs) - -