From 1ed2b73ec814a912951009659d6da5700ce6deb6 Mon Sep 17 00:00:00 2001 From: inexcode Date: Sat, 13 Aug 2022 01:42:11 +0400 Subject: [PATCH] Make icons python modules --- selfprivacy_api/services/bitwarden/__init__.py | 4 ++-- selfprivacy_api/services/bitwarden/icon.py | 5 +++++ selfprivacy_api/services/gitea/__init__.py | 4 ++-- selfprivacy_api/services/gitea/icon.py | 5 +++++ selfprivacy_api/services/mailserver/__init__.py | 4 ++-- selfprivacy_api/services/mailserver/icon.py | 5 +++++ selfprivacy_api/services/nextcloud/__init__.py | 4 ++-- selfprivacy_api/services/nextcloud/icon.py | 12 ++++++++++++ selfprivacy_api/services/ocserv/__init__.py | 4 ++-- selfprivacy_api/services/ocserv/icon.py | 5 +++++ selfprivacy_api/services/pleroma/__init__.py | 4 ++-- selfprivacy_api/services/pleroma/icon.py | 12 ++++++++++++ 12 files changed, 56 insertions(+), 12 deletions(-) create mode 100644 selfprivacy_api/services/bitwarden/icon.py create mode 100644 selfprivacy_api/services/gitea/icon.py create mode 100644 selfprivacy_api/services/mailserver/icon.py create mode 100644 selfprivacy_api/services/nextcloud/icon.py create mode 100644 selfprivacy_api/services/ocserv/icon.py create mode 100644 selfprivacy_api/services/pleroma/icon.py diff --git a/selfprivacy_api/services/bitwarden/__init__.py b/selfprivacy_api/services/bitwarden/__init__.py index 9fe9995..a752400 100644 --- a/selfprivacy_api/services/bitwarden/__init__.py +++ b/selfprivacy_api/services/bitwarden/__init__.py @@ -12,6 +12,7 @@ from selfprivacy_api.utils import ReadUserData, WriteUserData, get_domain from selfprivacy_api.utils.block_devices import BlockDevice from selfprivacy_api.utils.huey import huey from selfprivacy_api.utils.network import get_ip4 +from selfprivacy_api.services.bitwarden.icon import BITWARDEN_ICON class Bitwarden(Service): @@ -35,8 +36,7 @@ class Bitwarden(Service): @staticmethod def get_svg_icon() -> str: """Read SVG icon from file and return it as base64 encoded string.""" - with open("selfprivacy_api/services/bitwarden/bitwarden.svg", "rb") as f: - return base64.b64encode(f.read()).decode("utf-8") + return base64.b64encode(BITWARDEN_ICON.encode("utf-8")).decode("utf-8") @staticmethod def get_url() -> typing.Optional[str]: diff --git a/selfprivacy_api/services/bitwarden/icon.py b/selfprivacy_api/services/bitwarden/icon.py new file mode 100644 index 0000000..f9280e0 --- /dev/null +++ b/selfprivacy_api/services/bitwarden/icon.py @@ -0,0 +1,5 @@ +BITWARDEN_ICON = """ + + + +""" diff --git a/selfprivacy_api/services/gitea/__init__.py b/selfprivacy_api/services/gitea/__init__.py index ee0a058..7916b60 100644 --- a/selfprivacy_api/services/gitea/__init__.py +++ b/selfprivacy_api/services/gitea/__init__.py @@ -12,6 +12,7 @@ from selfprivacy_api.utils import ReadUserData, WriteUserData, get_domain from selfprivacy_api.utils.block_devices import BlockDevice from selfprivacy_api.utils.huey import huey from selfprivacy_api.utils.network import get_ip4 +from selfprivacy_api.services.gitea.icon import GITEA_ICON class Gitea(Service): @@ -35,8 +36,7 @@ class Gitea(Service): @staticmethod def get_svg_icon() -> str: """Read SVG icon from file and return it as base64 encoded string.""" - with open("selfprivacy_api/services/gitea/gitea.svg", "rb") as f: - return base64.b64encode(f.read()).decode("utf-8") + return base64.b64encode(GITEA_ICON.encode("utf-8")).decode("utf-8") @staticmethod def get_url() -> typing.Optional[str]: diff --git a/selfprivacy_api/services/gitea/icon.py b/selfprivacy_api/services/gitea/icon.py new file mode 100644 index 0000000..569f96a --- /dev/null +++ b/selfprivacy_api/services/gitea/icon.py @@ -0,0 +1,5 @@ +GITEA_ICON = """ + + + +""" diff --git a/selfprivacy_api/services/mailserver/__init__.py b/selfprivacy_api/services/mailserver/__init__.py index 31e250b..659d4c3 100644 --- a/selfprivacy_api/services/mailserver/__init__.py +++ b/selfprivacy_api/services/mailserver/__init__.py @@ -14,6 +14,7 @@ from selfprivacy_api.utils import huey from selfprivacy_api.utils.block_devices import BlockDevice from selfprivacy_api.utils.huey import huey from selfprivacy_api.utils.network import get_ip4 +from selfprivacy_api.services.mailserver.icon import MAILSERVER_ICON class MailServer(Service): @@ -33,8 +34,7 @@ class MailServer(Service): @staticmethod def get_svg_icon() -> str: - with open("selfprivacy_api/services/mailserver/mailserver.svg", "rb") as f: - return base64.b64encode(f.read()).decode("utf-8") + return base64.b64encode(MAILSERVER_ICON.encode("utf-8")).decode("utf-8") @staticmethod def get_url() -> typing.Optional[str]: diff --git a/selfprivacy_api/services/mailserver/icon.py b/selfprivacy_api/services/mailserver/icon.py new file mode 100644 index 0000000..cb5b639 --- /dev/null +++ b/selfprivacy_api/services/mailserver/icon.py @@ -0,0 +1,5 @@ +MAILSERVER_ICON = """ + + + +""" diff --git a/selfprivacy_api/services/nextcloud/__init__.py b/selfprivacy_api/services/nextcloud/__init__.py index 99efade..fcdaf9f 100644 --- a/selfprivacy_api/services/nextcloud/__init__.py +++ b/selfprivacy_api/services/nextcloud/__init__.py @@ -10,6 +10,7 @@ from selfprivacy_api.services.service import Service, ServiceDnsRecord, ServiceS from selfprivacy_api.utils import ReadUserData, WriteUserData, get_domain from selfprivacy_api.utils.block_devices import BlockDevice from selfprivacy_api.utils.network import get_ip4 +from selfprivacy_api.services.nextcloud.icon import NEXTCLOUD_ICON class Nextcloud(Service): @@ -33,8 +34,7 @@ class Nextcloud(Service): @staticmethod def get_svg_icon() -> str: """Read SVG icon from file and return it as base64 encoded string.""" - with open("selfprivacy_api/services/nextcloud/nextcloud.svg", "rb") as f: - return base64.b64encode(f.read()).decode("utf-8") + return base64.b64encode(NEXTCLOUD_ICON.encode("utf-8")).decode("utf-8") @staticmethod def get_url() -> typing.Optional[str]: diff --git a/selfprivacy_api/services/nextcloud/icon.py b/selfprivacy_api/services/nextcloud/icon.py new file mode 100644 index 0000000..d178640 --- /dev/null +++ b/selfprivacy_api/services/nextcloud/icon.py @@ -0,0 +1,12 @@ +NEXTCLOUD_ICON = """ + + + + + + + + + + +""" diff --git a/selfprivacy_api/services/ocserv/__init__.py b/selfprivacy_api/services/ocserv/__init__.py index e7bf74b..73d6474 100644 --- a/selfprivacy_api/services/ocserv/__init__.py +++ b/selfprivacy_api/services/ocserv/__init__.py @@ -10,6 +10,7 @@ from selfprivacy_api.services.service import Service, ServiceDnsRecord, ServiceS from selfprivacy_api.utils import ReadUserData, WriteUserData from selfprivacy_api.utils.block_devices import BlockDevice from selfprivacy_api.utils.network import get_ip4 +from selfprivacy_api.services.ocserv.icon import OCSERV_ICON class Ocserv(Service): @@ -29,8 +30,7 @@ class Ocserv(Service): @staticmethod def get_svg_icon() -> str: - with open("selfprivacy_api/services/ocserv/ocserv.svg", "rb") as f: - return base64.b64encode(f.read()).decode("utf-8") + return base64.b64encode(OCSERV_ICON.encode("utf-8")).decode("utf-8") @staticmethod def get_url() -> typing.Optional[str]: diff --git a/selfprivacy_api/services/ocserv/icon.py b/selfprivacy_api/services/ocserv/icon.py new file mode 100644 index 0000000..6585c5e --- /dev/null +++ b/selfprivacy_api/services/ocserv/icon.py @@ -0,0 +1,5 @@ +OCSERV_ICON = """ + + + +""" diff --git a/selfprivacy_api/services/pleroma/__init__.py b/selfprivacy_api/services/pleroma/__init__.py index 97f76f9..9dd333e 100644 --- a/selfprivacy_api/services/pleroma/__init__.py +++ b/selfprivacy_api/services/pleroma/__init__.py @@ -10,6 +10,7 @@ from selfprivacy_api.services.service import Service, ServiceDnsRecord, ServiceS from selfprivacy_api.utils import ReadUserData, WriteUserData, get_domain from selfprivacy_api.utils.block_devices import BlockDevice from selfprivacy_api.utils.network import get_ip4 +from selfprivacy_api.services.pleroma.icon import PLEROMA_ICON class Pleroma(Service): @@ -29,8 +30,7 @@ class Pleroma(Service): @staticmethod def get_svg_icon() -> str: - with open("selfprivacy_api/services/pleroma/pleroma.svg", "rb") as f: - return base64.b64encode(f.read()).decode("utf-8") + return base64.b64encode(PLEROMA_ICON.encode("utf-8")).decode("utf-8") @staticmethod def get_url() -> typing.Optional[str]: diff --git a/selfprivacy_api/services/pleroma/icon.py b/selfprivacy_api/services/pleroma/icon.py new file mode 100644 index 0000000..c0c4d2b --- /dev/null +++ b/selfprivacy_api/services/pleroma/icon.py @@ -0,0 +1,12 @@ +PLEROMA_ICON = """ + + + + + + + + + + +"""