tiagovla/ppgee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf: change structure and simplify

Browse Source
This commit is contained in:
tiagovla
2023-07-19 03:49:56 -03:00
parent df3033bc6e
commit e36e1f73c5
14 changed files with 117 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.rst
View File

@@ -11,9 +11,9 @@
async def main() -> None:
cpf = "00011122233"
async with PPGEE(user=cpf, password=cpf) as ppgee:
frequency_page = await ppgee.frequency()
print(frequency_page.history())
await frequency_page.confirm()
attendency_page = await ppgee.attendency()
print(attendency_page.history())
await attendency_page.confirm()
await asyncio.sleep(5)

6
demo/check_frequency.py → demo/check_attendency.py
View File

@@ -9,9 +9,9 @@ logging.basicConfig(level=logging.INFO)
async def main() -> None:
cpf = "00011122233"
async with PPGEE(user=cpf, password=cpf) as ppgee:
frequency_page = await ppgee.frequency()
print(frequency_page.history())
await frequency_page.confirm()
attendency_page = await ppgee.attendency()
print(attendency_page.history())
await attendency_page.confirm()
await asyncio.sleep(5)

2
ppgee/__init__.py
View File

@@ -1,4 +1,4 @@
__version__ = "0.1.3"
__version__ = "0.1.4"
from .client import PPGEE

6
ppgee/__main__.py
View File

@@ -21,11 +21,11 @@ async def cli():
user, password = args.username, args.password
try:
async with PPGEE(user=user, password=password) as ppgee:
frequency_page = await ppgee.frequency()
attendency_page = await ppgee.attendency()
await asyncio.sleep(1)
if frequency_page.is_available():
if attendency_page.is_available():
print("Attendency confirmed.")
await frequency_page.confirm()
await attendency_page.confirm()
else:
eprint("Attendency not available yet.")
await asyncio.sleep(1)

35
ppgee/client.py
View File

@@ -1,23 +1,16 @@
import aiohttp
import logging
from ppgee.http import HttpClient
from ppgee.pages import FrequencyPage
from functools import wraps
import aiohttp
from ppgee import errors
from ppgee.http import HttpClient
from ppgee.pages import AttendencyPage, AttendencyHistory, AttendencyHistoryEntry
from ppgee.parsers import AttendencyParser
from ppgee.permissions import is_logged_check
logger = logging.getLogger(__name__)
def is_logged_check(method):
@wraps(method)
def wrapper(self, *args, **kwargs):
if not self.is_logged:
raise Exception("You must be logged in to use this method")
return method(self, *args, **kwargs)
return wrapper
class PPGEE:
def __init__(self, user: str | None = None, password: str | None = None) -> None:
self.user = user
@@ -56,10 +49,16 @@ class PPGEE:
logger.info("Logged in without credentials")
@is_logged_check
async def frequency(self) -> FrequencyPage:
logger.info("Requesting frequency page...")
html = await self.http.frequency()
return FrequencyPage(html, self.http.frequency_confirmation)
async def attendency(self) -> AttendencyPage:
logger.info("Requesting attendency page...")
html = await self.http.attendency()
parser = AttendencyParser(html)
history = AttendencyHistory(
(AttendencyHistoryEntry(**item) for item in parser.history())
)
return AttendencyPage(
history, self.http.attendency_confirmation, parser.availability()
)
@is_logged_check
async def logoff(self) -> None:

4
ppgee/http.py
View File

