diff --git a/ozgursozluk/__init__.py b/ozgursozluk/__init__.py index ecd33b4..f47b34b 100644 --- a/ozgursozluk/__init__.py +++ b/ozgursozluk/__init__.py @@ -1,7 +1,7 @@ from flask import Flask -__version__ = "0.6.1" +__version__ = "0.6.2" __author__ = "beucismis" __source__ = "https://github.com/beucismis/ozgursozluk" __description__ = "a free and open source alternative ekşi sözlük front-end" diff --git a/ozgursozluk/api.py b/ozgursozluk/api.py index 217f938..953c5bc 100644 --- a/ozgursozluk/api.py +++ b/ozgursozluk/api.py @@ -5,13 +5,15 @@ from flask import abort from bs4 import BeautifulSoup from fake_useragent import UserAgent -from ozgursozluk.config import DEFAULT_EKSI_BASE_URL +from ozgursozluk.configs import DEFAULT_EKSI_SOZLUK_BASE_URL from ozgursozluk.models import Entry, EntryTopic, Topic, Author, Gundem, Debe -class Eksi: +class EksiSozluk: def __init__( - self, base_url: str = DEFAULT_EKSI_BASE_URL, headers: Optional[dict] = None, + self, + base_url: str = DEFAULT_EKSI_SOZLUK_BASE_URL, + headers: Optional[dict] = None, ) -> None: self.base_url = base_url self.session = requests.Session() diff --git a/ozgursozluk/templates/settings.html b/ozgursozluk/templates/settings.html index 859cc84..2852236 100644 --- a/ozgursozluk/templates/settings.html +++ b/ozgursozluk/templates/settings.html @@ -10,36 +10,45 @@
") def search(q: str): """Search route.""" - return render_template("topic.html", topic=eksi.search_topic(q), p=1, a=None) + return render_template("topic.html", topic=es.search_topic(q), p=1, a=None) @ozgursozluk.app.route("/settings", methods=["GET", "POST"]) @@ -113,8 +119,8 @@ def settings(): expires=expires(), ) response.set_cookie( - "eksi_base_url", - request.form["eksi_base_url"], + "eksi_sozluk_base_url", + request.form["eksi_sozluk_base_url"], expires=expires(), ) @@ -122,17 +128,17 @@ def settings(): return render_template( "settings.html", - theme=request.cookies.get( + default_theme=request.cookies.get( "theme", DEFAULT_THEME, ), - display_pinned_topics=request.cookies.get( + default_display_pinned_topics=request.cookies.get( "display_pinned_topics", DEFAULT_DISPLAY_PINNED_TOPICS, ), - display_author_nicknames=request.cookies.get( + default_display_author_nicknames=request.cookies.get( "display_author_nicknames", DEFAULT_DISPLAY_AUTHOR_NICKNAMES, ), - eksi_base_url=request.cookies.get( - "eksi_base_url", DEFAULT_EKSI_BASE_URL, + default_eksi_sozluk_base_url=request.cookies.get( + "eksi_sozluk_base_url", DEFAULT_EKSI_SOZLUK_BASE_URL, ), ) diff --git a/tests.py b/tests.py index d49ad1f..f7623f8 100644 --- a/tests.py +++ b/tests.py @@ -1,11 +1,11 @@ import unittest -from ozgursozluk.api import Eksi +from ozgursozluk.api import EksiSozluk -eksi = Eksi() -topic = eksi.search_topic("linux") -entry = eksi.get_entry(1) +es = EksiSozluk() +topic = es.search_topic("linux") +entry = es.get_entry(1) class TestTopic(unittest.TestCase):