From 91324a52404b80e93a1f97f32dcc7e060051a532 Mon Sep 17 00:00:00 2001 From: patrick Date: Sun, 5 Dec 2021 22:58:42 +0000 Subject: [PATCH] coding style --- fet2020/documents/__init__.py | 2 +- fet2020/documents/api.py | 24 ++++++++++++------------ fet2020/documents/etherpadlib.py | 16 ++++++++-------- fet2020/posts/admin.py | 6 +++--- fet2020/posts/models.py | 14 +++++++------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/fet2020/documents/__init__.py b/fet2020/documents/__init__.py index c3fab2a5..ae1381b8 100644 --- a/fet2020/documents/__init__.py +++ b/fet2020/documents/__init__.py @@ -1 +1 @@ -from .api import getPadHTML, setPadHTML, createPadifNotExists +from .api import create_pad, get_pad_html, set_pad_html diff --git a/fet2020/documents/api.py b/fet2020/documents/api.py index 6789adde..b06b63b4 100644 --- a/fet2020/documents/api.py +++ b/fet2020/documents/api.py @@ -1,14 +1,14 @@ import logging import os -import urllib.parse - from contextlib import contextmanager -from django.conf import settings +from urllib.parse import urljoin + from etherpad_lite import EtherpadLiteClient, EtherpadException +from django.conf import settings + logger = logging.getLogger(__name__) -SERVER_URL = settings.ETHERPAD_CLIENT["exturl"] @contextmanager @@ -32,7 +32,7 @@ def get_ep_client(groupName="fet"): base_params={ "apikey": apikey, }, - base_url=urllib.parse.urljoin(settings.ETHERPAD_CLIENT["url"], "api"), + base_url=urljoin(settings.ETHERPAD_CLIENT["url"], "api"), api_version="1.2.14", ) @@ -54,7 +54,7 @@ def ep_client(groupName="fet"): yield epc, group -def __checkPadExists(padID=None): +def __pad_exists(padID=None): if not padID: return False @@ -71,13 +71,13 @@ def __checkPadExists(padID=None): return False -def createPadifNotExists(padID, text="helloworld"): +def create_pad(padID, text="helloworld"): """ Create a pad if it doesn't exist. Return a padID if new pad is created. Otherwise None (when the padID exists already). """ - if not __checkPadExists(padID=padID): + if not __pad_exists(padID=padID): with ep_client() as (epc, group): if not epc or not group: return None @@ -89,17 +89,17 @@ def createPadifNotExists(padID, text="helloworld"): return None -def getPadHTML(padID): +def get_pad_html(padID): text = None with ep_client() as (epc, group): if not epc or not group: return None - + text = epc.getHTML(padID=group["groupID"] + "$" + padID)["html"] return text -def setPadHTML(padID, html): +def set_pad_html(padID, html): epc, group = get_ep_client() if not epc or not group: return None @@ -116,7 +116,7 @@ def get_pad_link(padID): if not epc or not group: return "#" - return urllib.parse.urljoin( + return urljoin( settings.ETHERPAD_CLIENT["exturl"], "p/" + group["groupID"] + "$" + str(padID), ) diff --git a/fet2020/documents/etherpadlib.py b/fet2020/documents/etherpadlib.py index 5a5ffbb0..a4b38cb1 100644 --- a/fet2020/documents/etherpadlib.py +++ b/fet2020/documents/etherpadlib.py @@ -1,9 +1,10 @@ +from datetime import timedelta + from django.conf import settings +from django.utils import timezone -from datetime import datetime, timedelta - -from .api import get_ep_client from authentications.decorators import ep_authenticated_user +from .api import get_ep_client @ep_authenticated_user @@ -14,13 +15,13 @@ def __get_ep_sessionid(request): author = epc.createAuthorIfNotExistsFor( name=str(request.user), authorMapper=str(request.user) - )["authorID"] - - expires = datetime.utcnow() + timedelta(hours=3) + ) + expires = timezone.now() + timedelta(hours=3) + try: result = epc.createSession( groupID=str(group["groupID"]), - authorID=str(author), + authorID=str(author["authorID"]), validUntil=str(int(expires.timestamp())), ) except Exception as e: @@ -41,7 +42,6 @@ def add_ep_cookie(request, response): def del_ep_cookie(request, response): - if "sessionID" in request.COOKIES: ep_sessionID = request.COOKIES["sessionID"] diff --git a/fet2020/posts/admin.py b/fet2020/posts/admin.py index b1e2ee59..20104113 100644 --- a/fet2020/posts/admin.py +++ b/fet2020/posts/admin.py @@ -4,13 +4,13 @@ from django.utils.translation import gettext_lazy as _ from .models import Post, Event, News, FetMeeting, FileUpload from .forms import PostForm, EventForm, NewsForm, FetMeetingForm -from documents.api import createPadifNotExists +from documents.api import create_pad def make_fetmeeting(self, request, queryset): qs = self.get_queryset(request).filter(id=request.POST["_selected_action"]).first() - agenda_key = createPadifNotExists(qs.slug + "-agenda") + agenda_key = create_pad(qs.slug + "-agenda") if not agenda_key: self.message_user( request, @@ -19,7 +19,7 @@ def make_fetmeeting(self, request, queryset): ) return - protocol_key = createPadifNotExists(qs.slug + "-protocol") + protocol_key = create_pad(qs.slug + "-protocol") if not protocol_key: self.message_user( request, diff --git a/fet2020/posts/models.py b/fet2020/posts/models.py index b563fe4d..5099a693 100644 --- a/fet2020/posts/models.py +++ b/fet2020/posts/models.py @@ -13,7 +13,7 @@ from django.utils.translation import gettext_lazy as _ from taggit.managers import TaggableManager from core.models import CustomFlatPage -from documents import getPadHTML, setPadHTML, createPadifNotExists +from documents import create_pad, get_pad_html, set_pad_html from .managers import ( PostManager, ArticleManager, @@ -34,12 +34,12 @@ def create_pad_for_post(slug, item="agenda"): Return a Etherpad key. """ logger.info(f"Pad-Type: {item}") - padID = createPadifNotExists(slug + "-" + item) + padID = create_pad(slug + "-" + item) if padID: # set template into the newly created pad if it exists page = CustomFlatPage.objects.filter(title__iexact=item).first() if page: - setPadHTML(padID, page.content) + set_pad_html(padID, page.content) logger.info(f"Template gesetzt von: {page.title}") else: padID = f"{slug}-{item}" @@ -128,7 +128,7 @@ class Post(models.Model): if not self.agenda_key: return None - return getPadHTML(self.agenda_key) + return get_pad_html(self.agenda_key) @property def protocol_html(self): @@ -136,7 +136,7 @@ class Post(models.Model): if not self.protocol_key: return None - return getPadHTML(self.protocol_key) + return get_pad_html(self.protocol_key) @agenda_html.setter def agenda_html(self, value): @@ -145,7 +145,7 @@ class Post(models.Model): if not value or not self.agenda_key: return None - setPadHTML(self.agenda_key, value) + set_pad_html(self.agenda_key, value) request_logger.info( "set etherpad! for post %s id: %s", self.slug, self.agenda_key @@ -159,7 +159,7 @@ class Post(models.Model): if not value or not self.protocol_key: return None - setPadHTML(self.protocol_key, value) + set_pad_html(self.protocol_key, value) request_logger.info( "set etherpad! for post %s id: %s", self.slug, self.protocol_key