Add "auto" theme

theotherp · May 25, 2024 · f93614c · f93614c
1 parent 2587f7d
commit f93614c
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 3 deletions.
diff --git a/core/gulpfile.js b/core/gulpfile.js
@@ -129,7 +129,17 @@ gulp.task('less', function () {
         .pipe(sourcemaps.write("."))
         .pipe(gulp.dest(dest));
 
-    return merge(brightTheme, greyTheme, darkTheme);
+    var autoTheme = gulp.src(uiSrcFolder + '/less/auto.less')
+        .pipe(cached("auto"))
+        .on('error', swallowError)
+        .pipe(sourcemaps.init())
+        .pipe(less())
+        .on('error', swallowError)
+        .pipe(cleancss())
+        .pipe(sourcemaps.write("."))
+        .pipe(gulp.dest(dest));
+
+    return merge(brightTheme, greyTheme, darkTheme, autoTheme);
 });
 
 gulp.task('copy-assets', function () {
@@ -166,6 +176,7 @@ gulp.task('delMainLessCache', function () {
     delete cached.caches["bright"];
     delete cached.caches["grey"];
     delete cached.caches["dark"];
+    delete cached.caches["auto"];
 });
 
 gulp.task('copyStaticToClasses', function () {

diff --git a/core/src/main/java/org/nzbhydra/downloading/FileHandler.java b/core/src/main/java/org/nzbhydra/downloading/FileHandler.java
@@ -268,7 +268,7 @@ private NzbsDownload getNzbsAsFiles(Collection<Long> guids, Path targetDirectory
                 continue;
             }
             try {
-                String title = result.getFileName().replaceAll("[\\\\/:*?\"<>|]", "_");
+                String title = result.getFileName().replaceAll("[\\\\/:*?\"<>|!]", "_");
                 File tempFile = new File(targetDirectory.toFile(), title);
                 logger.debug("Writing content to temp file {}", tempFile.getAbsolutePath());
                 Files.write(tempFile.toPath(), result.getContent());

diff --git a/core/src/main/resources/META-INF/native-image/resource-config.json b/core/src/main/resources/META-INF/native-image/resource-config.json
@@ -2452,6 +2452,9 @@
       {
           "pattern": "\\Qstatic/css/dark.css\\E"
       },
+      {
+          "pattern": "\\Qstatic/css/auto.css\\E"
+      },
       {
           "pattern": "\\Q*/static/*\\E"
       },

diff --git a/core/src/main/resources/static/css/auto.css b/core/src/main/resources/static/css/auto.css
diff --git a/core/src/main/resources/static/css/auto.css.map b/core/src/main/resources/static/css/auto.css.map
diff --git a/core/src/main/resources/static/js/nzbhydra.js b/core/src/main/resources/static/js/nzbhydra.js
@@ -6291,6 +6291,7 @@ function ConfigFields($injector) {
                                 type: 'select',
                                 label: 'Theme',
                                 options: [
+                                    {name: 'Auto', value: 'auto'},
                                     {name: 'Grey', value: 'grey'},
                                     {name: 'Bright', value: 'bright'},
                                     {name: 'Dark', value: 'dark'}

diff --git a/core/src/main/resources/static/js/nzbhydra.js.map b/core/src/main/resources/static/js/nzbhydra.js.map
diff --git a/core/ui-src/js/config/config-fields-service.js b/core/ui-src/js/config/config-fields-service.js
@@ -241,6 +241,7 @@ function ConfigFields($injector) {
                                 type: 'select',
                                 label: 'Theme',
                                 options: [
+                                    {name: 'Auto', value: 'auto'},
                                     {name: 'Grey', value: 'grey'},
                                     {name: 'Bright', value: 'bright'},
                                     {name: 'Dark', value: 'dark'}

diff --git a/core/ui-src/less/auto.less b/core/ui-src/less/auto.less
diff --git a/docker/uiDev/build.sh b/docker/uiDev/build.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd ../..
+docker build -f docker/uiDev/Dockerfile -t ghcr.io/theotherp/nzbhydra-ui-dev:latest .
+docker push ghcr.io/theotherp/nzbhydra-ui-dev:latest .