From efd34616b184835b6b30644f2cb18775ae53a3e3 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Mon, 8 Dec 2025 16:09:44 +0100 Subject: [PATCH] some code cleanup and dependency updates Signed-off-by: Peter Siegmund --- server/cinema/lib/common/image_resizer.dart | 1 - .../feature/poster/domain/poster.enums.dart | 2 +- .../poster/domain/poster_request.schema.dart | 19 +++---- server/cinema/pubspec.lock | 52 ++++++++----------- server/cinema/pubspec.yaml | 10 ++-- 5 files changed, 38 insertions(+), 46 deletions(-) diff --git a/server/cinema/lib/common/image_resizer.dart b/server/cinema/lib/common/image_resizer.dart index dac8d4d..ef4716d 100644 --- a/server/cinema/lib/common/image_resizer.dart +++ b/server/cinema/lib/common/image_resizer.dart @@ -42,4 +42,3 @@ class ImageResizer { ); } } - diff --git a/server/cinema/lib/feature/poster/domain/poster.enums.dart b/server/cinema/lib/feature/poster/domain/poster.enums.dart index 640a801..373b70a 100644 --- a/server/cinema/lib/feature/poster/domain/poster.enums.dart +++ b/server/cinema/lib/feature/poster/domain/poster.enums.dart @@ -12,5 +12,5 @@ enum PosterFormat { enum PosterOutput { image, lvgl, - lvglBinary, + lvgl9Binary, } diff --git a/server/cinema/lib/feature/poster/domain/poster_request.schema.dart b/server/cinema/lib/feature/poster/domain/poster_request.schema.dart index 00b98f2..f33c05f 100644 --- a/server/cinema/lib/feature/poster/domain/poster_request.schema.dart +++ b/server/cinema/lib/feature/poster/domain/poster_request.schema.dart @@ -1,3 +1,4 @@ +import 'package:cinema/common/image_resizer.dart'; import 'package:cinema/feature/poster/domain/poster.enums.dart'; import 'package:zard/zard.dart'; @@ -6,25 +7,25 @@ final _formats = PosterFormat.values.map((e) => e.name); final _outputs = PosterOutput.values.map((e) => e.name); final posterSchema = z.map({ - 'width': z.int().min(1, message: "'width' must be at least 1").max(4000, message: "'width' must be at most 4000"), - 'height': z.int().min(1, message: "'height' must be at least 1").max(4000, message: "'height' must be a most 4000"), - 'count': z.int().min(1, message: "'count' must be at least 1").max(20, message: "'count' must be at most 20"), + 'width': z.int().min(1, message: "'width' must be at least 1").max(4000, message: "'width' must be at most 4000").$default(ImageResizer.maxWidth), + 'height': z.int().min(1, message: "'height' must be at least 1").max(4000, message: "'height' must be a most 4000").$default(ImageResizer.maxHeight), + 'count': z.int().min(1, message: "'count' must be at least 1").max(20, message: "'count' must be at most 20").$default(4), 'orientation': z.string().refine( (value) => _orientations.contains(value), message: "'orientation' must be either ${_orientations.join(', ')}", - ), - 'shuffle': z.bool(message: "'shuffle' must be a boolean value"), - 'language': z.string(message: "'language' must be a string").transform((value) => value.trim()), + ).$default(PosterOrientation.horizontal.name), + 'shuffle': z.bool(message: "'shuffle' must be a boolean value").$default(true), + 'language': z.string(message: "'language' must be a string").transform((value) => value.trim()).$default("de"), 'backgroundColor': z.string().regex( RegExp(r'^#([a-fA-F0-9]{3}|[a-fA-F0-9]{6})$'), message: "The 'backgroundColor' must be a valid hexadecimal color code (e.g., #000 or #FF0000)", - ), + ).$default("#000000"), 'format': z.string().refine( (value) => _formats.contains(value), message: "'format' must be either ${_formats.join(', ')}", - ), + ).$default(PosterFormat.jpeg.name), 'output': z.string().refine( (value) => _outputs.contains(value), message: "'output' must be either ${_outputs.join(', ')}", - ), + ).$default(PosterOutput.lvgl9Binary.name), }); diff --git a/server/cinema/pubspec.lock b/server/cinema/pubspec.lock index a98af5f..0baaec0 100644 --- a/server/cinema/pubspec.lock +++ b/server/cinema/pubspec.lock @@ -53,10 +53,10 @@ packages: dependency: transitive description: name: build - sha256: dfb67ccc9a78c642193e0c2d94cb9e48c2c818b3178a86097d644acdcde6a8d9 + sha256: c1668065e9ba04752570ad7e038288559d1e2ca5c6d0131c0f5f55e39e777413 url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.0.3" build_config: dependency: transitive description: @@ -77,10 +77,10 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "7b5b569f3df370590a85029148d6fc66c7d0201fc6f1847c07dd85d365ae9fcd" + sha256: "110c56ef29b5eb367b4d17fc79375fa8c18a6cd7acd92c05bb3986c17a079057" url: "https://pub.dev" source: hosted - version: "2.10.3" + version: "2.10.4" built_collection: dependency: "direct main" description: @@ -93,18 +93,18 @@ packages: dependency: "direct main" description: name: built_value - sha256: a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d + sha256: "426cf75afdb23aa74bd4e471704de3f9393f3c7b04c1e2d9c6f1073ae0b8b139" url: "https://pub.dev" source: hosted - version: "8.12.0" + version: "8.12.1" built_value_generator: dependency: "direct dev" description: name: built_value_generator - sha256: "65f5823a2c4158384ebc845218e19286fdf5dd04f8ac2cf607b01a502be40b1b" + sha256: "7f337721c07a53dce3d2ea062747709ed63d57880058f4fd62ae0f16d1e6cb0e" url: "https://pub.dev" source: hosted - version: "8.12.0" + version: "8.12.1" checked_yaml: dependency: transitive description: @@ -221,10 +221,10 @@ packages: dependency: "direct main" description: name: get_it - sha256: "84792561b731b6463d053e9761a5236da967c369da10b134b8585a5e18429956" + sha256: "1d648d2dd2047d7f7450d5727ca24ee435f240385753d90b49650e3cdff32e56" url: "https://pub.dev" source: hosted - version: "9.0.5" + version: "9.2.0" glob: dependency: transitive description: @@ -285,10 +285,10 @@ packages: dependency: "direct main" description: name: injectable - sha256: "29559f7e3daebf0084597de86a825ae7f149d9e30264b7fbc71d1069ae82697d" + sha256: "8fc24421cfeff76d1d38484d8b9617beeb54a58b6edfd002b10cc896b8b8f3fe" url: "https://pub.dev" source: hosted - version: "2.6.0" + version: "2.7.1+2" injectable_generator: dependency: "direct dev" description: @@ -305,14 +305,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.5" - js: - dependency: transitive - description: - name: js - sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" - url: "https://pub.dev" - source: hosted - version: "0.7.2" json_annotation: dependency: transitive description: @@ -341,10 +333,10 @@ packages: dependency: transitive description: name: matcher - sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6" url: "https://pub.dev" source: hosted - version: "0.12.17" + version: "0.12.18" meta: dependency: transitive description: @@ -485,10 +477,10 @@ packages: dependency: transitive description: name: source_gen - sha256: "9098ab86015c4f1d8af6486b547b11100e73b193e1899015033cb3e14ad20243" + sha256: "07b277b67e0096c45196cbddddf2d8c6ffc49342e88bf31d460ce04605ddac75" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.1.1" source_map_stack_trace: dependency: transitive description: @@ -557,10 +549,10 @@ packages: dependency: "direct dev" description: name: test - sha256: "8f0eb7fa76b7d05a4f3707e0dbd581babef5b0915ca508b757cf15d0cabb56cb" + sha256: "77cc98ea27006c84e71a7356cf3daf9ddbde2d91d84f77dbfe64cf0e4d9611ae" url: "https://pub.dev" source: hosted - version: "1.27.0" + version: "1.28.0" test_api: dependency: transitive description: @@ -573,10 +565,10 @@ packages: dependency: transitive description: name: test_core - sha256: bad9916601a4f2ef6e4dbc466fb712e4b42cf4917c3fd428b018f51984fce13b + sha256: f1072617a6657e5fc09662e721307f7fb009b4ed89b19f47175d11d5254a62d4 url: "https://pub.dev" source: hosted - version: "0.6.13" + version: "0.6.14" typed_data: dependency: transitive description: @@ -653,9 +645,9 @@ packages: dependency: "direct main" description: name: zard - sha256: "772fc9ef6088123fefaaa88cb986253f0e838aec2af2c3b956a9a1c98ea2b049" + sha256: "51a5f07ebe5754ba67e01b3e2fcc67bb0bd92a269d5d087922431789b0f32d87" url: "https://pub.dev" source: hosted - version: "0.0.23" + version: "0.0.24" sdks: dart: ">=3.9.0 <4.0.0" diff --git a/server/cinema/pubspec.yaml b/server/cinema/pubspec.yaml index bfeee94..8e10a94 100644 --- a/server/cinema/pubspec.yaml +++ b/server/cinema/pubspec.yaml @@ -10,17 +10,17 @@ dependencies: built_collection: ^5.1.1 built_value: ^8.9.2 dio: ^5.9.0 - get_it: ^9.0.5 + get_it: ^9.2.0 image: ^4.5.4 - injectable: ^2.6.0 + injectable: ^2.7.1+2 shelf: ^1.4.2 shelf_router: ^1.1.2 shelf_web_socket: ^3.0.0 - zard: ^0.0.23 + zard: ^0.0.24 dev_dependencies: - build_runner: ^2.10.3 - built_value_generator: ^8.9.2 + build_runner: ^2.10.4 + built_value_generator: ^8.12.1 http: ^1.2.2 injectable_generator: ^2.9.1 lints: ^6.0.0 -- 2.49.1