fix

pyproject.toml

@@ -7,7 +7,7 @@ nauta = "nauta.cli:app"
 
 [project]
 name = "nauta"
-version = "0.1.0"
+version = "0.1.1"
 authors = [{ name = "Raúl Cobiellas", email = "[email protected]" }]
 description = "Línea de comandos para el nauta hogar Cuba"
 readme = "README.md"

src/nauta/cli.py

@@ -1,10 +1,10 @@
 # pylint: disable=w0622
 import typer
-from nauta.commands.account import add, delete, list, default, password, info
+
+from nauta.commands.account import add, default, delete, info, list, password
 from nauta.commands.session import login, logout, time
 from nauta.database import initialize_database
 
-
 initialize_database()
 
 

src/nauta/client.py

@@ -1,10 +1,12 @@
 import re
-import typer
+
 import requests
+import typer
 from bs4 import BeautifulSoup
 from requests import ConnectionError, ReadTimeout
-from nauta.constants import HOST_URL, LOGOUT_URL, AVAILABLE_TIME_URL
-from nauta.database import add_session, get_session, delete_session
+
+from nauta.constants import AVAILABLE_TIME_URL, HOST_URL, LOGOUT_URL
+from nauta.database import add_session, delete_session, get_session
 
 
 class NautaClient(object):
@@ -111,33 +113,37 @@ def logout(self, force=False):
                 )
                 return
 
-            available_time = self.available_time()
+            available_time = None
 
-            resp = requests.post(
-                LOGOUT_URL,
-                data={
-                    "CSRFHW": session.csrfhw,
-                    "username": session.username,
-                    "ATTRIBUTE_UUID": session.attribute_uuid,
-                    "wlanuserip": session.wlanuserip,
-                },
-                headers={"content-type": "application/x-www-form-urlencoded"},
-                timeout=60,
-            )
+            if not force:
 
-            if not resp.ok and not force:
-                typer.echo(typer.style(resp.reason, fg="red", bold=True))
-                return
+                available_time = self.available_time()
 
-            if "FAILURE" in resp.text.upper() and not force:
-                typer.echo(
-                    typer.style("No se pudo cerrar la sesión", fg="red", bold=True)
+                resp = requests.post(
+                    LOGOUT_URL,
+                    data={
+                        "CSRFHW": session.csrfhw,
+                        "username": session.username,
+                        "ATTRIBUTE_UUID": session.attribute_uuid,
+                        "wlanuserip": session.wlanuserip,
+                    },
+                    headers={"content-type": "application/x-www-form-urlencoded"},
+                    timeout=60,
                 )
-                return
 
-            if "SUCCESS" not in resp.text.upper() and not force:
-                typer.echo(typer.style(resp.text[:100], fg="red", bold=True))
-                return
+                if not resp.ok:
+                    typer.echo(typer.style(resp.reason, fg="red", bold=True))
+                    return
+
+                if "FAILURE" in resp.text.upper() and not force:
+                    typer.echo(
+                        typer.style("No se pudo cerrar la sesión", fg="red", bold=True)
+                    )
+                    return
+
+                if "SUCCESS" not in resp.text.upper() and not force:
+                    typer.echo(typer.style(resp.text[:100], fg="red", bold=True))
+                    return
 
             delete_session()
 
@@ -150,11 +156,12 @@ def logout(self, force=False):
                 nl=force,
             )
 
-            if available_time and not force:
+            if available_time:
 
                 typer.echo(
                     message=typer.style(
-                        f": {available_time} tiempo restante", bold=True
+                        f": {available_time} tiempo disponible para la próxima conexión",
+                        bold=True,
                     ),
                 )
 
@@ -202,7 +209,5 @@ def available_time(self) -> str:
 
         except (ConnectionError, ReadTimeout):
             typer.echo(
-                typer.style(
-                    ("No se pudo conectar con el servidor"), fg="red", bold=True
-                )
+                typer.style((" No se pudo obtener el tiempo"), fg="red", bold=True)
             )

src/nauta/commands/account.py

@@ -1,14 +1,15 @@
 import typer
 from typing_extensions import Annotated
+
 from nauta.database import (
-    list_account,
     add_account,
     delete_account,
+    get_account,
+    list_account,
     update_account,
     update_password,
-    get_account,
 )
-from nauta.secure import encrypt_password, decrypt_password, generate_key
+from nauta.secure import decrypt_password, encrypt_password, generate_key
 
 
 def add(

src/nauta/commands/session.py

@@ -1,5 +1,7 @@
 from typing import Annotated
+
 import typer
+
 from nauta.client import NautaClient
 from nauta.database import get_account
 from nauta.secure import decrypt_password, generate_key

src/nauta/database.py

@@ -1,10 +1,12 @@
 import os
-from typing import List
-import sqlite3
 import secrets
+import sqlite3
+from typing import List
+
 from appdirs import user_data_dir
+
+from nauta.constants import APP_AUTHOR, APP_NAME
 from nauta.models import Account, Session
-from nauta.constants import APP_NAME, APP_AUTHOR
 
 
 def get_global_db_path():

src/nauta/secure.py

@@ -1,5 +1,6 @@
 import base64
 from hashlib import sha256
+
 from nauta.database import get_secret