black & alte Linux-Pfade

database/bcp_log.py

@@ -50,9 +50,7 @@ def check_logfiles(prefix, base_dir):
         result.ignored = len(frh.readlines())
 
     # info output of export
-    with open(
-        f"{base_dir}/{prefix}.bcp1.log", "r", encoding="cp850", errors="ignore"
-    ) as frh:
+    with open(f"{base_dir}/{prefix}.bcp1.log", "r", encoding="cp850", errors="ignore") as frh:
         raw_logs = frh.read()
         match = re.search(r"(\d+) Zeilen kopiert.", raw_logs)
         result.exported = int(match.group(1)) if match else 0
@@ -60,9 +58,7 @@ def check_logfiles(prefix, base_dir):
         result.export_duration = int(match2.group(1)) / 1000 if match2 else 0
 
     # info output of import
-    with open(
-        f"{base_dir}/{prefix}.bcp2.log", "r", encoding="cp850", errors="ignore"
-    ) as frh:
+    with open(f"{base_dir}/{prefix}.bcp2.log", "r", encoding="cp850", errors="ignore") as frh:
         raw_logs = frh.read()
         match = re.search(r"(\d+) Zeilen kopiert.", raw_logs)
         result.imported = int(match.group(1)) if match else 0
@@ -78,12 +74,11 @@ def check_directory(base_dir):
         stem = filename.name[:-9]
         res.append(check_logfiles(stem, base_dir).to_csv())
     with open(base_dir + "/info.log", "w") as fwh:
-        fwh.write(
-            "filename;timestamp;imported;exported;ignored;import_duration;export_duration\n"
-        )
+        fwh.write("filename;timestamp;imported;exported;ignored;import_duration;export_duration\n")
         fwh.write("\n".join(res))
 
 
 if __name__ == "__main__":
-    check_directory("/home/robert/projekte/python/dbtools/SQL/temp")
+    base_dir = str(Path(__file__).parent)
+    check_directory(base_dir + "/SQL/temp")
     # check_logfiles('ORDER_LINE_1')

logviewer/apachelog.py

@@ -1,47 +1,48 @@
+from pathlib import Path
 import re
 from datetime import datetime
 import xml.etree.ElementTree as ET
 import csv
 
-base_dir = '/home/robert/projekte/python/logviewer'
+base_dir = str(Path(__file__).parent)
 
 
 def convert_log(line):
     # 10.6.173.69 - - [01/Dec/2020:10:03:16 +0100] "GET /GAPS_BMW/index.php5?&rc=MISView&rm=getReport&ras[]=49331 HTTP/1.1" 200 64512
     match = list(re.findall(r"([\d\.]+) - - \[(.*)\] \"GET /.*&ras\[\]=(\d+) .* 200 (\d+)", line)[0])
-    match[1] = datetime.strptime(match[1], "%d/%b/%Y:%H:%M:%S %z").isoformat(timespec='seconds')
+    match[1] = datetime.strptime(match[1], "%d/%b/%Y:%H:%M:%S %z").isoformat(timespec="seconds")
     return match
 
 
 def parse_log(filename):
-    with open(filename, 'r') as frh:
-        logs = [convert_log(line) for line in frh.readlines() if line.find('rc=MISView&rm=getReport') > -1]
+    with open(filename, "r") as frh:
+        logs = [convert_log(line) for line in frh.readlines() if line.find("rc=MISView&rm=getReport") > -1]
     return logs
 
 
 def parse_portal_xml(filename):
     portal = ET.parse(filename)
-    folders = portal.getroot().find('Publishes').findall('Publish')
+    folders = portal.getroot().find("Publishes").findall("Publish")
     res = {}
     for p in folders:
-        user = p.get('User')
-        name = p.get('Name')
-        for i in p.find('Images').findall('Image'):
-            res[i.get('ID')] = [user, name, i.find('Report').text]
+        user = p.get("User")
+        name = p.get("Name")
+        for i in p.find("Images").findall("Image"):
+            res[i.get("ID")] = [user, name, i.find("Report").text]
     return res
 
 
 def combine_logs_reports(logs, reports):
-    return [line + reports.get(line[2], [''] * 3) for line in logs]
+    return [line + reports.get(line[2], [""] * 3) for line in logs]
 
 
 def main():
-    reports = parse_portal_xml(base_dir + '/config/GAPS_BMW_NEU.xml')
-    logs = parse_log(base_dir + '/apache/access.log')
-    header = ['ip', 'timestamp', 'id', 'bytes', 'user', 'section', 'report']
+    reports = parse_portal_xml(base_dir + "/config/GAPS_BMW_NEU.xml")
+    logs = parse_log(base_dir + "/apache/access.log")
+    header = ["ip", "timestamp", "id", "bytes", "user", "section", "report"]
     logs = combine_logs_reports(logs, reports)
