From c612a9dee0ce48fb4330202deeb218bd4d16252f Mon Sep 17 00:00:00 2001 From: b3yond Date: Fri, 23 Mar 2018 13:19:39 +0100 Subject: [PATCH] rename to frontend.py & backend.py --- ticketfrei.py => backend.py | 0 db.py | 6 +++--- ticketfrei-web.py => frontend.py | 0 frontend/website.py | 4 ++-- mailbot.py | 8 ++++---- retootbot.py | 6 +++--- retweetbot.py | 6 +++--- sendmail.py | 4 ++-- trigger.py | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) rename ticketfrei.py => backend.py (100%) rename ticketfrei-web.py => frontend.py (100%) diff --git a/ticketfrei.py b/backend.py similarity index 100% rename from ticketfrei.py rename to backend.py diff --git a/db.py b/db.py index ae83a17..ad19b4b 100644 --- a/db.py +++ b/db.py @@ -5,14 +5,14 @@ import jwt from os import path, urandom from pylibscrypt import scrypt_mcf, scrypt_mcf_check import sqlite3 -import ticketfrei +import backend from mastodon import Mastodon class DB(object): def __init__(self): - self.config = ticketfrei.get_config() - self.logger = ticketfrei.get_logger(self.config) + self.config = backend.get_config() + self.logger = backend.get_logger(self.config) dbfile = path.join(path.dirname(path.abspath(__file__)), 'ticketfrei.sqlite') self.conn = sqlite3.connect(dbfile) diff --git a/ticketfrei-web.py b/frontend.py similarity index 100% rename from ticketfrei-web.py rename to frontend.py diff --git a/frontend/website.py b/frontend/website.py index 8ee1d0a..6af39ed 100644 --- a/frontend/website.py +++ b/frontend/website.py @@ -5,7 +5,7 @@ import base64 import bottle import sqlite3 import sendmail -import ticketfrei +import backend import jwt import pylibscrypt import smtplib @@ -345,7 +345,7 @@ class StripPathMiddleware(object): if __name__ == "__main__": global config - config = ticketfrei.get_config() + config = backend.get_config() global db global secret diff --git a/mailbot.py b/mailbot.py index 9e56a78..50821dc 100644 --- a/mailbot.py +++ b/mailbot.py @@ -6,7 +6,7 @@ import time import trigger import datetime import email -import ticketfrei +import backend import imaplib import report @@ -25,7 +25,7 @@ class Mailbot(object): :param config: (dictionary) config.toml as a dictionary of dictionaries """ self.config = config - self.logger = ticketfrei.get_logger(config) + self.logger = backend.get_logger(config) self.history_path = history_path self.last_mail = self.get_history(self.history_path) @@ -56,7 +56,7 @@ class Mailbot(object): def repost(self, status): """ E-Mails don't have to be reposted - they already reached everyone on the mailing list. - The function still needs to be here because ticketfrei.py assumes it, and take the + The function still needs to be here because backend.py assumes it, and take the report object they want to give us. :param status: (report.Report object) @@ -171,7 +171,7 @@ class Mailbot(object): if __name__ == "__main__": - config = ticketfrei.get_config() + config = backend.get_config() # initialise trigger trigger = trigger.Trigger(config) diff --git a/retootbot.py b/retootbot.py index dc5a831..dba9e48 100755 --- a/retootbot.py +++ b/retootbot.py @@ -8,12 +8,12 @@ import time import trigger import sendmail import report -import ticketfrei +import backend class RetootBot(object): def __init__(self, config): self.config = config - self.logger = ticketfrei.get_logger(config) + self.logger = backend.get_logger(config) self.client_id = self.register() self.m = self.login() @@ -126,7 +126,7 @@ class RetootBot(object): if __name__ == '__main__': - config = ticketfrei.get_config() + config = backend.get_config() trigger = trigger.Trigger(config) bot = RetootBot(config) diff --git a/retweetbot.py b/retweetbot.py index d713a02..26ac4b4 100755 --- a/retweetbot.py +++ b/retweetbot.py @@ -6,7 +6,7 @@ import requests import trigger from time import sleep import report -import ticketfrei +import backend import sendmail class RetweetBot(object): @@ -29,7 +29,7 @@ class RetweetBot(object): Tweet """ self.config = config - self.logger = ticketfrei.get_logger(config) + self.logger = backend.get_logger(config) # initialize API access keys = self.get_api_keys() @@ -200,7 +200,7 @@ class RetweetBot(object): if __name__ == "__main__": - config = ticketfrei.get_config() + config = backend.get_config() # initialise trigger trigger = trigger.Trigger(config) diff --git a/sendmail.py b/sendmail.py index f758a08..93dc272 100755 --- a/sendmail.py +++ b/sendmail.py @@ -66,8 +66,8 @@ class Mailer(object): # For testing: if __name__ == '__main__': - import ticketfrei - config = ticketfrei.get_config() + import backend + config = backend.get_config() m = Mailer(config) print(m.send("This is a test mail.", m.fromaddr, "Test")) diff --git a/trigger.py b/trigger.py index 366999d..db57f81 100644 --- a/trigger.py +++ b/trigger.py @@ -57,8 +57,8 @@ class Trigger(object): if __name__ == "__main__": - import ticketfrei - config = ticketfrei.get_config() + import backend + config = backend.get_config() print("testing the trigger") trigger = Trigger(config)