Hide unclaimed scratches (#1823)

* Don't show unclaimed scratches in frontend

* logging. should be logger.

* woops

Author: mkst

backend/coreapp/compiler_wrapper.py

@@ -182,7 +182,7 @@ def compile_code(
                 cc_cmd = cc_cmd.replace("-non_shared", "")
 
             if compiler.platform != platforms.DUMMY and not compiler.path.exists():
-                logging.warning("%s does not exist, creating it!", compiler.path)
+                logger.warning("%s does not exist, creating it!", compiler.path)
                 compiler.path.mkdir(parents=True)
 
             # Run compiler
@@ -220,16 +220,16 @@ def compile_code(
                     timeout=settings.COMPILATION_TIMEOUT_SECONDS,
                 )
                 et = round(time.time() * 1000)
-                logging.debug(f"Compilation finished in: {et - st} ms")
+                logger.debug(f"Compilation finished in: {et - st} ms")
             except subprocess.CalledProcessError as e:
                 # Compilation failed
                 msg = e.stdout
 
-                logging.debug("Compilation failed: %s", msg)
+                logger.debug("Compilation failed: %s", msg)
                 raise CompilationError(CompilerWrapper.filter_compile_errors(msg))
             except ValueError as e:
                 # Shlex issue?
-                logging.debug("Compilation failed: %s", e)
+                logger.debug("Compilation failed: %s", e)
                 raise CompilationError(str(e))
             except subprocess.TimeoutExpired:
                 raise CompilationError("Compilation failed: timeout expired")
@@ -238,7 +238,7 @@ def compile_code(
                 error_msg = (
                     "Compiler did not create an object file: %s" % compile_proc.stdout
                 )
-                logging.debug(error_msg)
+                logger.debug(error_msg)
                 raise CompilationError(error_msg)
 
             object_bytes = object_path.read_bytes()

backend/coreapp/filters/scratch.py

@@ -0,0 +1,21 @@
+from typing import Optional
+import django_filters
+
+from django.db.models.query import QuerySet
+
+from ..models.scratch import Scratch
+
+
+class ScratchFilter(django_filters.FilterSet):
+    has_owner = django_filters.BooleanFilter(method="filter_has_owner")
+
+    def filter_has_owner(
+        self, queryset: QuerySet[Scratch], name: str, value: Optional[bool]
+    ) -> QuerySet[Scratch]:
+        if value is None:
+            return queryset
+        return queryset.filter(owner__isnull=not value)
+
+    class Meta:
+        model = Scratch
+        fields = ["platform", "compiler", "preset"]

backend/coreapp/views/scratch.py

@@ -31,6 +31,7 @@
 from ..decorators.django import condition
 from ..diff_wrapper import DiffWrapper
 from ..error import CompilationError, DiffError
+from ..filters.scratch import ScratchFilter
 from ..filters.search import NonEmptySearchFilter
 from ..flags import Language
 from ..libraries import Library
@@ -292,7 +293,7 @@ class ScratchViewSet(
         .annotate(match_percent=match_percent)
     )
     pagination_class = ScratchPagination
-    filterset_fields = ["platform", "compiler", "preset"]
+    filterset_class = ScratchFilter
     filter_backends = [
         django_filters.rest_framework.DjangoFilterBackend,
         NonEmptySearchFilter,

frontend/src/app/(navfooter)/page.tsx

@@ -41,7 +41,7 @@ export default function Page() {
                 </section>
                 <section className="md:w-1/2 lg:w-3/4">
                     <h2 className="mb-2 text-lg">Recent activity</h2>
-                    <ScratchList url="/scratch?page_size=20" />
+                    <ScratchList url="/scratch?page_size=20&has_owner=true" />
                 </section>
             </div>
         </main>

frontend/src/app/(navfooter)/platform/[id]/page.tsx

@@ -80,7 +80,7 @@ export default async function Page(props: { params: Promise<{ id: number }> }) {
 
             <section>
                 <ScratchList
-                    url={`/scratch?platform=${platform.id}&page_size=20`}
+                    url={`/scratch?platform=${platform.id}&page_size=20&has_owner=true`}
                     item={ScratchItemPlatformList}
                     isSortable={true}
                     title={`Scratches (${scratch_count.num_scratches.toLocaleString("en-US")})`}

frontend/src/app/(navfooter)/preset/[id]/page.tsx

@@ -70,7 +70,7 @@ export default async function Page(props: { params: Promise<{ id: number }> }) {
 
             <section>
                 <ScratchList
-                    url={`/scratch?preset=${preset.id}&page_size=20`}
+                    url={`/scratch?preset=${preset.id}&page_size=20&has_owner=true`}
                     item={ScratchItemPresetList}
                     isSortable={true}
                     title={`Scratches (${preset.num_scratches.toLocaleString("en-US")})`}