From 69657de858447f5fdb261df683e471b1994e734a Mon Sep 17 00:00:00 2001 From: vas3k Date: Sun, 5 Jan 2020 22:46:33 +0100 Subject: [PATCH] Improve CSS colors for fresh articles --- boards.yml | 2 +- scripts/update.py | 18 ++++++++++-------- static/css/components.css | 4 +++- static/css/theme.css | 8 ++++++++ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/boards.yml b/boards.yml index 8e79018..917ed82 100644 --- a/boards.yml +++ b/boards.yml @@ -125,7 +125,7 @@ boards: - name: Следим за скидками и распродажами slug: sales feeds: - - name: PeritoBurrito + - name: Perito Burrito url: https://perito-burrito.com rss: http://perito-burrito.com/feed - name: Путешествуем diff --git a/scripts/update.py b/scripts/update.py index 842ce44..d0c67ba 100644 --- a/scripts/update.py +++ b/scripts/update.py @@ -96,7 +96,8 @@ def refresh_feed(item): feed_id=item["id"], uniq_id=entry.id if hasattr(entry, "id") else entry.link, defaults=dict( - url=entry.link, + url=entry.link[:2000], + domain=parse_domain(entry.link)[:256], created_at=parse_datetime(entry), updated_at=datetime.utcnow(), title=entry.title[:256] @@ -107,15 +108,12 @@ def refresh_feed(item): # parse heavy info try: real_url = resolve_real_url(entry) - except ConnectionError: - log.warning(f"Failed to parse URL: {entry.link}") - real_url = None - - if real_url: article.url = real_url[:2000] article.domain = parse_domain(real_url)[:256] + except ConnectionError: + log.warning(f"Failed to resolve real URL: {entry.link}") - summary, lead_image = parse_text_and_lead_image(entry) + summary, lead_image = parse_entry_text_and_image(entry) if summary: article.description = summary[:1000] @@ -163,7 +161,7 @@ def parse_datetime(entry): return datetime.utcnow() -def parse_text_and_lead_image(entry): +def parse_entry_text_and_image(entry): bs = BeautifulSoup(entry.summary, features="lxml") text = re.sub(r"\s\s+", " ", bs.text or "").strip() @@ -176,5 +174,9 @@ def parse_text_and_lead_image(entry): return text, "" +def load_and_parse_full_article_text_and_image(url): + pass + + if __name__ == '__main__': update() diff --git a/static/css/components.css b/static/css/components.css index 6373f15..2b1a32a 100644 --- a/static/css/components.css +++ b/static/css/components.css @@ -278,24 +278,26 @@ .article-tooltip-title { display: block; font-weight: bold; - font-size: 90%; } .article-tooltip-description { display: block; font-weight: normal; font-size: 70%; + margin-top: 10px; } .article-tooltip-info { display: block; font-weight: normal; font-size: 70%; + margin-top: 10px; } .is-article-fresh { font-weight: 600; + color: var(--brighter-text-color); } .message-popup { diff --git a/static/css/theme.css b/static/css/theme.css index 2d81f66..0c56024 100644 --- a/static/css/theme.css +++ b/static/css/theme.css @@ -8,10 +8,14 @@ body { .light-theme { --bg-color: #FFF; --opposite-bg-color: #282c35; + --text-color: #333; + --brighter-text-color: #000; --opposite-text-color: #DDD; + --link-color: #333; --visited-link-color: #afafaf; + color: var(--text-color); background-color: var(--bg-color); } @@ -19,10 +23,14 @@ body { .dark-theme { --bg-color: #282c35; --opposite-bg-color: #FFF; + --text-color: #DDD; + --brighter-text-color: #FFF; --opposite-text-color: #333; + --link-color: #DDD; --visited-link-color: #737373; + color: var(--text-color); background-color: var(--bg-color); }