fixes, added button on capacity.py

Author: t33nsy

app/api/files.py

@@ -145,12 +145,14 @@ def upload_presentation() -> (dict, int):
             'message': 'Presentation file should not exceed {}MB.'.format(
                 Config.c.constants.presentation_file_max_size_in_megabytes
             )
-        }, 404
+        }, 413
     # check if file can be stored (*2.5 is an estimate of pdf and preview)
     if not DBManager().check_storage_limit(request.content_length * 2.5):
         return {
-            'message': "Not enough place in database to store file"
-        }, 404
+            'message': "Not enough space in database to store file. "
+                        "Please contact at email: "
+                        f"<a href='mailto:{Config.c.bugreport.report_mail}'>{Config.c.bugreport.report_mail}</a>"
+        }, 413
 
     presentation_file = request.files['presentation']
 

app/mongo_odm.py

@@ -33,12 +33,12 @@
 BYTES_PER_MB = 1024*1024    
 
 class DBManager:
-    def __new__(cls, max_size=20000): # max_size only on first creation, in MB
+    def __new__(cls):
         if not hasattr(cls, 'init_done'):
             cls.instance = super(DBManager, cls).__new__(cls)
             connect(Config.c.mongodb.url + Config.c.mongodb.database_name)
             cls.instance.storage = GridFSStorage(GridFSBucket(_get_db()))
-            cls.instance.max_size = max_size * BYTES_PER_MB
+            cls.instance.max_size = float(Config.c.constants.storage_max_size_mbytes) * BYTES_PER_MB
             cls.init_done = True
         return cls.instance
 
@@ -111,7 +111,15 @@ def check_storage_limit(self, new_file_size):
         )
         logger.info(inf_msg)
         return False if current_size + new_file_size > self.max_size else True
-
+    
+    def recalculate_used_storage_data(self):
+        total_size = 0
+        db = _get_db()
+        for file_doc in db.fs.files.find():
+            total_size += file_doc['length']
+        self.set_used_storage_size(total_size)
+        logger.info(f"Storage size recalculated: {total_size/BYTES_PER_MB:.2f} MB")
+        
 
 class TrainingsDBManager:
     def __new__(cls):

app/routes/capacity.py

@@ -23,4 +23,10 @@ def storage_capacity():
         max_size=round(max_size / BYTES_PER_MB, 2),
         ratio=round(ratio * 100, 1)
     )
-    
+    
+@routes_capacity.route('/refresh_capacity', methods=['POST'])
+def refresh_capacity():
+    if not is_admin():
+        return {}, 404
+    DBManager().recalculate_used_storage_data()
+    return {'message': 'OK'}

app/static/js/upload.js

@@ -26,6 +26,17 @@ $(function(){
                 return;
             }
             $("#spinner").hide();
+
+            if (response.status == 413) {
+                response.json().then(responseJson => {
+                    $("#alert").show();
+                    $("#error-text").html(responseJson["message"] || "Файл слишком большой или превышает лимит хранилища");
+                });
+                $('#button-submit')[0].value = button_value;
+                
+                return;
+            }
+
             response.json().then(responseJson => {
                 if (responseJson["message"] !== "OK"){
                     $("#alert").show();

app/templates/admin.html

@@ -13,5 +13,7 @@
     <a href="{{ url_for("routes_admin.view_dumps")}}" target="_blank">{{ t("Архивы БД") }}</a>
     <br>
     <a href="{{ url_for("routes_version.view_version")}}" target="_blank">{{ t("Версия") }}</a>
+    <br>
+    <a href="{{ url_for("routes_capacity.storage_capacity")}}" target="_blank">{{ t("Заполненность БД") }}</a>
 </div>
 {% endblock %}

app/templates/capacity.html

@@ -14,6 +14,16 @@ <h4 class="card-title">Загруженность Базы Данных</h4>
                 </div>
             </div>
         </div>
+        <button type="button" id="refresh_button">Обновить данные</button>
+
+        <script src="/static/js/libraries/jquery.min.js"></script>
+        <script>
+            $('#refresh_button').click(function() {
+                $.post("{{ url_for('routes_capacity.refresh_capacity') }}", {}, function(data) {
+                    location.reload();
+                });
+            });
+        </script>
     </div>
 </div>
 {% endblock %}

app_conf/config.ini

@@ -5,6 +5,7 @@ lti_consumer_key=secretconsumerkey
 lti_consumer_secret=supersecretconsumersecret
 version_file=VERSION.json
 backup_path=../dump/database-dump/
+storage_max_size_mbytes=20000
 
 [mongodb]
 url=mongodb://db:27017/

app_conf/testing.ini

@@ -5,6 +5,7 @@ lti_consumer_key=testing_lti_consumer_key
 lti_consumer_secret=testing_lti_consumer_secret
 version_file=VERSION.json
 backup_path=../dump/database-dump/
+storage_max_size_mbytes=20000
 
 [mongodb]
 url=mongodb://db:27017/