@@ -26,10 +26,10 @@ class HttpClient:
data: dict[str, str] = {"login": user, "senha": password}
return await self._request("post", f"{URL_BASE}/login.php", data=data)
async def frequency(self) -> str:
async def attendency(self) -> str:
return await self._request("get", f"{URL_BASE}/afreq.php")
async def frequency_confirmation(self) -> str:
async def attendency_confirmation(self) -> str:
today = date.today()
data: dict[str, str] = {
"freqano": str(today.year),

6
ppgee/pages/__init__.py
View File

@@ -1,5 +1,3 @@
from .frequency import FrequencyPage
from .attendency import AttendencyPage, AttendencyHistory, AttendencyHistoryEntry
__all__ = [
"FrequencyPage",
]
__all__ = ["AttendencyPage", "AttendencyHistory", "AttendencyHistoryEntry"]

35
ppgee/pages/frequency.py → ppgee/pages/attendency.py
View File

@@ -1,21 +1,20 @@
from dataclasses import dataclass
from datetime import datetime
from typing import Callable, Awaitable
import logging
from ppgee.parser import parse_frequency_history
logger = logging.getLogger(__name__)
@dataclass
class HistoryEntry:
class AttendencyHistoryEntry:
year: int
month: int
asked: datetime
confirmed: datetime | None
class History(list[HistoryEntry]):
class AttendencyHistory(list[AttendencyHistoryEntry]):
def __str__(self) -> str:
out: list[str] = []
for entry in self:
@@ -24,28 +23,24 @@ class History(list[HistoryEntry]):
return "\n".join(out)
class FrequencyPage:
def __init__(self, html, confirmation_callback):
self.html = html
self._history = History()
class AttendencyPage:
def __init__(
self,
history: AttendencyHistory,
confirmation_callback: Callable[[], Awaitable[str]],
available: bool,
):
self._history = history
self._available = available
self.confirmation_callback = confirmation_callback
def _build_history(self):
result_list = parse_frequency_history(self.html)
for item in result_list:
self._history.append(HistoryEntry(**item))
def history(self) -> History:
if not self._history:
self._build_history()
def history(self) -> AttendencyHistory:
return self._history
def is_available(self):
if "Opção não disponível" in self.html:
return False
return True
return self._available
async def confirm(self) -> None:
if self.is_available():
logger.info("Requesting frequency confirmation...")
logger.info("Requesting attendency confirmation...")
await self.confirmation_callback()

46
ppgee/parser.py
View File

@@ -1,46 +0,0 @@
from datetime import datetime
import re
from bs4 import BeautifulSoup
MONTH_MAP = {
"Janeiro": 1,
"Fevereiro": 2,
"Março": 3,
"Abril": 4,
"Maio": 5,
"Junho": 6,
"Julho": 7,
"Agosto": 8,
"Setembro": 9,
"Outubro": 10,
"Novembro": 11,
"Dezembro": 12,
}
def parse_frequency_history(html) -> list[dict]:
history = []
soup = BeautifulSoup(html, "html.parser")
table = soup.find_all("table")[2].find_all("table")[-1]
rows = table.find_all("tr")
for row in rows[1:]:
cols = row.find_all("td")
data = [ele.text.strip() for ele in cols]
year = int(data[0])
month = MONTH_MAP[data[1]]
date_asked = datetime.strptime(data[2], "%d/%m/%Y%H:%M")
date_confirmed = re.sub(r"[^[0-9:/]]*", "", data[3])
if date_confirmed == "":
date_confirmed = None
else:
date_confirmed = datetime.strptime(date_confirmed, "%d/%m/%Y%H:%M")
history.append(
{
"year": year,
"month": month,
"asked": date_asked,
"confirmed": date_confirmed,
}
)
return history

5
ppgee/parsers/__init__.py Normal file
View File

@@ -0,0 +1,5 @@
from .attendency import AttendencyParser
__all__ = [
"AttendencyParser",
]

53
ppgee/parsers/attendency.py Normal file
View File

@@ -0,0 +1,53 @@
from datetime import datetime
import re
from bs4 import BeautifulSoup
MONTH_MAP = {
"Janeiro": 1,
"Fevereiro": 2,
"Março": 3,
"Abril": 4,
"Maio": 5,
"Junho": 6,
"Julho": 7,
"Agosto": 8,
"Setembro": 9,
"Outubro": 10,
"Novembro": 11,
"Dezembro": 12,
}
class AttendencyParser:
def __init__(self, html: str) -> None:
self._html = html
def history(self) -> list[dict]:
history = []
soup = BeautifulSoup(self._html, "html.parser")
table = soup.find_all("table")[2].find_all("table")[-1]
rows = table.find_all("tr")
for row in rows[1:]:
cols = row.find_all("td")
data = [ele.text.strip() for ele in cols]
year = int(data[0])
month = MONTH_MAP[data[1]]
date_asked = datetime.strptime(data[2], "%d/%m/%Y%H:%M")
date_confirmed = re.sub(r"[^[0-9:/]]*", "", data[3])
if date_confirmed == "":
date_confirmed = None
else:
date_confirmed = datetime.strptime(date_confirmed, "%d/%m/%Y%H:%M")
history.append(
{
"year": year,
"month": month,
"asked": date_asked,
"confirmed": date_confirmed,
}
)
return history
def availability(self) -> bool:
return "Opção não disponível" not in self._html

11
ppgee/permissions.py Normal file
View File

@@ -0,0 +1,11 @@
from functools import wraps
def is_logged_check(method):
@wraps(method)
def wrapper(self, *args, **kwargs):
if not self.is_logged:
raise Exception("You must be logged in to use this method")
return method(self, *args, **kwargs)
return wrapper

2
pyproject.toml
View File

@@ -1,6 +1,6 @@
[tool.poetry]
name = "ppgee"
version = "0.1.3"
version = "0.1.4"
description = ""
authors = ["tiagovla <tiagovla@gmail.com>"]

2
tests/test_ppgee.py
View File

@@ -2,4 +2,4 @@ from ppgee import __version__
def test_version():
assert __version__ == "0.1.3"
assert __version__ == "0.1.4"