Merge pull request #3406 from JdeRobot/add-filesystem

Change structure to make it generic

Author: javizqh

.gitignore

@@ -13,6 +13,7 @@ build/
 develop-eggs/
 dist/
 downloads/
+filesystem/
 eggs/
 .eggs/
 lib/

exercises/admin.py academy/admin.pyexercises/admin.py renamed to academy/admin.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 
-class ExercisesConfig(AppConfig):
+class AcademyConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
-    name = "exercises"
+    name = "academy"

exercises/admin/change_list_ex.html academy/admin/change_list_ex.htmlexercises/admin/change_list_ex.html renamed to academy/admin/change_list_ex.html

@@ -0,0 +1,27 @@
+base_py_code = """import WebGUI
+import HAL
+import Frequency
+# Enter sequential code!
+
+while True:
+    # Enter iterative code!
+    Frequency.tick()
+"""
+
+base_cpp_code = """#include "HAL.hpp"
+#include "WebGUI.hpp"
+#include "Frequency.hpp"
+
+void exercise() {
+    Frequency freq = Frequency();
+    // Enter sequential code!
+
+    while (true)
+    {
+        // Enter iterative code!
+        freq.tick();
+
+
+    }
+}
+"""

exercises/admin/change_list_univ.html academy/admin/change_list_univ.htmlexercises/admin/change_list_univ.html renamed to academy/admin/change_list_univ.html

@@ -11,6 +11,7 @@
 from functools import wraps
 import json
 from .exceptions import (
+    BinaryNotSupported,
     ResourceNotExists,
     ResourceAlreadyExists,
     ParameterInvalid,
@@ -22,10 +23,11 @@
     ResourceAlreadyExists,
     ParameterInvalid,
     InvalidPath,
+    BinaryNotSupported,
 )
 
 
-def error_wrapper(type: str, param: list[str | tuple] = []):
+def error_wrapper(fal, type: str, param: list[str | tuple] = []):
     """
     Decorator for API views with parameter validation and error handling.
 
@@ -36,37 +38,26 @@ def error_wrapper(type: str, param: list[str | tuple] = []):
     Returns:
         function: Wrapped API view.
     """
+
     def decorated(func):
         @wraps(func)
         @api_view([type])
         def wrapper(request):
             try:
-                check_parameters(
-                    request.data if type == "POST" else request.GET,
-                    param
-                )
+                check_parameters(request.data if type == "POST" else request.GET, param)
                 return func(request)
             except CUSTOM_EXCEPTIONS as e:
                 print(str(e))
-                return Response({"error": str(e)}, status=e.error_code)
+                return Response({"message": str(e)}, status=e.error_code)
             except json.JSONDecodeError as e:
                 print(str(e))
-                return Response(
-                    {"error": f"Invalid JSON format: {str(e)}"},
-                    status=422
-                )
+                return Response({"error": f"Invalid JSON format: {str(e)}"}, status=422)
             except (binascii.Error, ValueError) as e:
                 print(str(e))
-                return Response(
-                    {"error": f"Invalid B64 format: {str(e)}"},
-                    status=422
-                )
+                return Response({"error": f"Invalid B64 format: {str(e)}"}, status=422)
             except Exception as e:
                 print(str(e))
-                return Response(
-                    {"error": f"An error occurred: {str(e)}"},
-                    status=500
-                )
+                return Response({"error": f"An error occurred: {str(e)}"}, status=500)
 
         return wrapper
 

exercises/apps.py academy/apps.pyexercises/apps.py renamed to academy/apps.py

@@ -44,3 +44,15 @@ def __init__(self, msg):
 
     def __str__(self):
         return f"{self.message}"
+
+
+class BinaryNotSupported(Exception):
+    """Exception raised for trying to read a binary file."""
+
+    def __init__(self, msg):
+        self.message = f"Reading {msg} is not supported"
+        super().__init__(self.message)
+        self.error_code = 415
+
+    def __str__(self):
+        return f"{self.message}"