Добавили поддержку базы джанных Flask-SQLAlchemy

Author: korneevm

.gitignore

@@ -1,4 +1,5 @@
 .vscode/
 __pycache__/
 env/
-config.py
+config.py
+*.db

create_db.py

@@ -0,0 +1,3 @@
+from webapp import db, create_app
+
+db.create_all(app=create_app())

get_all_news.py

@@ -0,0 +1,6 @@
+from webapp import create_app
+from webapp.python_org_news import get_python_news
+
+app = create_app()
+with app.app_context():
+    get_python_news()

webapp/__init__.py

@@ -1,17 +1,18 @@
 from flask import Flask, render_template
 
-from webapp.python_org_news import get_python_news
+from webapp.model import db, News
 from webapp.weather import weather_by_city
 
 def create_app():
     app = Flask(__name__)
     app.config.from_pyfile('config.py')
+    db.init_app(app)
 
     @app.route('/')
     def index():
         title = "Новости Python"
         weather = weather_by_city(app.config['WEATHER_DEFAULT_CITY'])
-        news_list = get_python_news()
+        news_list = News.query.order_by(News.published.desc()).all()
         return render_template('index.html', page_title=title, weather=weather, news_list=news_list)
 
     return app

webapp/model.py

@@ -0,0 +1,13 @@
+from flask_sqlalchemy import SQLAlchemy
+
+db = SQLAlchemy()
+
+class News(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String, nullable=False)
+    url = db.Column(db.String, unique=True, nullable=False)
+    published = db.Column(db.DateTime, nullable=False)
+    text = db.Column(db.Text, nullable=True)
+
+    def __repr__(self):
+        return '<News {} {}>'.format(self.title, self.url)

webapp/python_org_news.py

@@ -1,6 +1,10 @@
+from datetime import datetime
+
 import requests
 from bs4 import BeautifulSoup
 
+from webapp.model import db, News
+
 def get_html(url):
     try:
         result = requests.get(url)
@@ -20,10 +24,16 @@ def get_python_news():
             title = news.find('a').text
             url = news.find('a')['href']
             published = news.find('time').text
-            result_news.append({
-                "title": title,
-                "url": url,
-                "published": published
-            })
-        return result_news
-    return False
+            try:
+                published = datetime.strptime(published, '%Y-%m-%d')
+            except ValueError:
+                published = datetime.now()
+            save_news(title, url, published)
+
+def save_news(title, url, published):
+    news_exists = News.query.filter(News.url == url).count()
+    print(news_exists)
+    if not news_exists:
+        news_news = News(title=title, url=url, published=published)
+        db.session.add(news_news)
+        db.session.commit()

webapp/templates/index.html

@@ -18,7 +18,7 @@ <h1>{{ page_title }}</h1>
             <h2>Новости</h2>
             {% for news in news_list %}
             <h3><a href="{{ news.url }}">{{ news.title }}</a></h3>
-            <p>{{ news.published }}</p>
+            <p>{{ news.published.strftime('%d.%m.%Y') }}</p>
             <hr />
             {% endfor %}
         </div>