-    with open(base_dir + '/export/accesslog.csv', 'w') as fwh:
-        csv_writer = csv.writer(fwh, delimiter=';')
+    with open(base_dir + "/export/accesslog.csv", "w") as fwh:
+        csv_writer = csv.writer(fwh, delimiter=";")
         csv_writer.writerow(header)
         csv_writer.writerows(logs)
 
@@ -49,5 +50,5 @@ def main():
     print(logs[0])
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

misc/mail.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from pathlib import Path
 import smtplib
 import ssl
 from email.mime.text import MIMEText
@@ -17,16 +18,13 @@ class Message:
 
 
 class SMTP_365:
-    def __init__(self, host='', port=0, local_hostname=None,
-                 timeout=30,
-                 source_address=None):
+    def __init__(self, host="", port=0, local_hostname=None, timeout=30, source_address=None):
         pass
 
     def login(self, user, password, *, initial_response_ok=True):
         pass
 
-    def sendmail(self, from_addr, to_addrs, msg, mail_options=(),
-                 rcpt_options=()):
+    def sendmail(self, from_addr, to_addrs, msg, mail_options=(), rcpt_options=()):
         pass
 
 
@@ -38,18 +36,18 @@ class mail:
         if cfg is None:
             self.cfg = config.Config()
         self.mail_cfg = self.cfg.smtp
-        self.reply_to = self.cfg.kunde_safe + '@global-cube.com'
+        self.reply_to = self.cfg.kunde_safe + "@global-cube.com"
         self.context = ssl.create_default_context()
 
     def __enter__(self):
         try:
-            if self.mail_cfg.secure == 'ssl':
+            if self.mail_cfg.secure == "ssl":
                 self.mailserver = smtplib.SMTP_SSL(self.mail_cfg.server, self.mail_cfg.port, context=self.context)
             else:
                 self.mailserver = smtplib.SMTP(self.mail_cfg.server, self.mail_cfg.port)
 
             # self.mailserver.set_debuglevel(1)
-            if self.mail_cfg.secure == 'tls':
+            if self.mail_cfg.secure == "tls":
                 # self.context.options |= ssl.OP_NO_TLSv1_2 | ssl.OP_NO_TLSv1_3
                 self.context.minimum_version = ssl.TLSVersion["TLSv1_2"]
                 self.mailserver.ehlo()
@@ -68,37 +66,48 @@ class mail:
 
     def send(self, mailto, subject, html, attachment=None):
         msg = self.message(mailto, subject, html, attachment)
-        msg['Message-ID'] = make_msgid(domain=self.mail_cfg.server)
-        res = {'id': msg['Message-ID'], 'mailto': mailto, 'status': 'OK'}
+        msg["Message-ID"] = make_msgid(domain=self.mail_cfg.server)
+        res = {"id": msg["Message-ID"], "mailto": mailto, "status": "OK"}
 
         try:
             result = self.mailserver.sendmail(self.mail_cfg.email, mailto, msg.as_string())
-            with open('mail.txt', 'w') as fwh:
+            with open("mail.txt", "w") as fwh:
                 fwh.write(msg.as_string())
         except smtplib.SMTPException as e:
             print(e)
             pass
 
     def message(self, mailto, subject, html, attachment):
-        msg = MIMEMultipart('alternative')
-        msg['From'] = self.mail_cfg.email
-        msg['To'] = mailto
+        msg = MIMEMultipart("alternative")
+        msg["From"] = self.mail_cfg.email
+        msg["To"] = mailto
         # msg['Reply-To'] = self.reply_to
-        msg['Subject'] = subject
+        msg["Subject"] = subject
 
         # text = '\n'.join([x for x, _ in attachment])
         # msg.attach(MIMEText(text, 'plain'))
-        msg.attach(MIMEText(html, 'html'))
+        msg.attach(MIMEText(html, "html"))
 
         for name, filename in attachment or []:
             with open(filename, "rb") as f:
                 part = MIMEApplication(f.read(), Name=name)
-                part['Content-Disposition'] = f'attachment; filename="{name}"'
+                part["Content-Disposition"] = f'attachment; filename="{name}"'
                 msg.attach(part)
         return msg
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
+    base_dir = str(Path(__file__).parent)
+
     with mail() as m:
-        m.send('robert.bedner@gmail.com', 'Test 123', 'kein Kommentar',
-               [('Umsatz_Bruttoertrag_Aftersales.pdf', '/home/robert/projekte/python/Portal/Publish/daten/gaps_vers_tag/Umsatz_Bruttoertrag_Aftersales_0.pdf')])
+        m.send(
+            "robert.bedner@gmail.com",
+            "Test 123",
+            "kein Kommentar",
+            [
+                (
+                    "Umsatz_Bruttoertrag_Aftersales.pdf",
+                    base_dir + "/Portal/Publish/daten/gaps_vers_tag/Umsatz_Bruttoertrag_Aftersales_0.pdf",
+                )
+            ],
+        )