working (feature complete) news_fetch

news_check/server/app.py

@@ -1,5 +1,7 @@
 from flask import Flask, send_from_directory, request
+import os
 import configuration
+
 models = configuration.models
 db = configuration.db
 app = Flask(__name__)
@@ -30,9 +32,9 @@ def get_article_by_id(id):
         return article.to_dict()
 
 @app.route("/api/article/first")
-def get_article_first():
+def get_article_first(min_id=0):
     with db:
-        article = models.ArticleDownload.select(models.ArticleDownload.id).where(models.ArticleDownload.verified == 0).order_by(models.ArticleDownload.id).first()
+        article = models.ArticleDownload.select(models.ArticleDownload.id).where((models.ArticleDownload.verified == 0) & (models.ArticleDownload.id > min_id)).order_by(models.ArticleDownload.id).first()
         return {"id" : article.id}
 
 @app.route("/api/article/<int:id>/next")
@@ -41,27 +43,44 @@ def get_article_next(id):
         if models.ArticleDownload.get_by_id(id + 1).verified == 0:
             return {"id" : id + 1}
         else:
-            return get_article_first()
+            return get_article_first(min_id=id) # if the current article was skipped, but the +1 is already verified, get_first will return the same article again. so specify min id.
 
 
 
 @app.route("/api/article/<int:id>/set", methods=['POST'])
 def set_article(id):
-    action = request.json['action']
+    try:
+        action = request.json.get('action', None)
+    except Exception as e:
+        print(f"Exception in set_article {e}")
+        action = None
     with db:
         article = models.ArticleDownload.get_by_id(id)
-        if action == "a":
-            article.verified = 1
-        elif action == "b":
-            article.verified = -1
-        elif action == "r":
-            article.set_related()
-        article.save()
-        return "ok"
+        if action:
+            if action  == "a":
+                article.verified = 1
+            elif action == "b":
+                article.verified = -1
+        else: # implicitly action == "r":
+            print(request.files)
+            file = request.files.get("file", None)
+            if file is None: # upload tends to crash
+                return "No file uploaded", 400
 
+            artname, _ = os.path.splitext(article.file_name)
+            fname =  f"{artname} -- related_{article.related.count() + 1}.{file.filename.split('.')[-1]}"
+            fpath = os.path.join(article.save_path, fname)
+            print(fpath)
+            file.save(fpath)
+            article.set_related([fname])
+            return {"file_path": fpath}
+
+        article.save()
+    return "ok"
 
 
 
 
 if __name__ == "__main__":
-    app.run(host="0.0.0.0", port="80")
+    debug = os.getenv("DEBUG", "false") == "true"
+    app.run(host="0.0.0.0", port="80", debug=debug)

news_check/server/configuration.py

@@ -1,5 +1,6 @@
 from peewee import PostgresqlDatabase
 import configparser
+import time
 
 main_config = configparser.ConfigParser()
 main_config.read("/app/containerdata/config/news_fetch.config.ini")
@@ -8,6 +9,7 @@ db_config = configparser.ConfigParser()
 db_config.read("/app/containerdata/config/db.config.ini")
 
 cred = db_config["DATABASE"]
+time.sleep(10) # wait for the vpn to connect (can't use a healthcheck because there is no depends_on)
 db = PostgresqlDatabase(
     cred["db_name"], user=cred["user_name"], password=cred["password"], host="vpn", port=5432
 )