Planner-Webservice verschoben.

webservice/file_io.py → planner/webservice/file_io.py

@@ -4,6 +4,8 @@ import json
 from flask_cors import CORS
 from datetime import datetime
 import hashlib
+import time
+
 
 app = Flask(__name__)
 # cors = CORS(app, resources={r"/*": {"origins": "http://localhost:4200/"}})
@@ -20,18 +22,39 @@ def list_json():
 
 
 def list_dict():
-    result = {}
+    result = {'list': [], 'tree': {}}
     for currentFile in save_dir.iterdir():
         if currentFile.is_file() and currentFile.name[-5:] == '.json':
-            name_split = currentFile.name[:-5].split("_")
-            current_list = result.get(name_split[0], [])
-            current_list.append(name_split[1])
-            result[name_split[0]] = current_list
+            year, version, timestamp = currentFile.name[:-5].split("_")
+            if year not in result['tree']:
+                result['tree'][year] = {}
+            if version not in result['tree'][year]:
+                result['tree'][year][version] = []
+            result['tree'][year][version].append(timestamp)
+            result['list'].append({'year': year, 'version': version, 'timestamp': timestamp})
     return result
 
 
+@app.route('/load/<year>/<version>/<timestamp>', methods=['GET'])
+def load(year, version, timestamp):
+    file = full_filename(year, version, timestamp)
+
+    if not Path(file).exists():
+        file_list = list_dict()
+        timestamp = file_list['tree'][year][version][-1]
+        file = full_filename(year, version, timestamp)
+
+    print(file)
+    time.sleep(2)
+    return open(file, 'r').read()
+
+
+def full_filename(year, version, timestamp):
+    return f'{str(save_dir)}/{year}_{version}_{timestamp}.json'
+
+
 @app.route('/load/<filename>', methods=['GET'])
-def load(filename):
+def load_file(filename):
     full_filename = f'{str(save_dir)}/{filename}.json'
     if not Path(full_filename).exists():
         file_list = list_dict()