Update Gradle to v9

Reviewed-on: #7

.gitea/workflows/build.yml

@@ -1,11 +1,12 @@
 name: Build
 on:
-  push:
+  pull_request:
     branches:
-      - '*'
+      - master
+
 jobs:
   build:
-    runs-on: standard-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.gitea/workflows/deploy.yml

@@ -1,11 +1,12 @@
 name: Deploy
 on:
   push:
-    tags:
+    branches:
-      - 'v*'
+      - master
+
 jobs:
   build:
-    runs-on: standard-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -18,10 +19,10 @@ jobs:
           cache: 'gradle'
 
       - name: Build Jar
-        run: ./gradlew bootJar
+        run: ./gradlew bootJar --no-daemon
 
       - name: Build Container
-        run: docker build --tag gitea.seeseepuff.be/seeseemelk/pcinv:${{github.ref_name}} .
+        run: docker build --tag gitea.seeseepuff.be/seeseemelk/pcinv:latest .
 
       - name: Login
         with: # Set the secret as an input
@@ -29,4 +30,4 @@ jobs:
         run: docker login gitea.seeseepuff.be -u seeseemelk -p ${{ secrets.PACKAGE_RW }}
 
       - name: Push Container
-        run: docker push gitea.seeseepuff.be/seeseemelk/pcinv:${{github.ref_name}}
+        run: docker push gitea.seeseepuff.be/seeseemelk/pcinv:latest

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -23,8 +23,8 @@
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
+@rem Set local scope for the variables, and ensure extensions are enabled
-if "%OS%"=="Windows_NT" setlocal
+setlocal EnableExtensions
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,30 +65,18 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:end
+:exitWithErrorLevel
-@rem End local scope for the variables with windows NT shell
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
-if %ERRORLEVEL% equ 0 goto mainEnd
+"%COMSPEC%" /c exit %ERRORLEVEL%
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

src/main/java/be/seeseepuff/pcinv/controllers/WebController.java

@@ -1,5 +1,6 @@
 package be.seeseepuff.pcinv.controllers;
 
+import be.seeseepuff.pcinv.models.Asset;
 import be.seeseepuff.pcinv.models.WorkLogEntry;
 import be.seeseepuff.pcinv.services.AssetService;
 import be.seeseepuff.pcinv.services.BuildService;
@@ -94,7 +95,12 @@ public class WebController {
         model.addAttribute(DESCRIPTOR, assetService.getAssetDescriptor(type));
         model.addAttribute(DESCRIPTORS, tree);
         model.addAttribute(PROPERTIES, tree.stream().flatMap(d -> d.getProperties().stream()).toList());
-        model.addAttribute(ASSETS, assetService.getAssetsByType(type));
+        var assets = assetService.getAssetsByType(type);
+        assets.sort(Comparator
+                .comparing((Asset a) -> a.getAsset().getBrand(), Comparator.nullsFirst(Comparator.naturalOrder()))
+                .thenComparing((Asset a) -> a.getAsset().getModel(), Comparator.nullsFirst(Comparator.naturalOrder()))
+                .thenComparing(Asset::getQr));
+        model.addAttribute(ASSETS, assets);
         return "browse_type";
     }
 

src/main/java/be/seeseepuff/pcinv/meta/CapacityInfo.java

@@ -44,6 +44,10 @@ public class CapacityInfo {
     }
 
     public static CapacityUnit idealUnitForCapacity(long capacity, CapacityUnit[] units) {
+        if (capacity <= 0) {
+            return CapacityUnit.BYTES; // Default to bytes for non-positive capacities
+        }
+
         return Arrays.stream(units)
                 .sorted(Comparator.comparing(CapacityUnit::getBytes).reversed())
                 .filter(unit -> capacity % unit.getBytes() == 0)

src/main/java/be/seeseepuff/pcinv/models/HddAsset.java

@@ -57,16 +57,16 @@ public class HddAsset implements Asset
 	@InputList
 	private String driveType;
 
-	@Description("Number of heads in the drive.")
-	@Property("Heads")
-	@HideInOverview
-	private Integer heads;
-
 	@Description("Number of cylinders in the drive.")
 	@Property("Cylinders")
 	@HideInOverview
 	private Integer cylinders;
 
+	@Description("Number of heads in the drive.")
+	@Property("Heads")
+	@HideInOverview
+	private Integer heads;
+
 	@Description("Number of sectors in the drive.")
 	@Property("Sectors")
 	@HideInOverview

src/main/resources/templates/browse_type.html

@@ -9,7 +9,8 @@
         <tr th:each="a : ${assets}">
             <td th:each="p : ${properties}" th:if="${!p.hideInOverview}">
                 <a th:if="${p.name == 'qr'}" th:href="'/view/'+${a.getQr()}" th:text="${p.renderValue(a)}"></a>
-                <span th:if="${p.name != 'qr'}" th:text="${p.renderValue(a)}"></span>
+                <a th:if="${p.name == 'build' && a.getAsset().getBuild() != null}" th:href="'/build/'+${a.getAsset().getBuild().getId()}" th:text="${p.renderValue(a)}"></a>
+                <span th:if="${p.name != 'qr' && (p.name != 'build' || a.getAsset().getBuild() == null)}" th:text="${p.renderValue(a)}"></span>
             </td>
             <td>
                 <a th:href="'/view/'+${a.getQr()}">View</a>

src/main/resources/templates/build_view.html

@@ -15,7 +15,7 @@
         </tr>
         <tr th:each="p : ${build.getParts()}">
             <td><a th:href="'/view/' + ${p.qr}" th:text="${p.qr}"></a></td>
-            <td th:text="${descriptors.getDescriptorForType(p.type).displayName}"></td>
+            <td><a th:href="'/browse/' + ${p.type}" th:text="${descriptors.getDescriptorForType(p.type).displayName}"></a></td>
             <td th:text="${descriptors.getGenericProperty('brand').renderValue(p)}"></td>
             <td th:text="${descriptors.getGenericProperty('model').renderValue(p)}"></td>
         </tr>

src/main/resources/templates/view.html

@@ -7,7 +7,10 @@
     <table border="1" cellpadding="4">
       <tr th:each="p : ${d.properties}">
         <th bgcolor="lightgray"><b th:text="${p.displayName}"></b></th>
-        <td th:if="${p.name == 'build'}"><a th:href="'/build/' + ${asset.getAsset().getBuild().id}" th:text="${p.renderValue(asset)}"></a></td>
+        <td th:if="${p.name == 'build'}">
+          <a th:if="${asset.getAsset().getBuild() != null}" th:href="'/build/' + ${asset.getAsset().getBuild().id}" th:text="${p.renderValue(asset)}"></a>
+          <span th:if="${asset.getAsset().getBuild() == null}" th:text="${p.renderValue(asset)}"></span>
+        </td>
         <td th:if="${p.name != 'build'}" th:text="${p.renderValue(asset)}"></td>
       </tr>
     </table>