diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a107c1ac3a..9dd57a5ec8 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -4,7 +4,7 @@ FROM ${BASEIMAGE} # Flutter SDK # https://flutter.dev/docs/development/tools/sdk/releases?tab=linux ENV FLUTTER_CHANNEL="stable" -ENV FLUTTER_VERSION="3.24.5" +ENV FLUTTER_VERSION="3.29.1" ENV FLUTTER_HOME=/flutter ENV PATH=${PATH}:${FLUTTER_HOME}/bin diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index 7cfd75c61b..1243a81105 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -56,7 +56,7 @@ jobs: uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v3.5.0 + uses: docker/setup-qemu-action@v3.6.0 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3.10.0 diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 96970fa460..12f3410310 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -255,19 +255,20 @@ jobs: flavor: | # Disable latest tag latest=false + suffix=${{ matrix.suffix }} images: | name=${{ env.GHCR_REPO }} name=${{ env.DOCKER_REPO }},enable=${{ github.event_name == 'release' }} tags: | # Tag with branch name - type=ref,event=branch,suffix=${{ matrix.suffix }} + type=ref,event=branch # Tag with pr-number - type=ref,event=pr,suffix=${{ matrix.suffix }} + type=ref,event=pr # Tag with long commit sha hash - type=sha,format=long,prefix=commit-,suffix=${{ matrix.suffix }} + type=sha,format=long,prefix=commit- # Tag with git tag on release - type=ref,event=tag,suffix=${{ matrix.suffix }} - type=raw,value=release,enable=${{ github.event_name == 'release' }},suffix=${{ matrix.suffix }} + type=ref,event=tag + type=raw,value=release,enable=${{ github.event_name == 'release' }} - name: Create manifest list and push working-directory: ${{ runner.temp }}/digests @@ -408,19 +409,20 @@ jobs: flavor: | # Disable latest tag latest=false + suffix=${{ matrix.suffix }} images: | name=${{ env.GHCR_REPO }} name=${{ env.DOCKER_REPO }},enable=${{ github.event_name == 'release' }} tags: | # Tag with branch name - type=ref,event=branch,suffix=${{ matrix.suffix }} + type=ref,event=branch # Tag with pr-number - type=ref,event=pr,suffix=${{ matrix.suffix }} + type=ref,event=pr # Tag with long commit sha hash - type=sha,format=long,prefix=commit-,suffix=${{ matrix.suffix }} + type=sha,format=long,prefix=commit- # Tag with git tag on release - type=ref,event=tag,suffix=${{ matrix.suffix }} - type=raw,value=release,enable=${{ github.event_name == 'release' }},suffix=${{ matrix.suffix }} + type=ref,event=tag + type=raw,value=release,enable=${{ github.event_name == 'release' }} - name: Create manifest list and push working-directory: ${{ runner.temp }}/digests diff --git a/.github/workflows/preview-label.yaml b/.github/workflows/preview-label.yaml index 6468d05e80..1c324ab49f 100644 --- a/.github/workflows/preview-label.yaml +++ b/.github/workflows/preview-label.yaml @@ -2,7 +2,7 @@ name: Preview label on: pull_request: - types: [labeled] + types: [labeled, closed] jobs: comment-status: diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index 4d8d40a47b..1e2020a19d 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -50,6 +50,26 @@ jobs: run: dart pub get working-directory: ./mobile + - name: Run Build Runner + run: make build + working-directory: ./mobile + + - name: Find file changes + uses: tj-actions/verify-changed-files@v20 + id: verify-changed-files + with: + files: | + mobile/**/*.g.dart + mobile/**/*.gr.dart + mobile/**/*.drift.dart + + - name: Verify files have not changed + if: steps.verify-changed-files.outputs.files_changed == 'true' + run: | + echo "ERROR: Generated files not up to date! Run make_build inside the mobile directory" + echo "Changed files: ${{ steps.verify-changed-files.outputs.changed_files }}" + exit 1 + - name: Run dart analyze run: dart analyze --fatal-infos working-directory: ./mobile @@ -61,8 +81,3 @@ jobs: - name: Run dart custom_lint run: dart run custom_lint working-directory: ./mobile - - # Enable after riverpod generator migration is completed - # - name: Run dart custom lint - # run: dart run custom_lint - # working-directory: ./mobile diff --git a/.github/workflows/weblate-lock.yml b/.github/workflows/weblate-lock.yml index 29a30640bd..4189e51919 100644 --- a/.github/workflows/weblate-lock.yml +++ b/.github/workflows/weblate-lock.yml @@ -18,8 +18,15 @@ jobs: filters: | i18n: - 'i18n/!(en)**\.json' + - name: Debug + run: | + echo "Should run: ${{ steps.found_paths.outputs.i18n == 'true' && github.head_ref != 'chore/translations'}}" + echo "Found i18n paths: ${{ steps.found_paths.outputs.i18n }}" + echo "Head ref: ${{ github.head_ref }}" + enforce-lock: name: Check Weblate Lock + needs: [ pre-job ] runs-on: ubuntu-latest if: ${{ needs.pre-job.outputs.should_run == 'true' }} steps: diff --git a/cli/package-lock.json b/cli/package-lock.json index 2b40efdb45..3b16a3bf18 100644 --- a/cli/package-lock.json +++ b/cli/package-lock.json @@ -27,7 +27,7 @@ "@types/lodash-es": "^4.17.12", "@types/micromatch": "^4.0.9", "@types/mock-fs": "^4.13.1", - "@types/node": "^22.13.5", + "@types/node": "^22.13.9", "@typescript-eslint/eslint-plugin": "^8.15.0", "@typescript-eslint/parser": "^8.15.0", "@vitest/coverage-v8": "^3.0.0", @@ -62,7 +62,7 @@ "@oazapfts/runtime": "^1.0.2" }, "devDependencies": { - "@types/node": "^22.13.5", + "@types/node": "^22.13.9", "typescript": "^5.3.3" } }, @@ -1502,9 +1502,9 @@ } }, "node_modules/@types/node": { - "version": "22.13.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.8.tgz", - "integrity": "sha512-G3EfaZS+iOGYWLLRCEAXdWK9my08oHNZ+FHluRiggIYJPOXzhOiDgpVCUHaUvyIC5/fj7C/p637jdzC666AOKQ==", + "version": "22.13.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz", + "integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==", "dev": true, "license": "MIT", "dependencies": { @@ -1518,17 +1518,17 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.25.0.tgz", - "integrity": "sha512-VM7bpzAe7JO/BFf40pIT1lJqS/z1F8OaSsUB3rpFJucQA4cOSuH2RVVVkFULN+En0Djgr29/jb4EQnedUo95KA==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.26.0.tgz", + "integrity": "sha512-cLr1J6pe56zjKYajK6SSSre6nl1Gj6xDp1TY0trpgPzjVbgDwd09v2Ws37LABxzkicmUjhEeg/fAUjPJJB1v5Q==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.25.0", - "@typescript-eslint/type-utils": "8.25.0", - "@typescript-eslint/utils": "8.25.0", - "@typescript-eslint/visitor-keys": "8.25.0", + "@typescript-eslint/scope-manager": "8.26.0", + "@typescript-eslint/type-utils": "8.26.0", + "@typescript-eslint/utils": "8.26.0", + "@typescript-eslint/visitor-keys": "8.26.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -1544,20 +1544,20 @@ "peerDependencies": { "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.25.0.tgz", - "integrity": "sha512-4gbs64bnbSzu4FpgMiQ1A+D+urxkoJk/kqlDJ2W//5SygaEiAP2B4GoS7TEdxgwol2el03gckFV9lJ4QOMiiHg==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.26.0.tgz", + "integrity": "sha512-mNtXP9LTVBy14ZF3o7JG69gRPBK/2QWtQd0j0oH26HcY/foyJJau6pNUez7QrM5UHnSvwlQcJXKsk0I99B9pOA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.25.0", - "@typescript-eslint/types": "8.25.0", - "@typescript-eslint/typescript-estree": "8.25.0", - "@typescript-eslint/visitor-keys": "8.25.0", + "@typescript-eslint/scope-manager": "8.26.0", + "@typescript-eslint/types": "8.26.0", + "@typescript-eslint/typescript-estree": "8.26.0", + "@typescript-eslint/visitor-keys": "8.26.0", "debug": "^4.3.4" }, "engines": { @@ -1569,18 +1569,18 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.25.0.tgz", - "integrity": "sha512-6PPeiKIGbgStEyt4NNXa2ru5pMzQ8OYKO1hX1z53HMomrmiSB+R5FmChgQAP1ro8jMtNawz+TRQo/cSXrauTpg==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.26.0.tgz", + "integrity": "sha512-E0ntLvsfPqnPwng8b8y4OGuzh/iIOm2z8U3S9zic2TeMLW61u5IH2Q1wu0oSTkfrSzwbDJIB/Lm8O3//8BWMPA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.25.0", - "@typescript-eslint/visitor-keys": "8.25.0" + "@typescript-eslint/types": "8.26.0", + "@typescript-eslint/visitor-keys": "8.26.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1591,14 +1591,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.25.0.tgz", - "integrity": "sha512-d77dHgHWnxmXOPJuDWO4FDWADmGQkN5+tt6SFRZz/RtCWl4pHgFl3+WdYCn16+3teG09DY6XtEpf3gGD0a186g==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.26.0.tgz", + "integrity": "sha512-ruk0RNChLKz3zKGn2LwXuVoeBcUMh+jaqzN461uMMdxy5H9epZqIBtYj7UiPXRuOpaALXGbmRuZQhmwHhaS04Q==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.25.0", - "@typescript-eslint/utils": "8.25.0", + "@typescript-eslint/typescript-estree": "8.26.0", + "@typescript-eslint/utils": "8.26.0", "debug": "^4.3.4", "ts-api-utils": "^2.0.1" }, @@ -1611,13 +1611,13 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/types": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.25.0.tgz", - "integrity": "sha512-+vUe0Zb4tkNgznQwicsvLUJgZIRs6ITeWSCclX1q85pR1iOiaj+4uZJIUp//Z27QWu5Cseiw3O3AR8hVpax7Aw==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.26.0.tgz", + "integrity": "sha512-89B1eP3tnpr9A8L6PZlSjBvnJhWXtYfZhECqlBl1D9Lme9mHO6iWlsprBtVenQvY1HMhax1mWOjhtL3fh/u+pA==", "dev": true, "license": "MIT", "engines": { @@ -1629,14 +1629,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.25.0.tgz", - "integrity": "sha512-ZPaiAKEZ6Blt/TPAx5Ot0EIB/yGtLI2EsGoY6F7XKklfMxYQyvtL+gT/UCqkMzO0BVFHLDlzvFqQzurYahxv9Q==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.26.0.tgz", + "integrity": "sha512-tiJ1Hvy/V/oMVRTbEOIeemA2XoylimlDQ03CgPPNaHYZbpsc78Hmngnt+WXZfJX1pjQ711V7g0H7cSJThGYfPQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.25.0", - "@typescript-eslint/visitor-keys": "8.25.0", + "@typescript-eslint/types": "8.26.0", + "@typescript-eslint/visitor-keys": "8.26.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -1652,20 +1652,20 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/utils": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.25.0.tgz", - "integrity": "sha512-syqRbrEv0J1wywiLsK60XzHnQe/kRViI3zwFALrNEgnntn1l24Ra2KvOAWwWbWZ1lBZxZljPDGOq967dsl6fkA==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.26.0.tgz", + "integrity": "sha512-2L2tU3FVwhvU14LndnQCA2frYC8JnPDVKyQtWFPf8IYFMt/ykEN1bPolNhNbCVgOmdzTlWdusCTKA/9nKrf8Ig==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.25.0", - "@typescript-eslint/types": "8.25.0", - "@typescript-eslint/typescript-estree": "8.25.0" + "@typescript-eslint/scope-manager": "8.26.0", + "@typescript-eslint/types": "8.26.0", + "@typescript-eslint/typescript-estree": "8.26.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1676,17 +1676,17 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.25.0.tgz", - "integrity": "sha512-kCYXKAum9CecGVHGij7muybDfTS2sD3t0L4bJsEZLkyrXUImiCTq1M3LG2SRtOhiHFwMR9wAFplpT6XHYjTkwQ==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.26.0.tgz", + "integrity": "sha512-2z8JQJWAzPdDd51dRQ/oqIJxe99/hoLIqmf8RMCAJQtYDc535W/Jt2+RTP4bP0aKeBG1F65yjIZuczOXCmbWwg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.25.0", + "@typescript-eslint/types": "8.26.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -1711,9 +1711,9 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.0.7.tgz", - "integrity": "sha512-Av8WgBJLTrfLOer0uy3CxjlVuWK4CzcLBndW1Nm2vI+3hZ2ozHututkfc7Blu1u6waeQ7J8gzPK/AsBRnWA5mQ==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.0.8.tgz", + "integrity": "sha512-y7SAKsQirsEJ2F8bulBck4DoluhI2EEgTimHd6EEUgJBGKy9tC25cpywh1MH4FvDGoG2Unt7+asVd1kj4qOSAw==", "dev": true, "license": "MIT", "dependencies": { @@ -1734,8 +1734,8 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "@vitest/browser": "3.0.7", - "vitest": "3.0.7" + "@vitest/browser": "3.0.8", + "vitest": "3.0.8" }, "peerDependenciesMeta": { "@vitest/browser": { @@ -1744,14 +1744,14 @@ } }, "node_modules/@vitest/expect": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.0.7.tgz", - "integrity": "sha512-QP25f+YJhzPfHrHfYHtvRn+uvkCFCqFtW9CktfBxmB+25QqWsx7VB2As6f4GmwllHLDhXNHvqedwhvMmSnNmjw==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.0.8.tgz", + "integrity": "sha512-Xu6TTIavTvSSS6LZaA3EebWFr6tsoXPetOWNMOlc7LO88QVVBwq2oQWBoDiLCN6YTvNYsGSjqOO8CAdjom5DCQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "3.0.7", - "@vitest/utils": "3.0.7", + "@vitest/spy": "3.0.8", + "@vitest/utils": "3.0.8", "chai": "^5.2.0", "tinyrainbow": "^2.0.0" }, @@ -1760,13 +1760,13 @@ } }, "node_modules/@vitest/mocker": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.7.tgz", - "integrity": "sha512-qui+3BLz9Eonx4EAuR/i+QlCX6AUZ35taDQgwGkK/Tw6/WgwodSrjN1X2xf69IA/643ZX5zNKIn2svvtZDrs4w==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.8.tgz", + "integrity": "sha512-n3LjS7fcW1BCoF+zWZxG7/5XvuYH+lsFg+BDwwAz0arIwHQJFUEsKBQ0BLU49fCxuM/2HSeBPHQD8WjgrxMfow==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "3.0.7", + "@vitest/spy": "3.0.8", "estree-walker": "^3.0.3", "magic-string": "^0.30.17" }, @@ -1787,9 +1787,9 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.7.tgz", - "integrity": "sha512-CiRY0BViD/V8uwuEzz9Yapyao+M9M008/9oMOSQydwbwb+CMokEq3XVaF3XK/VWaOK0Jm9z7ENhybg70Gtxsmg==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.8.tgz", + "integrity": "sha512-BNqwbEyitFhzYMYHUVbIvepOyeQOSFA/NeJMIP9enMntkkxLgOcgABH6fjyXG85ipTgvero6noreavGIqfJcIg==", "dev": true, "license": "MIT", "dependencies": { @@ -1800,13 +1800,13 @@ } }, "node_modules/@vitest/runner": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.0.7.tgz", - "integrity": "sha512-WeEl38Z0S2ZcuRTeyYqaZtm4e26tq6ZFqh5y8YD9YxfWuu0OFiGFUbnxNynwLjNRHPsXyee2M9tV7YxOTPZl2g==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.0.8.tgz", + "integrity": "sha512-c7UUw6gEcOzI8fih+uaAXS5DwjlBaCJUo7KJ4VvJcjL95+DSR1kova2hFuRt3w41KZEFcOEiq098KkyrjXeM5w==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "3.0.7", + "@vitest/utils": "3.0.8", "pathe": "^2.0.3" }, "funding": { @@ -1814,13 +1814,13 @@ } }, "node_modules/@vitest/snapshot": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.7.tgz", - "integrity": "sha512-eqTUryJWQN0Rtf5yqCGTQWsCFOQe4eNz5Twsu21xYEcnFJtMU5XvmG0vgebhdLlrHQTSq5p8vWHJIeJQV8ovsA==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.8.tgz", + "integrity": "sha512-x8IlMGSEMugakInj44nUrLSILh/zy1f2/BgH0UeHpNyOocG18M9CWVIFBaXPt8TrqVZWmcPjwfG/ht5tnpba8A==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "3.0.7", + "@vitest/pretty-format": "3.0.8", "magic-string": "^0.30.17", "pathe": "^2.0.3" }, @@ -1829,9 +1829,9 @@ } }, "node_modules/@vitest/spy": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.0.7.tgz", - "integrity": "sha512-4T4WcsibB0B6hrKdAZTM37ekuyFZt2cGbEGd2+L0P8ov15J1/HUsUaqkXEQPNAWr4BtPPe1gI+FYfMHhEKfR8w==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.0.8.tgz", + "integrity": "sha512-MR+PzJa+22vFKYb934CejhR4BeRpMSoxkvNoDit68GQxRLSf11aT6CTj3XaqUU9rxgWJFnqicN/wxw6yBRkI1Q==", "dev": true, "license": "MIT", "dependencies": { @@ -1842,13 +1842,13 @@ } }, "node_modules/@vitest/utils": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.0.7.tgz", - "integrity": "sha512-xePVpCRfooFX3rANQjwoditoXgWb1MaFbzmGuPP59MK6i13mrnDw/yEIyJudLeW6/38mCNcwCiJIGmpDPibAIg==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.0.8.tgz", + "integrity": "sha512-nkBC3aEhfX2PdtQI/QwAWp8qZWwzASsU4Npbcd5RdMPBSSLCpkZp52P3xku3s3uA0HIEhGvEcF8rNkBsz9dQ4Q==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "3.0.7", + "@vitest/pretty-format": "3.0.8", "loupe": "^3.1.3", "tinyrainbow": "^2.0.0" }, @@ -2429,13 +2429,13 @@ } }, "node_modules/eslint-config-prettier": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.0.2.tgz", - "integrity": "sha512-1105/17ZIMjmCOJOPNfVdbXafLCLj3hPmkmB7dLgt7XsQ/zkxSuDerE/xgO3RxoHysR1N1whmquY0lSn2O0VLg==", + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.1.tgz", + "integrity": "sha512-4EQQr6wXwS+ZJSzaR5ZCrYgLxqvUjdXctaEtBqHcbkW944B1NQyO4qpdHQbXBONfwxXdkAY81HH4+LUfrg+zPw==", "dev": true, "license": "MIT", "bin": { - "eslint-config-prettier": "build/bin/cli.js" + "eslint-config-prettier": "bin/cli.js" }, "peerDependencies": { "eslint": ">=7.0.0" @@ -3617,9 +3617,9 @@ } }, "node_modules/prettier": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.2.tgz", - "integrity": "sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz", + "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==", "dev": true, "license": "MIT", "bin": { @@ -4278,9 +4278,9 @@ } }, "node_modules/typescript": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz", - "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==", + "version": "5.8.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz", + "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", "dev": true, "license": "Apache-2.0", "bin": { @@ -4349,9 +4349,9 @@ } }, "node_modules/vite": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.0.tgz", - "integrity": "sha512-7dPxoo+WsT/64rDcwoOjk76XHj+TqNTIvHKcuMQ1k4/SeHDaQt5GFAeLYzrimZrMpn/O6DtdI03WUjdxuPM0oQ==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.1.tgz", + "integrity": "sha512-n2GnqDb6XPhlt9B8olZPrgMD/es/Nd1RdChF6CBD/fHW6pUyUTt2sQW2fPRX5GiD9XEa6+8A6A4f2vT6pSsE7Q==", "dev": true, "license": "MIT", "dependencies": { @@ -4421,9 +4421,9 @@ } }, "node_modules/vite-node": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.0.7.tgz", - "integrity": "sha512-2fX0QwX4GkkkpULXdT1Pf4q0tC1i1lFOyseKoonavXUNlQ77KpW2XqBGGNIm/J4Ows4KxgGJzDguYVPKwG/n5A==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.0.8.tgz", + "integrity": "sha512-6PhR4H9VGlcwXZ+KWCdMqbtG649xCPZqfI9j2PsK1FcXgEzro5bGHcVKFCTqPLaNKZES8Evqv4LwvZARsq5qlg==", "dev": true, "license": "MIT", "dependencies": { @@ -4464,19 +4464,19 @@ } }, "node_modules/vitest": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.7.tgz", - "integrity": "sha512-IP7gPK3LS3Fvn44x30X1dM9vtawm0aesAa2yBIZ9vQf+qB69NXC5776+Qmcr7ohUXIQuLhk7xQR0aSUIDPqavg==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.8.tgz", + "integrity": "sha512-dfqAsNqRGUc8hB9OVR2P0w8PZPEckti2+5rdZip0WIz9WW0MnImJ8XiR61QhqLa92EQzKP2uPkzenKOAHyEIbA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/expect": "3.0.7", - "@vitest/mocker": "3.0.7", - "@vitest/pretty-format": "^3.0.7", - "@vitest/runner": "3.0.7", - "@vitest/snapshot": "3.0.7", - "@vitest/spy": "3.0.7", - "@vitest/utils": "3.0.7", + "@vitest/expect": "3.0.8", + "@vitest/mocker": "3.0.8", + "@vitest/pretty-format": "^3.0.8", + "@vitest/runner": "3.0.8", + "@vitest/snapshot": "3.0.8", + "@vitest/spy": "3.0.8", + "@vitest/utils": "3.0.8", "chai": "^5.2.0", "debug": "^4.4.0", "expect-type": "^1.1.0", @@ -4488,7 +4488,7 @@ "tinypool": "^1.0.2", "tinyrainbow": "^2.0.0", "vite": "^5.0.0 || ^6.0.0", - "vite-node": "3.0.7", + "vite-node": "3.0.8", "why-is-node-running": "^2.3.0" }, "bin": { @@ -4504,8 +4504,8 @@ "@edge-runtime/vm": "*", "@types/debug": "^4.1.12", "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", - "@vitest/browser": "3.0.7", - "@vitest/ui": "3.0.7", + "@vitest/browser": "3.0.8", + "@vitest/ui": "3.0.8", "happy-dom": "*", "jsdom": "*" }, @@ -4534,9 +4534,9 @@ } }, "node_modules/vitest-fetch-mock": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/vitest-fetch-mock/-/vitest-fetch-mock-0.4.4.tgz", - "integrity": "sha512-i2RNEAKBgnLWwj5DVz8ouzaHaPVg1xaYgAUmU5p+baJ149upnO+yJLPchAiY9ij8hf0PDkJVVke1pftBxmT05g==", + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/vitest-fetch-mock/-/vitest-fetch-mock-0.4.5.tgz", + "integrity": "sha512-nhWdCQIGtaSEUVl96pMm0WggyDGPDv5FUy/Q9Hx3cs2RGmh3Q/uRsLClGbdG3kXBkJ3br5yTUjB2MeW25TwdOA==", "dev": true, "license": "MIT", "engines": { diff --git a/cli/package.json b/cli/package.json index e8c207fb27..334bcc0b0c 100644 --- a/cli/package.json +++ b/cli/package.json @@ -21,7 +21,7 @@ "@types/lodash-es": "^4.17.12", "@types/micromatch": "^4.0.9", "@types/mock-fs": "^4.13.1", - "@types/node": "^22.13.5", + "@types/node": "^22.13.9", "@typescript-eslint/eslint-plugin": "^8.15.0", "@typescript-eslint/parser": "^8.15.0", "@vitest/coverage-v8": "^3.0.0", diff --git a/docs/docs/administration/backup-and-restore.md b/docs/docs/administration/backup-and-restore.md index 1b5cdba19a..817a7dca6d 100644 --- a/docs/docs/administration/backup-and-restore.md +++ b/docs/docs/administration/backup-and-restore.md @@ -30,6 +30,13 @@ As mentioned above, you should make your own backup of these together with the a You can adjust the schedule and amount of kept backups in the [admin settings](http://my.immich.app/admin/system-settings?isOpen=backup). By default, Immich will keep the last 14 backups and create a new backup every day at 2:00 AM. +#### Trigger Backup + +You are able to trigger a backup in the [admin job status page](http://my.immich.app/admin/jobs-status). +Visit the page, open the "Create job" modal from the top right, select "Backup Database" and click "Confirm". +A job will run and trigger a backup, you can verify this worked correctly by checking the logs or the backup folder. +This backup will count towards the last X backups that will be kept based on your settings. + #### Restoring We hope to make restoring simpler in future versions, for now you can find the backups in the `UPLOAD_LOCATION/backups` folder on your host. diff --git a/docs/package-lock.json b/docs/package-lock.json index 37e6a4fe65..ba4d9af199 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -15734,9 +15734,9 @@ } }, "node_modules/prettier": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.2.tgz", - "integrity": "sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz", + "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==", "dev": true, "license": "MIT", "bin": { diff --git a/docs/src/components/svg-paths.ts b/docs/src/components/svg-paths.ts index 112ed1d70f..0903392307 100644 --- a/docs/src/components/svg-paths.ts +++ b/docs/src/components/svg-paths.ts @@ -1,2 +1,3 @@ export const discordPath = - 'M 9.1367188 3.8691406 C 9.1217187 3.8691406 9.1067969 3.8700938 9.0917969 3.8710938 C 8.9647969 3.8810937 5.9534375 4.1403594 4.0234375 5.6933594 C 3.0154375 6.6253594 1 12.073203 1 16.783203 C 1 16.866203 1.0215 16.946531 1.0625 17.019531 C 2.4535 19.462531 6.2473281 20.102859 7.1113281 20.130859 L 7.1269531 20.130859 C 7.2799531 20.130859 7.4236719 20.057594 7.5136719 19.933594 L 8.3886719 18.732422 C 6.0296719 18.122422 4.8248594 17.086391 4.7558594 17.025391 C 4.5578594 16.850391 4.5378906 16.549563 4.7128906 16.351562 C 4.8068906 16.244563 4.9383125 16.189453 5.0703125 16.189453 C 5.1823125 16.189453 5.2957188 16.228594 5.3867188 16.308594 C 5.4157187 16.334594 7.6340469 18.216797 11.998047 18.216797 C 16.370047 18.216797 18.589328 16.325641 18.611328 16.306641 C 18.702328 16.227641 18.815734 16.189453 18.927734 16.189453 C 19.059734 16.189453 19.190156 16.243562 19.285156 16.351562 C 19.459156 16.549563 19.441141 16.851391 19.244141 17.025391 C 19.174141 17.087391 17.968375 18.120469 15.609375 18.730469 L 16.484375 19.933594 C 16.574375 20.057594 16.718094 20.130859 16.871094 20.130859 L 16.886719 20.130859 C 17.751719 20.103859 21.5465 19.463531 22.9375 17.019531 C 22.9785 16.947531 23 16.866203 23 16.783203 C 23 12.073203 20.984172 6.624875 19.951172 5.671875 C 18.047172 4.140875 15.036203 3.8820937 14.908203 3.8710938 C 14.895203 3.8700938 14.880188 3.8691406 14.867188 3.8691406 C 14.681188 3.8691406 14.510594 3.9793906 14.433594 4.1503906 C 14.427594 4.1623906 14.362062 4.3138281 14.289062 4.5488281 C 15.548063 4.7608281 17.094141 5.1895937 18.494141 6.0585938 C 18.718141 6.1975938 18.787437 6.4917969 18.648438 6.7167969 C 18.558438 6.8627969 18.402188 6.9433594 18.242188 6.9433594 C 18.156188 6.9433594 18.069234 6.9200937 17.990234 6.8710938 C 15.584234 5.3800938 12.578 5.3046875 12 5.3046875 C 11.422 5.3046875 8.4157187 5.3810469 6.0117188 6.8730469 C 5.9327188 6.9210469 5.8457656 6.9433594 5.7597656 6.9433594 C 5.5997656 6.9433594 5.4425625 6.86475 5.3515625 6.71875 C 5.2115625 6.49375 5.2818594 6.1985938 5.5058594 6.0585938 C 6.9058594 5.1905937 8.4528906 4.7627812 9.7128906 4.5507812 C 9.6388906 4.3147813 9.5714062 4.1643437 9.5664062 4.1523438 C 9.4894063 3.9813438 9.3217188 3.8691406 9.1367188 3.8691406 z M 12 7.3046875 C 12.296 7.3046875 14.950594 7.3403125 16.933594 8.5703125 C 17.326594 8.8143125 17.777234 8.9453125 18.240234 8.9453125 C 18.633234 8.9453125 19.010656 8.8555 19.347656 8.6875 C 19.964656 10.2405 20.690828 12.686219 20.923828 15.199219 C 20.883828 15.143219 20.840922 15.089109 20.794922 15.037109 C 20.324922 14.498109 19.644687 14.191406 18.929688 14.191406 C 18.332687 14.191406 17.754078 14.405437 17.330078 14.773438 C 17.257078 14.832437 15.505 16.21875 12 16.21875 C 8.496 16.21875 6.7450313 14.834687 6.7070312 14.804688 C 6.2540312 14.407687 5.6742656 14.189453 5.0722656 14.189453 C 4.3612656 14.189453 3.6838438 14.494391 3.2148438 15.025391 C 3.1658438 15.080391 3.1201719 15.138266 3.0761719 15.197266 C 3.3091719 12.686266 4.0344375 10.235594 4.6484375 8.6835938 C 4.9864375 8.8525938 5.3657656 8.9433594 5.7597656 8.9433594 C 6.2217656 8.9433594 6.6724531 8.8143125 7.0644531 8.5703125 C 9.0494531 7.3393125 11.704 7.3046875 12 7.3046875 z M 8.890625 10.044922 C 7.966625 10.044922 7.2167969 10.901031 7.2167969 11.957031 C 7.2167969 13.013031 7.965625 13.869141 8.890625 13.869141 C 9.815625 13.869141 10.564453 13.013031 10.564453 11.957031 C 10.564453 10.900031 9.815625 10.044922 8.890625 10.044922 z M 15.109375 10.044922 C 14.185375 10.044922 13.435547 10.901031 13.435547 11.957031 C 13.435547 13.013031 14.184375 13.869141 15.109375 13.869141 C 16.034375 13.869141 16.783203 13.013031 16.783203 11.957031 C 16.783203 10.900031 16.033375 10.044922 15.109375 10.044922 z'; + 'M81.15,0c-1.2376,2.1973-2.3489,4.4704-3.3591,6.794-9.5975-1.4396-19.3718-1.4396-28.9945,0-.985-2.3236-2.1216-4.5967-3.3591-6.794-9.0166,1.5407-17.8059,4.2431-26.1405,8.0568C2.779,32.5304-1.6914,56.3725.5312,79.8863c9.6732,7.1476,20.5083,12.603,32.0505,16.0884,2.6014-3.4854,4.8998-7.1981,6.8698-11.0623-3.738-1.3891-7.3497-3.1318-10.8098-5.1523.9092-.6567,1.7932-1.3386,2.6519-1.9953,20.281,9.547,43.7696,9.547,64.0758,0,.8587.7072,1.7427,1.3891,2.6519,1.9953-3.4601,2.0457-7.0718,3.7632-10.835,5.1776,1.97,3.8642,4.2683,7.5769,6.8698,11.0623,11.5419-3.4854,22.3769-8.9156,32.0509-16.0631,2.626-27.2771-4.496-50.9172-18.817-71.8548C98.9811,4.2684,90.1918,1.5659,81.1752.0505l-.0252-.0505ZM42.2802,65.4144c-6.2383,0-11.4159-5.6575-11.4159-12.6535s4.9755-12.6788,11.3907-12.6788,11.5169,5.708,11.4159,12.6788c-.101,6.9708-5.026,12.6535-11.3907,12.6535ZM84.3576,65.4144c-6.2637,0-11.3907-5.6575-11.3907-12.6535s4.9755-12.6788,11.3907-12.6788,11.4917,5.708,11.3906,12.6788c-.101,6.9708-5.026,12.6535-11.3906,12.6535Z'; +export const discordViewBox = '0 0 126.644 96'; diff --git a/docs/src/components/version-switcher.tsx b/docs/src/components/version-switcher.tsx index 016e4ac1e6..5cb23891aa 100644 --- a/docs/src/components/version-switcher.tsx +++ b/docs/src/components/version-switcher.tsx @@ -4,7 +4,7 @@ import React, { useEffect, useState } from 'react'; export default function VersionSwitcher(): JSX.Element { const [versions, setVersions] = useState([]); - const [label, setLabel] = useState('Versions'); + const [activeLabel, setLabel] = useState('Versions'); const windowSize = useWindowSize(); @@ -48,12 +48,13 @@ export default function VersionSwitcher(): JSX.Element { versions.length > 0 && ( ({ label, to: new URL(location.pathname + location.search + location.hash, url).href, target: '_self', + className: label === activeLabel ? 'dropdown__link--active menu__link--active' : '', // workaround because React Router `` only supports using URL path for checking if active: https://v5.reactrouter.com/web/api/NavLink/isactive-func }))} /> ) diff --git a/docs/src/pages/index.tsx b/docs/src/pages/index.tsx index 1d73ed36f8..2ffe1debc7 100644 --- a/docs/src/pages/index.tsx +++ b/docs/src/pages/index.tsx @@ -1,12 +1,10 @@ import React from 'react'; import Link from '@docusaurus/Link'; import Layout from '@theme/Layout'; -import { useColorMode } from '@docusaurus/theme-common'; -import { discordPath } from '@site/src/components/svg-paths'; +import { discordPath, discordViewBox } from '@site/src/components/svg-paths'; +import ThemedImage from '@theme/ThemedImage'; import Icon from '@mdi/react'; function HomepageHeader() { - const { isDarkTheme } = useColorMode(); - return (
@@ -14,8 +12,8 @@ function HomepageHeader() {
- Immich logo @@ -35,7 +33,6 @@ function HomepageHeader() { sacrificing your privacy.

-
-
- + Join our Discord
- screenshots -
- - Immich logo -

Download the mobile app

@@ -97,9 +94,8 @@ function HomepageHeader() {

- - app qr code
diff --git a/e2e/package-lock.json b/e2e/package-lock.json index 2ed6990817..2288a2b23b 100644 --- a/e2e/package-lock.json +++ b/e2e/package-lock.json @@ -15,7 +15,7 @@ "@immich/sdk": "file:../open-api/typescript-sdk", "@playwright/test": "^1.44.1", "@types/luxon": "^3.4.2", - "@types/node": "^22.13.5", + "@types/node": "^22.13.9", "@types/oidc-provider": "^8.5.1", "@types/pg": "^8.11.0", "@types/pngjs": "^6.0.4", @@ -67,7 +67,7 @@ "@types/lodash-es": "^4.17.12", "@types/micromatch": "^4.0.9", "@types/mock-fs": "^4.13.1", - "@types/node": "^22.13.5", + "@types/node": "^22.13.9", "@typescript-eslint/eslint-plugin": "^8.15.0", "@typescript-eslint/parser": "^8.15.0", "@vitest/coverage-v8": "^3.0.0", @@ -102,7 +102,7 @@ "@oazapfts/runtime": "^1.0.2" }, "devDependencies": { - "@types/node": "^22.13.5", + "@types/node": "^22.13.9", "typescript": "^5.3.3" } }, @@ -364,9 +364,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.0.tgz", - "integrity": "sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.1.tgz", + "integrity": "sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ==", "cpu": [ "ppc64" ], @@ -381,9 +381,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.0.tgz", - "integrity": "sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.1.tgz", + "integrity": "sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q==", "cpu": [ "arm" ], @@ -398,9 +398,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.0.tgz", - "integrity": "sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.1.tgz", + "integrity": "sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA==", "cpu": [ "arm64" ], @@ -415,9 +415,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.0.tgz", - "integrity": "sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.1.tgz", + "integrity": "sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw==", "cpu": [ "x64" ], @@ -432,9 +432,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.0.tgz", - "integrity": "sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.1.tgz", + "integrity": "sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ==", "cpu": [ "arm64" ], @@ -449,9 +449,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.0.tgz", - "integrity": "sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.1.tgz", + "integrity": "sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA==", "cpu": [ "x64" ], @@ -466,9 +466,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.0.tgz", - "integrity": "sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.1.tgz", + "integrity": "sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A==", "cpu": [ "arm64" ], @@ -483,9 +483,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.0.tgz", - "integrity": "sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.1.tgz", + "integrity": "sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww==", "cpu": [ "x64" ], @@ -500,9 +500,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.0.tgz", - "integrity": "sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.1.tgz", + "integrity": "sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ==", "cpu": [ "arm" ], @@ -517,9 +517,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.0.tgz", - "integrity": "sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.1.tgz", + "integrity": "sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ==", "cpu": [ "arm64" ], @@ -534,9 +534,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.0.tgz", - "integrity": "sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.1.tgz", + "integrity": "sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ==", "cpu": [ "ia32" ], @@ -551,9 +551,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.0.tgz", - "integrity": "sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.1.tgz", + "integrity": "sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg==", "cpu": [ "loong64" ], @@ -568,9 +568,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.0.tgz", - "integrity": "sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.1.tgz", + "integrity": "sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg==", "cpu": [ "mips64el" ], @@ -585,9 +585,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.0.tgz", - "integrity": "sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.1.tgz", + "integrity": "sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg==", "cpu": [ "ppc64" ], @@ -602,9 +602,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.0.tgz", - "integrity": "sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.1.tgz", + "integrity": "sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ==", "cpu": [ "riscv64" ], @@ -619,9 +619,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.0.tgz", - "integrity": "sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.1.tgz", + "integrity": "sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ==", "cpu": [ "s390x" ], @@ -636,9 +636,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.0.tgz", - "integrity": "sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz", + "integrity": "sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==", "cpu": [ "x64" ], @@ -653,9 +653,9 @@ } }, "node_modules/@esbuild/netbsd-arm64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.0.tgz", - "integrity": "sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.1.tgz", + "integrity": "sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g==", "cpu": [ "arm64" ], @@ -670,9 +670,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.0.tgz", - "integrity": "sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.1.tgz", + "integrity": "sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA==", "cpu": [ "x64" ], @@ -687,9 +687,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.0.tgz", - "integrity": "sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.1.tgz", + "integrity": "sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg==", "cpu": [ "arm64" ], @@ -704,9 +704,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.0.tgz", - "integrity": "sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.1.tgz", + "integrity": "sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw==", "cpu": [ "x64" ], @@ -721,9 +721,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.0.tgz", - "integrity": "sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.1.tgz", + "integrity": "sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg==", "cpu": [ "x64" ], @@ -738,9 +738,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.0.tgz", - "integrity": "sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.1.tgz", + "integrity": "sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ==", "cpu": [ "arm64" ], @@ -755,9 +755,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.0.tgz", - "integrity": "sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.1.tgz", + "integrity": "sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A==", "cpu": [ "ia32" ], @@ -772,9 +772,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.0.tgz", - "integrity": "sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.1.tgz", + "integrity": "sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg==", "cpu": [ "x64" ], @@ -1248,13 +1248,13 @@ } }, "node_modules/@playwright/test": { - "version": "1.50.1", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.50.1.tgz", - "integrity": "sha512-Jii3aBg+CEDpgnuDxEp/h7BimHcUTDlpEtce89xEumlJ5ef2hqepZ+PWp1DDpYC/VO9fmWVI1IlEaoI5fK9FXQ==", + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.51.0.tgz", + "integrity": "sha512-dJ0dMbZeHhI+wb77+ljx/FeC8VBP6j/rj9OAojO08JI80wTZy6vRk9KvHKiDCUh4iMpEiseMgqRBIeW+eKX6RA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright": "1.50.1" + "playwright": "1.51.0" }, "bin": { "playwright": "cli.js" @@ -1264,9 +1264,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.9.tgz", - "integrity": "sha512-qZdlImWXur0CFakn2BJ2znJOdqYZKiedEPEVNTBrpfPjc/YuTGcaYZcdmNFTkUj3DU0ZM/AElcM8Ybww3xVLzA==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.35.0.tgz", + "integrity": "sha512-uYQ2WfPaqz5QtVgMxfN6NpLD+no0MYHDBywl7itPYd3K5TjjSghNKmX8ic9S8NU8w81NVhJv/XojcHptRly7qQ==", "cpu": [ "arm" ], @@ -1278,9 +1278,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.9.tgz", - "integrity": "sha512-4KW7P53h6HtJf5Y608T1ISKvNIYLWRKMvfnG0c44M6In4DQVU58HZFEVhWINDZKp7FZps98G3gxwC1sb0wXUUg==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.35.0.tgz", + "integrity": "sha512-FtKddj9XZudurLhdJnBl9fl6BwCJ3ky8riCXjEw3/UIbjmIY58ppWwPEvU3fNu+W7FUsAsB1CdH+7EQE6CXAPA==", "cpu": [ "arm64" ], @@ -1292,9 +1292,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.9.tgz", - "integrity": "sha512-0CY3/K54slrzLDjOA7TOjN1NuLKERBgk9nY5V34mhmuu673YNb+7ghaDUs6N0ujXR7fz5XaS5Aa6d2TNxZd0OQ==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.35.0.tgz", + "integrity": "sha512-Uk+GjOJR6CY844/q6r5DR/6lkPFOw0hjfOIzVx22THJXMxktXG6CbejseJFznU8vHcEBLpiXKY3/6xc+cBm65Q==", "cpu": [ "arm64" ], @@ -1306,9 +1306,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.9.tgz", - "integrity": "sha512-eOojSEAi/acnsJVYRxnMkPFqcxSMFfrw7r2iD9Q32SGkb/Q9FpUY1UlAu1DH9T7j++gZ0lHjnm4OyH2vCI7l7Q==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.35.0.tgz", + "integrity": "sha512-3IrHjfAS6Vkp+5bISNQnPogRAW5GAV1n+bNCrDwXmfMHbPl5EhTmWtfmwlJxFRUCBZ+tZ/OxDyU08aF6NI/N5Q==", "cpu": [ "x64" ], @@ -1320,9 +1320,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.9.tgz", - "integrity": "sha512-2lzjQPJbN5UnHm7bHIUKFMulGTQwdvOkouJDpPysJS+QFBGDJqcfh+CxxtG23Ik/9tEvnebQiylYoazFMAgrYw==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.35.0.tgz", + "integrity": "sha512-sxjoD/6F9cDLSELuLNnY0fOrM9WA0KrM0vWm57XhrIMf5FGiN8D0l7fn+bpUeBSU7dCgPV2oX4zHAsAXyHFGcQ==", "cpu": [ "arm64" ], @@ -1334,9 +1334,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.9.tgz", - "integrity": "sha512-SLl0hi2Ah2H7xQYd6Qaiu01kFPzQ+hqvdYSoOtHYg/zCIFs6t8sV95kaoqjzjFwuYQLtOI0RZre/Ke0nPaQV+g==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.35.0.tgz", + "integrity": "sha512-2mpHCeRuD1u/2kruUiHSsnjWtHjqVbzhBkNVQ1aVD63CcexKVcQGwJ2g5VphOd84GvxfSvnnlEyBtQCE5hxVVw==", "cpu": [ "x64" ], @@ -1348,9 +1348,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.9.tgz", - "integrity": "sha512-88I+D3TeKItrw+Y/2ud4Tw0+3CxQ2kLgu3QvrogZ0OfkmX/DEppehus7L3TS2Q4lpB+hYyxhkQiYPJ6Mf5/dPg==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.35.0.tgz", + "integrity": "sha512-mrA0v3QMy6ZSvEuLs0dMxcO2LnaCONs1Z73GUDBHWbY8tFFocM6yl7YyMu7rz4zS81NDSqhrUuolyZXGi8TEqg==", "cpu": [ "arm" ], @@ -1362,9 +1362,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.9.tgz", - "integrity": "sha512-3qyfWljSFHi9zH0KgtEPG4cBXHDFhwD8kwg6xLfHQ0IWuH9crp005GfoUUh/6w9/FWGBwEHg3lxK1iHRN1MFlA==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.35.0.tgz", + "integrity": "sha512-DnYhhzcvTAKNexIql8pFajr0PiDGrIsBYPRvCKlA5ixSS3uwo/CWNZxB09jhIapEIg945KOzcYEAGGSmTSpk7A==", "cpu": [ "arm" ], @@ -1376,9 +1376,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.9.tgz", - "integrity": "sha512-6TZjPHjKZUQKmVKMUowF3ewHxctrRR09eYyvT5eFv8w/fXarEra83A2mHTVJLA5xU91aCNOUnM+DWFMSbQ0Nxw==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.35.0.tgz", + "integrity": "sha512-uagpnH2M2g2b5iLsCTZ35CL1FgyuzzJQ8L9VtlJ+FckBXroTwNOaD0z0/UF+k5K3aNQjbm8LIVpxykUOQt1m/A==", "cpu": [ "arm64" ], @@ -1390,9 +1390,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.9.tgz", - "integrity": "sha512-LD2fytxZJZ6xzOKnMbIpgzFOuIKlxVOpiMAXawsAZ2mHBPEYOnLRK5TTEsID6z4eM23DuO88X0Tq1mErHMVq0A==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.35.0.tgz", + "integrity": "sha512-XQxVOCd6VJeHQA/7YcqyV0/88N6ysSVzRjJ9I9UA/xXpEsjvAgDTgH3wQYz5bmr7SPtVK2TsP2fQ2N9L4ukoUg==", "cpu": [ "arm64" ], @@ -1404,9 +1404,9 @@ ] }, "node_modules/@rollup/rollup-linux-loongarch64-gnu": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.9.tgz", - "integrity": "sha512-dRAgTfDsn0TE0HI6cmo13hemKpVHOEyeciGtvlBTkpx/F65kTvShtY/EVyZEIfxFkV5JJTuQ9tP5HGBS0hfxIg==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.35.0.tgz", + "integrity": "sha512-5pMT5PzfgwcXEwOaSrqVsz/LvjDZt+vQ8RT/70yhPU06PTuq8WaHhfT1LW+cdD7mW6i/J5/XIkX/1tCAkh1W6g==", "cpu": [ "loong64" ], @@ -1418,9 +1418,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.9.tgz", - "integrity": "sha512-PHcNOAEhkoMSQtMf+rJofwisZqaU8iQ8EaSps58f5HYll9EAY5BSErCZ8qBDMVbq88h4UxaNPlbrKqfWP8RfJA==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.35.0.tgz", + "integrity": "sha512-c+zkcvbhbXF98f4CtEIP1EBA/lCic5xB0lToneZYvMeKu5Kamq3O8gqrxiYYLzlZH6E3Aq+TSW86E4ay8iD8EA==", "cpu": [ "ppc64" ], @@ -1432,9 +1432,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.9.tgz", - "integrity": "sha512-Z2i0Uy5G96KBYKjeQFKbbsB54xFOL5/y1P5wNBsbXB8yE+At3oh0DVMjQVzCJRJSfReiB2tX8T6HUFZ2k8iaKg==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.35.0.tgz", + "integrity": "sha512-s91fuAHdOwH/Tad2tzTtPX7UZyytHIRR6V4+2IGlV0Cej5rkG0R61SX4l4y9sh0JBibMiploZx3oHKPnQBKe4g==", "cpu": [ "riscv64" ], @@ -1446,9 +1446,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.9.tgz", - "integrity": "sha512-U+5SwTMoeYXoDzJX5dhDTxRltSrIax8KWwfaaYcynuJw8mT33W7oOgz0a+AaXtGuvhzTr2tVKh5UO8GVANTxyQ==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.35.0.tgz", + "integrity": "sha512-hQRkPQPLYJZYGP+Hj4fR9dDBMIM7zrzJDWFEMPdTnTy95Ljnv0/4w/ixFw3pTBMEuuEuoqtBINYND4M7ujcuQw==", "cpu": [ "s390x" ], @@ -1460,9 +1460,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.9.tgz", - "integrity": "sha512-FwBHNSOjUTQLP4MG7y6rR6qbGw4MFeQnIBrMe161QGaQoBQLqSUEKlHIiVgF3g/mb3lxlxzJOpIBhaP+C+KP2A==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.35.0.tgz", + "integrity": "sha512-Pim1T8rXOri+0HmV4CdKSGrqcBWX0d1HoPnQ0uw0bdp1aP5SdQVNBy8LjYncvnLgu3fnnCt17xjWGd4cqh8/hA==", "cpu": [ "x64" ], @@ -1474,9 +1474,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.9.tgz", - "integrity": "sha512-cYRpV4650z2I3/s6+5/LONkjIz8MBeqrk+vPXV10ORBnshpn8S32bPqQ2Utv39jCiDcO2eJTuSlPXpnvmaIgRA==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.35.0.tgz", + "integrity": "sha512-QysqXzYiDvQWfUiTm8XmJNO2zm9yC9P/2Gkrwg2dH9cxotQzunBHYr6jk4SujCTqnfGxduOmQcI7c2ryuW8XVg==", "cpu": [ "x64" ], @@ -1488,9 +1488,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.9.tgz", - "integrity": "sha512-z4mQK9dAN6byRA/vsSgQiPeuO63wdiDxZ9yg9iyX2QTzKuQM7T4xlBoeUP/J8uiFkqxkcWndWi+W7bXdPbt27Q==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.35.0.tgz", + "integrity": "sha512-OUOlGqPkVJCdJETKOCEf1mw848ZyJ5w50/rZ/3IBQVdLfR5jk/6Sr5m3iO2tdPgwo0x7VcncYuOvMhBWZq8ayg==", "cpu": [ "arm64" ], @@ -1502,9 +1502,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.9.tgz", - "integrity": "sha512-KB48mPtaoHy1AwDNkAJfHXvHp24H0ryZog28spEs0V48l3H1fr4i37tiyHsgKZJnCmvxsbATdZGBpbmxTE3a9w==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.35.0.tgz", + "integrity": "sha512-2/lsgejMrtwQe44glq7AFFHLfJBPafpsTa6JvP2NGef/ifOa4KBoglVf7AKN7EV9o32evBPRqfg96fEHzWo5kw==", "cpu": [ "ia32" ], @@ -1516,9 +1516,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.9.tgz", - "integrity": "sha512-AyleYRPU7+rgkMWbEh71fQlrzRfeP6SyMnRf9XX4fCdDPAJumdSBqYEcWPMzVQ4ScAl7E4oFfK0GUVn77xSwbw==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.35.0.tgz", + "integrity": "sha512-PIQeY5XDkrOysbQblSW7v3l1MDZzkTEzAfTPkj5VAu3FW8fS4ynyLg2sINp0fp3SjZ8xkRYpLqoKcYqAkhU1dw==", "cpu": [ "x64" ], @@ -1717,9 +1717,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "22.13.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.8.tgz", - "integrity": "sha512-G3EfaZS+iOGYWLLRCEAXdWK9my08oHNZ+FHluRiggIYJPOXzhOiDgpVCUHaUvyIC5/fj7C/p637jdzC666AOKQ==", + "version": "22.13.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz", + "integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==", "dev": true, "license": "MIT", "dependencies": { @@ -1882,17 +1882,17 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.25.0.tgz", - "integrity": "sha512-VM7bpzAe7JO/BFf40pIT1lJqS/z1F8OaSsUB3rpFJucQA4cOSuH2RVVVkFULN+En0Djgr29/jb4EQnedUo95KA==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.26.0.tgz", + "integrity": "sha512-cLr1J6pe56zjKYajK6SSSre6nl1Gj6xDp1TY0trpgPzjVbgDwd09v2Ws37LABxzkicmUjhEeg/fAUjPJJB1v5Q==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.25.0", - "@typescript-eslint/type-utils": "8.25.0", - "@typescript-eslint/utils": "8.25.0", - "@typescript-eslint/visitor-keys": "8.25.0", + "@typescript-eslint/scope-manager": "8.26.0", + "@typescript-eslint/type-utils": "8.26.0", + "@typescript-eslint/utils": "8.26.0", + "@typescript-eslint/visitor-keys": "8.26.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -1908,20 +1908,20 @@ "peerDependencies": { "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.25.0.tgz", - "integrity": "sha512-4gbs64bnbSzu4FpgMiQ1A+D+urxkoJk/kqlDJ2W//5SygaEiAP2B4GoS7TEdxgwol2el03gckFV9lJ4QOMiiHg==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.26.0.tgz", + "integrity": "sha512-mNtXP9LTVBy14ZF3o7JG69gRPBK/2QWtQd0j0oH26HcY/foyJJau6pNUez7QrM5UHnSvwlQcJXKsk0I99B9pOA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.25.0", - "@typescript-eslint/types": "8.25.0", - "@typescript-eslint/typescript-estree": "8.25.0", - "@typescript-eslint/visitor-keys": "8.25.0", + "@typescript-eslint/scope-manager": "8.26.0", + "@typescript-eslint/types": "8.26.0", + "@typescript-eslint/typescript-estree": "8.26.0", + "@typescript-eslint/visitor-keys": "8.26.0", "debug": "^4.3.4" }, "engines": { @@ -1933,18 +1933,18 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.25.0.tgz", - "integrity": "sha512-6PPeiKIGbgStEyt4NNXa2ru5pMzQ8OYKO1hX1z53HMomrmiSB+R5FmChgQAP1ro8jMtNawz+TRQo/cSXrauTpg==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.26.0.tgz", + "integrity": "sha512-E0ntLvsfPqnPwng8b8y4OGuzh/iIOm2z8U3S9zic2TeMLW61u5IH2Q1wu0oSTkfrSzwbDJIB/Lm8O3//8BWMPA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.25.0", - "@typescript-eslint/visitor-keys": "8.25.0" + "@typescript-eslint/types": "8.26.0", + "@typescript-eslint/visitor-keys": "8.26.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1955,14 +1955,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.25.0.tgz", - "integrity": "sha512-d77dHgHWnxmXOPJuDWO4FDWADmGQkN5+tt6SFRZz/RtCWl4pHgFl3+WdYCn16+3teG09DY6XtEpf3gGD0a186g==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.26.0.tgz", + "integrity": "sha512-ruk0RNChLKz3zKGn2LwXuVoeBcUMh+jaqzN461uMMdxy5H9epZqIBtYj7UiPXRuOpaALXGbmRuZQhmwHhaS04Q==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.25.0", - "@typescript-eslint/utils": "8.25.0", + "@typescript-eslint/typescript-estree": "8.26.0", + "@typescript-eslint/utils": "8.26.0", "debug": "^4.3.4", "ts-api-utils": "^2.0.1" }, @@ -1975,13 +1975,13 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/types": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.25.0.tgz", - "integrity": "sha512-+vUe0Zb4tkNgznQwicsvLUJgZIRs6ITeWSCclX1q85pR1iOiaj+4uZJIUp//Z27QWu5Cseiw3O3AR8hVpax7Aw==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.26.0.tgz", + "integrity": "sha512-89B1eP3tnpr9A8L6PZlSjBvnJhWXtYfZhECqlBl1D9Lme9mHO6iWlsprBtVenQvY1HMhax1mWOjhtL3fh/u+pA==", "dev": true, "license": "MIT", "engines": { @@ -1993,14 +1993,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.25.0.tgz", - "integrity": "sha512-ZPaiAKEZ6Blt/TPAx5Ot0EIB/yGtLI2EsGoY6F7XKklfMxYQyvtL+gT/UCqkMzO0BVFHLDlzvFqQzurYahxv9Q==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.26.0.tgz", + "integrity": "sha512-tiJ1Hvy/V/oMVRTbEOIeemA2XoylimlDQ03CgPPNaHYZbpsc78Hmngnt+WXZfJX1pjQ711V7g0H7cSJThGYfPQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.25.0", - "@typescript-eslint/visitor-keys": "8.25.0", + "@typescript-eslint/types": "8.26.0", + "@typescript-eslint/visitor-keys": "8.26.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -2016,7 +2016,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { @@ -2046,16 +2046,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.25.0.tgz", - "integrity": "sha512-syqRbrEv0J1wywiLsK60XzHnQe/kRViI3zwFALrNEgnntn1l24Ra2KvOAWwWbWZ1lBZxZljPDGOq967dsl6fkA==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.26.0.tgz", + "integrity": "sha512-2L2tU3FVwhvU14LndnQCA2frYC8JnPDVKyQtWFPf8IYFMt/ykEN1bPolNhNbCVgOmdzTlWdusCTKA/9nKrf8Ig==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.25.0", - "@typescript-eslint/types": "8.25.0", - "@typescript-eslint/typescript-estree": "8.25.0" + "@typescript-eslint/scope-manager": "8.26.0", + "@typescript-eslint/types": "8.26.0", + "@typescript-eslint/typescript-estree": "8.26.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2066,17 +2066,17 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.25.0.tgz", - "integrity": "sha512-kCYXKAum9CecGVHGij7muybDfTS2sD3t0L4bJsEZLkyrXUImiCTq1M3LG2SRtOhiHFwMR9wAFplpT6XHYjTkwQ==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.26.0.tgz", + "integrity": "sha512-2z8JQJWAzPdDd51dRQ/oqIJxe99/hoLIqmf8RMCAJQtYDc535W/Jt2+RTP4bP0aKeBG1F65yjIZuczOXCmbWwg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.25.0", + "@typescript-eslint/types": "8.26.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -2101,9 +2101,9 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.0.7.tgz", - "integrity": "sha512-Av8WgBJLTrfLOer0uy3CxjlVuWK4CzcLBndW1Nm2vI+3hZ2ozHututkfc7Blu1u6waeQ7J8gzPK/AsBRnWA5mQ==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.0.8.tgz", + "integrity": "sha512-y7SAKsQirsEJ2F8bulBck4DoluhI2EEgTimHd6EEUgJBGKy9tC25cpywh1MH4FvDGoG2Unt7+asVd1kj4qOSAw==", "dev": true, "license": "MIT", "dependencies": { @@ -2124,8 +2124,8 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "@vitest/browser": "3.0.7", - "vitest": "3.0.7" + "@vitest/browser": "3.0.8", + "vitest": "3.0.8" }, "peerDependenciesMeta": { "@vitest/browser": { @@ -2152,14 +2152,14 @@ } }, "node_modules/@vitest/expect": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.0.7.tgz", - "integrity": "sha512-QP25f+YJhzPfHrHfYHtvRn+uvkCFCqFtW9CktfBxmB+25QqWsx7VB2As6f4GmwllHLDhXNHvqedwhvMmSnNmjw==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.0.8.tgz", + "integrity": "sha512-Xu6TTIavTvSSS6LZaA3EebWFr6tsoXPetOWNMOlc7LO88QVVBwq2oQWBoDiLCN6YTvNYsGSjqOO8CAdjom5DCQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "3.0.7", - "@vitest/utils": "3.0.7", + "@vitest/spy": "3.0.8", + "@vitest/utils": "3.0.8", "chai": "^5.2.0", "tinyrainbow": "^2.0.0" }, @@ -2168,13 +2168,13 @@ } }, "node_modules/@vitest/mocker": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.7.tgz", - "integrity": "sha512-qui+3BLz9Eonx4EAuR/i+QlCX6AUZ35taDQgwGkK/Tw6/WgwodSrjN1X2xf69IA/643ZX5zNKIn2svvtZDrs4w==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.8.tgz", + "integrity": "sha512-n3LjS7fcW1BCoF+zWZxG7/5XvuYH+lsFg+BDwwAz0arIwHQJFUEsKBQ0BLU49fCxuM/2HSeBPHQD8WjgrxMfow==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "3.0.7", + "@vitest/spy": "3.0.8", "estree-walker": "^3.0.3", "magic-string": "^0.30.17" }, @@ -2195,9 +2195,9 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.7.tgz", - "integrity": "sha512-CiRY0BViD/V8uwuEzz9Yapyao+M9M008/9oMOSQydwbwb+CMokEq3XVaF3XK/VWaOK0Jm9z7ENhybg70Gtxsmg==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.8.tgz", + "integrity": "sha512-BNqwbEyitFhzYMYHUVbIvepOyeQOSFA/NeJMIP9enMntkkxLgOcgABH6fjyXG85ipTgvero6noreavGIqfJcIg==", "dev": true, "license": "MIT", "dependencies": { @@ -2208,13 +2208,13 @@ } }, "node_modules/@vitest/runner": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.0.7.tgz", - "integrity": "sha512-WeEl38Z0S2ZcuRTeyYqaZtm4e26tq6ZFqh5y8YD9YxfWuu0OFiGFUbnxNynwLjNRHPsXyee2M9tV7YxOTPZl2g==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.0.8.tgz", + "integrity": "sha512-c7UUw6gEcOzI8fih+uaAXS5DwjlBaCJUo7KJ4VvJcjL95+DSR1kova2hFuRt3w41KZEFcOEiq098KkyrjXeM5w==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "3.0.7", + "@vitest/utils": "3.0.8", "pathe": "^2.0.3" }, "funding": { @@ -2222,13 +2222,13 @@ } }, "node_modules/@vitest/snapshot": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.7.tgz", - "integrity": "sha512-eqTUryJWQN0Rtf5yqCGTQWsCFOQe4eNz5Twsu21xYEcnFJtMU5XvmG0vgebhdLlrHQTSq5p8vWHJIeJQV8ovsA==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.8.tgz", + "integrity": "sha512-x8IlMGSEMugakInj44nUrLSILh/zy1f2/BgH0UeHpNyOocG18M9CWVIFBaXPt8TrqVZWmcPjwfG/ht5tnpba8A==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "3.0.7", + "@vitest/pretty-format": "3.0.8", "magic-string": "^0.30.17", "pathe": "^2.0.3" }, @@ -2237,9 +2237,9 @@ } }, "node_modules/@vitest/spy": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.0.7.tgz", - "integrity": "sha512-4T4WcsibB0B6hrKdAZTM37ekuyFZt2cGbEGd2+L0P8ov15J1/HUsUaqkXEQPNAWr4BtPPe1gI+FYfMHhEKfR8w==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.0.8.tgz", + "integrity": "sha512-MR+PzJa+22vFKYb934CejhR4BeRpMSoxkvNoDit68GQxRLSf11aT6CTj3XaqUU9rxgWJFnqicN/wxw6yBRkI1Q==", "dev": true, "license": "MIT", "dependencies": { @@ -2250,13 +2250,13 @@ } }, "node_modules/@vitest/utils": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.0.7.tgz", - "integrity": "sha512-xePVpCRfooFX3rANQjwoditoXgWb1MaFbzmGuPP59MK6i13mrnDw/yEIyJudLeW6/38mCNcwCiJIGmpDPibAIg==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.0.8.tgz", + "integrity": "sha512-nkBC3aEhfX2PdtQI/QwAWp8qZWwzASsU4Npbcd5RdMPBSSLCpkZp52P3xku3s3uA0HIEhGvEcF8rNkBsz9dQ4Q==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "3.0.7", + "@vitest/pretty-format": "3.0.8", "loupe": "^3.1.3", "tinyrainbow": "^2.0.0" }, @@ -3088,9 +3088,9 @@ "license": "MIT" }, "node_modules/esbuild": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.0.tgz", - "integrity": "sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.1.tgz", + "integrity": "sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -3101,31 +3101,31 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.25.0", - "@esbuild/android-arm": "0.25.0", - "@esbuild/android-arm64": "0.25.0", - "@esbuild/android-x64": "0.25.0", - "@esbuild/darwin-arm64": "0.25.0", - "@esbuild/darwin-x64": "0.25.0", - "@esbuild/freebsd-arm64": "0.25.0", - "@esbuild/freebsd-x64": "0.25.0", - "@esbuild/linux-arm": "0.25.0", - "@esbuild/linux-arm64": "0.25.0", - "@esbuild/linux-ia32": "0.25.0", - "@esbuild/linux-loong64": "0.25.0", - "@esbuild/linux-mips64el": "0.25.0", - "@esbuild/linux-ppc64": "0.25.0", - "@esbuild/linux-riscv64": "0.25.0", - "@esbuild/linux-s390x": "0.25.0", - "@esbuild/linux-x64": "0.25.0", - "@esbuild/netbsd-arm64": "0.25.0", - "@esbuild/netbsd-x64": "0.25.0", - "@esbuild/openbsd-arm64": "0.25.0", - "@esbuild/openbsd-x64": "0.25.0", - "@esbuild/sunos-x64": "0.25.0", - "@esbuild/win32-arm64": "0.25.0", - "@esbuild/win32-ia32": "0.25.0", - "@esbuild/win32-x64": "0.25.0" + "@esbuild/aix-ppc64": "0.25.1", + "@esbuild/android-arm": "0.25.1", + "@esbuild/android-arm64": "0.25.1", + "@esbuild/android-x64": "0.25.1", + "@esbuild/darwin-arm64": "0.25.1", + "@esbuild/darwin-x64": "0.25.1", + "@esbuild/freebsd-arm64": "0.25.1", + "@esbuild/freebsd-x64": "0.25.1", + "@esbuild/linux-arm": "0.25.1", + "@esbuild/linux-arm64": "0.25.1", + "@esbuild/linux-ia32": "0.25.1", + "@esbuild/linux-loong64": "0.25.1", + "@esbuild/linux-mips64el": "0.25.1", + "@esbuild/linux-ppc64": "0.25.1", + "@esbuild/linux-riscv64": "0.25.1", + "@esbuild/linux-s390x": "0.25.1", + "@esbuild/linux-x64": "0.25.1", + "@esbuild/netbsd-arm64": "0.25.1", + "@esbuild/netbsd-x64": "0.25.1", + "@esbuild/openbsd-arm64": "0.25.1", + "@esbuild/openbsd-x64": "0.25.1", + "@esbuild/sunos-x64": "0.25.1", + "@esbuild/win32-arm64": "0.25.1", + "@esbuild/win32-ia32": "0.25.1", + "@esbuild/win32-x64": "0.25.1" } }, "node_modules/escalade": { @@ -3217,13 +3217,13 @@ } }, "node_modules/eslint-config-prettier": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.0.2.tgz", - "integrity": "sha512-1105/17ZIMjmCOJOPNfVdbXafLCLj3hPmkmB7dLgt7XsQ/zkxSuDerE/xgO3RxoHysR1N1whmquY0lSn2O0VLg==", + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.1.tgz", + "integrity": "sha512-4EQQr6wXwS+ZJSzaR5ZCrYgLxqvUjdXctaEtBqHcbkW944B1NQyO4qpdHQbXBONfwxXdkAY81HH4+LUfrg+zPw==", "dev": true, "license": "MIT", "bin": { - "eslint-config-prettier": "build/bin/cli.js" + "eslint-config-prettier": "bin/cli.js" }, "peerDependencies": { "eslint": ">=7.0.0" @@ -4938,9 +4938,9 @@ "dev": true }, "node_modules/oidc-provider": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/oidc-provider/-/oidc-provider-8.8.0.tgz", - "integrity": "sha512-5b4QncVOVsU8BLpD0ofQBRq2aX9Juhc0wFbaZSQbAmgN1jVfCZfYt3GEPPmJ8Tc/mvfX735PNH/LnuyWzMn9tQ==", + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/oidc-provider/-/oidc-provider-8.8.1.tgz", + "integrity": "sha512-qVChpayTwojUREJxLkFofUSK8kiSRIdzPrVSsoGibqRHl/YO60ege94OZS8vh7zaK+zxcG/Gu8UMaYB5ulohCQ==", "dev": true, "license": "MIT", "dependencies": { @@ -5333,13 +5333,13 @@ } }, "node_modules/playwright": { - "version": "1.50.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.50.1.tgz", - "integrity": "sha512-G8rwsOQJ63XG6BbKj2w5rHeavFjy5zynBA9zsJMMtBoe/Uf757oG12NXz6e6OirF7RCrTVAKFXbLmn1RbL7Qaw==", + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.51.0.tgz", + "integrity": "sha512-442pTfGM0xxfCYxuBa/Pu6B2OqxqqaYq39JS8QDMGThUvIOCd6s0ANDog3uwA0cHavVlnTQzGCN7Id2YekDSXA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.50.1" + "playwright-core": "1.51.0" }, "bin": { "playwright": "cli.js" @@ -5352,9 +5352,9 @@ } }, "node_modules/playwright-core": { - "version": "1.50.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.50.1.tgz", - "integrity": "sha512-ra9fsNWayuYumt+NiM069M6OkcRb1FZSK8bgi66AtpFoWkg2+y0bJSNmkFrWhMbEBbVKC/EruAHH3g0zmtwGmQ==", + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.51.0.tgz", + "integrity": "sha512-x47yPE3Zwhlil7wlNU/iktF7t2r/URR3VLbH6EknJd/04Qc/PSJ0EY3CMXipmglLG+zyRxW6HNo2EGbKLHPWMg==", "dev": true, "license": "Apache-2.0", "bin": { @@ -5412,9 +5412,9 @@ } }, "node_modules/postcss/node_modules/nanoid": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", - "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", + "version": "3.3.9", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.9.tgz", + "integrity": "sha512-SppoicMGpZvbF1l3z4x7No3OlIjP7QJvC9XR7AhZr1kL133KHnKPztkKDc+Ir4aJ/1VhTySrtKhrsycmrMQfvg==", "dev": true, "funding": [ { @@ -5485,9 +5485,9 @@ } }, "node_modules/prettier": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.2.tgz", - "integrity": "sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz", + "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==", "dev": true, "license": "MIT", "bin": { @@ -5822,9 +5822,9 @@ } }, "node_modules/rollup": { - "version": "4.34.9", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.9.tgz", - "integrity": "sha512-nF5XYqWWp9hx/LrpC8sZvvvmq0TeTjQgaZHYmAgwysT9nh8sWnZhBnM8ZyVbbJFIQBLwHDNoMqsBZBbUo4U8sQ==", + "version": "4.35.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.35.0.tgz", + "integrity": "sha512-kg6oI4g+vc41vePJyO6dHt/yl0Rz3Thv0kJeVQ3D1kS3E5XSuKbPc29G4IpT/Kv1KQwgHVcN+HtyS+HYLNSvQg==", "dev": true, "license": "MIT", "dependencies": { @@ -5838,25 +5838,25 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.34.9", - "@rollup/rollup-android-arm64": "4.34.9", - "@rollup/rollup-darwin-arm64": "4.34.9", - "@rollup/rollup-darwin-x64": "4.34.9", - "@rollup/rollup-freebsd-arm64": "4.34.9", - "@rollup/rollup-freebsd-x64": "4.34.9", - "@rollup/rollup-linux-arm-gnueabihf": "4.34.9", - "@rollup/rollup-linux-arm-musleabihf": "4.34.9", - "@rollup/rollup-linux-arm64-gnu": "4.34.9", - "@rollup/rollup-linux-arm64-musl": "4.34.9", - "@rollup/rollup-linux-loongarch64-gnu": "4.34.9", - "@rollup/rollup-linux-powerpc64le-gnu": "4.34.9", - "@rollup/rollup-linux-riscv64-gnu": "4.34.9", - "@rollup/rollup-linux-s390x-gnu": "4.34.9", - "@rollup/rollup-linux-x64-gnu": "4.34.9", - "@rollup/rollup-linux-x64-musl": "4.34.9", - "@rollup/rollup-win32-arm64-msvc": "4.34.9", - "@rollup/rollup-win32-ia32-msvc": "4.34.9", - "@rollup/rollup-win32-x64-msvc": "4.34.9", + "@rollup/rollup-android-arm-eabi": "4.35.0", + "@rollup/rollup-android-arm64": "4.35.0", + "@rollup/rollup-darwin-arm64": "4.35.0", + "@rollup/rollup-darwin-x64": "4.35.0", + "@rollup/rollup-freebsd-arm64": "4.35.0", + "@rollup/rollup-freebsd-x64": "4.35.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.35.0", + "@rollup/rollup-linux-arm-musleabihf": "4.35.0", + "@rollup/rollup-linux-arm64-gnu": "4.35.0", + "@rollup/rollup-linux-arm64-musl": "4.35.0", + "@rollup/rollup-linux-loongarch64-gnu": "4.35.0", + "@rollup/rollup-linux-powerpc64le-gnu": "4.35.0", + "@rollup/rollup-linux-riscv64-gnu": "4.35.0", + "@rollup/rollup-linux-s390x-gnu": "4.35.0", + "@rollup/rollup-linux-x64-gnu": "4.35.0", + "@rollup/rollup-linux-x64-musl": "4.35.0", + "@rollup/rollup-win32-arm64-msvc": "4.35.0", + "@rollup/rollup-win32-ia32-msvc": "4.35.0", + "@rollup/rollup-win32-x64-msvc": "4.35.0", "fsevents": "~2.3.2" } }, @@ -6484,9 +6484,9 @@ } }, "node_modules/typescript": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz", - "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==", + "version": "5.8.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz", + "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", "dev": true, "license": "Apache-2.0", "bin": { @@ -6593,9 +6593,9 @@ } }, "node_modules/vite": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.0.tgz", - "integrity": "sha512-7dPxoo+WsT/64rDcwoOjk76XHj+TqNTIvHKcuMQ1k4/SeHDaQt5GFAeLYzrimZrMpn/O6DtdI03WUjdxuPM0oQ==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.1.tgz", + "integrity": "sha512-n2GnqDb6XPhlt9B8olZPrgMD/es/Nd1RdChF6CBD/fHW6pUyUTt2sQW2fPRX5GiD9XEa6+8A6A4f2vT6pSsE7Q==", "dev": true, "license": "MIT", "dependencies": { @@ -6665,9 +6665,9 @@ } }, "node_modules/vite-node": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.0.7.tgz", - "integrity": "sha512-2fX0QwX4GkkkpULXdT1Pf4q0tC1i1lFOyseKoonavXUNlQ77KpW2XqBGGNIm/J4Ows4KxgGJzDguYVPKwG/n5A==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.0.8.tgz", + "integrity": "sha512-6PhR4H9VGlcwXZ+KWCdMqbtG649xCPZqfI9j2PsK1FcXgEzro5bGHcVKFCTqPLaNKZES8Evqv4LwvZARsq5qlg==", "dev": true, "license": "MIT", "dependencies": { @@ -6721,19 +6721,19 @@ } }, "node_modules/vitest": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.7.tgz", - "integrity": "sha512-IP7gPK3LS3Fvn44x30X1dM9vtawm0aesAa2yBIZ9vQf+qB69NXC5776+Qmcr7ohUXIQuLhk7xQR0aSUIDPqavg==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.8.tgz", + "integrity": "sha512-dfqAsNqRGUc8hB9OVR2P0w8PZPEckti2+5rdZip0WIz9WW0MnImJ8XiR61QhqLa92EQzKP2uPkzenKOAHyEIbA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/expect": "3.0.7", - "@vitest/mocker": "3.0.7", - "@vitest/pretty-format": "^3.0.7", - "@vitest/runner": "3.0.7", - "@vitest/snapshot": "3.0.7", - "@vitest/spy": "3.0.7", - "@vitest/utils": "3.0.7", + "@vitest/expect": "3.0.8", + "@vitest/mocker": "3.0.8", + "@vitest/pretty-format": "^3.0.8", + "@vitest/runner": "3.0.8", + "@vitest/snapshot": "3.0.8", + "@vitest/spy": "3.0.8", + "@vitest/utils": "3.0.8", "chai": "^5.2.0", "debug": "^4.4.0", "expect-type": "^1.1.0", @@ -6745,7 +6745,7 @@ "tinypool": "^1.0.2", "tinyrainbow": "^2.0.0", "vite": "^5.0.0 || ^6.0.0", - "vite-node": "3.0.7", + "vite-node": "3.0.8", "why-is-node-running": "^2.3.0" }, "bin": { @@ -6761,8 +6761,8 @@ "@edge-runtime/vm": "*", "@types/debug": "^4.1.12", "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", - "@vitest/browser": "3.0.7", - "@vitest/ui": "3.0.7", + "@vitest/browser": "3.0.8", + "@vitest/ui": "3.0.8", "happy-dom": "*", "jsdom": "*" }, diff --git a/e2e/package.json b/e2e/package.json index 657a51f568..e7dacf3c26 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -25,7 +25,7 @@ "@immich/sdk": "file:../open-api/typescript-sdk", "@playwright/test": "^1.44.1", "@types/luxon": "^3.4.2", - "@types/node": "^22.13.5", + "@types/node": "^22.13.9", "@types/oidc-provider": "^8.5.1", "@types/pg": "^8.11.0", "@types/pngjs": "^6.0.4", diff --git a/i18n/af.json b/i18n/af.json index 92286a7f04..349626306f 100644 --- a/i18n/af.json +++ b/i18n/af.json @@ -57,7 +57,7 @@ "exclusion_pattern_description": "Met uitsluitingspatrone kan jy lêers en vouers ignoreer wanneer jy jou biblioteek skandeer. Dit is nuttig as jy vouers het wat lêers bevat wat jy nie wil invoer nie, soos RAW-lêers.", "external_library_created_at": "Eksterne biblioteek (geskep op {date})", "external_library_management": "Eksterne Biblioteek-opsies", - "face_detection": "Gesigsopsporing", + "face_detection": "Gesig deteksie", "failed_job_command": "Opdrag {command} het misluk vir werk: {job}", "force_delete_user_warning": "WAARSKUWING: Dit sal onmiddellik die gebruiker en alle bates verwyder. Dit kan nie ontdoen word nie en die lêers kan nie herstel word nie.", "forcing_refresh_library_files": "Forseer herlaai van alle biblioteeklêers", diff --git a/i18n/ar.json b/i18n/ar.json index b94a9bf08a..66e4045606 100644 --- a/i18n/ar.json +++ b/i18n/ar.json @@ -41,6 +41,7 @@ "backup_settings": "إعدادات النسخ الاحتياطي", "backup_settings_description": "إدارة إعدادات النسخ الاحتياطي لقاعدة البيانات", "check_all": "اختر الكل", + "cleanup": "تنظيف", "cleared_jobs": "تم إخلاء مهام: {job}", "config_set_by_file": "الإعدادات حاليًا معينة عن طريق ملف الاعدادات", "confirm_delete_library": "هل أنت متأكد أنك تريد حذف مكتبة {library}؟", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "تفعيل فحص المكتبة الدوري", "library_settings": "المكتبة الخارجية", "library_settings_description": "إدارة إعدادات المكتبة الخارجية", - "library_tasks_description": "قم بتنفيذ مهام المكتبة", + "library_tasks_description": "مسح المكتبات الخارجية للعثور على الأصول الجديدة و/أو المتغيرة", "library_watching_enable_description": "راقب المكتبات الخارجية لتتبع تغييرات الملفات", "library_watching_settings": "مراقبة المكتبات (تجريبي)", "library_watching_settings_description": "راقب تلقائيًا التغييرات في الملفات", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "البحث عن الصور بشكل دلالي باستخدام تضمينات CLIP", "machine_learning_smart_search_enabled": "تفعيل البحث الذكي", "machine_learning_smart_search_enabled_description": "إذا تم تعطيله، فلن يتم ترميز الصور للبحث الذكي.", - "machine_learning_url_description": "عنوان URL لخادم التعلم الآلي. إذا تم توفير أكثر من عنوان URL، فسيتم محاولة الوصول إلى كل خادم على حدة حتى يستجيب أحد الخوادم بنجاح، بالترتيب من الأول إلى الأخير.", + "machine_learning_url_description": "عنوان URL لخادم التعلم الآلي. إذا تم توفير أكثر من عنوان URL واحد، سيتم محاولة الاتصال بكل خادم على حدة حتى يستجيب أحدهم بنجاح، بدءًا من الأول إلى الأخير. سيتم تجاهل الخوادم التي لا تستجيب مؤقتًا حتى تعود للعمل.", "manage_concurrency": "إدارة التزامن", "manage_log_settings": "إدارة إعدادات السجلات", "map_dark_style": "النمط الداكن", @@ -147,6 +148,8 @@ "map_settings": "الخريطة", "map_settings_description": "إدارة إعدادات الخريطة", "map_style_description": "عنوان URL لسمة الخريطة style.json", + "memory_cleanup_job": "تنظيف الذاكرة", + "memory_generate_job": "توليد الذاكرة", "metadata_extraction_job": "استخراج البيانات الوصفية", "metadata_extraction_job_description": "استخراج معلومات البيانات الوصفية من كل أصل، مثل إحداثيات الموقع, الوجوه والدقة", "metadata_faces_import_setting": "تمكين استيراد الوجه", @@ -391,6 +394,7 @@ "allow_edits": "إسمح بالتعديل", "allow_public_user_to_download": "السماح لأي مستخدم عام بالتنزيل", "allow_public_user_to_upload": "السماح للمستخدم العام بالرفع", + "alt_text_qr_code": "صورة رمز الاستجابة السريعة (QR)", "anti_clockwise": "عكس اتجاه عقارب الساعة", "api_key": "مفتاح واجهة برمجة التطبيقات", "api_key_description": "سيتم عرض هذه القيمة مرة واحدة فقط. يرجى التأكد من نسخها قبل إغلاق النافذة.", @@ -481,6 +485,7 @@ "comments_are_disabled": "التعليقات معطلة", "confirm": "تأكيد", "confirm_admin_password": "تأكيد كلمة مرور المسؤول", + "confirm_delete_face": "هل أنت متأكد من حذف وجه {name} من الأصول؟", "confirm_delete_shared_link": "هل أنت متأكد أنك تريد حذف هذا الرابط المشترك؟", "confirm_keep_this_delete_others": "سيتم حذف جميع الأصول الأخرى في المجموعة باستثناء هذا الأصل. هل أنت متأكد من أنك تريد المتابعة؟", "confirm_password": "تأكيد كلمة المرور", @@ -533,6 +538,7 @@ "delete_album": "حذف الألبوم", "delete_api_key_prompt": "هل أنت متأكد أنك تريد حذف مفتاح API هذا؟", "delete_duplicates_confirmation": "هل أنت متأكد أنك تريد حذف هذه التكرارات نهائيًا؟", + "delete_face": "حذف الوجه", "delete_key": "حذف المفتاح", "delete_library": "حذف المكتبة", "delete_link": "حذف الرابط", @@ -600,6 +606,7 @@ "enabled": "مفعل", "end_date": "تاريخ الإنتهاء", "error": "خطأ", + "error_delete_face": "حدث خطأ في حذف الوجه من الأصول", "error_loading_image": "حدث خطأ أثناء تحميل الصورة", "error_title": "خطأ - حدث خللٌ ما", "errors": { @@ -769,7 +776,7 @@ "group_country": "مجموعة البلد", "group_no": "بدون تجميع", "group_owner": "تجميع حسب المالك", - "group_places_by": "تجميع الأماكن حسب", + "group_places_by": "تجميع الأماكن حسب...", "group_year": "تجميع حسب السنة", "has_quota": "محدد بحصة", "hi_user": "مرحبا {name} ({email})", @@ -884,6 +891,7 @@ "month": "شهر", "more": "المزيد", "moved_to_trash": "تم النقل إلى سلة المهملات", + "mute_memories": "كتم الذكريات", "my_albums": "ألبوماتي", "name": "الاسم", "name_or_nickname": "الاسم أو اللقب", @@ -1076,6 +1084,8 @@ "removed_from_archive": "تمت إزالتها من الأرشيف", "removed_from_favorites": "تمت الإزالة من المفضلة", "removed_from_favorites_count": "{count, plural, other {أُزيلت #}} من التفضيلات", + "removed_memory": "الذاكرة المحذوفة", + "removed_photo_from_memory": "تم إزالة الصورة من الذاكرة", "removed_tagged_assets": "تمت إزالة العلامة من {count, plural, one {# الأصل} other {# الأصول}}", "rename": "إعادة تسمية", "repair": "إصلاح", @@ -1084,6 +1094,7 @@ "repository": "المستودع", "require_password": "يتطلب كلمة المرور", "require_user_to_change_password_on_first_login": "مطالبة المستخدم بتغيير كلمة المرور عند تسجيل الدخول لأول مرة", + "rescan": "إعادة المسح", "reset": "إعادة ضبط", "reset_password": "إعادة تعيين كلمة المرور", "reset_people_visibility": "إعادة ضبط ظهور الأشخاص", @@ -1127,6 +1138,7 @@ "search_options": "خيارات البحث", "search_people": "البحث عن الأشخاص", "search_places": "البحث عن الأماكن", + "search_rating": "البحث حسب التقييم...", "search_settings": "إعدادات البحث", "search_state": "البحث حسب الولاية...", "search_tags": "البحث عن العلامات...", @@ -1250,6 +1262,7 @@ "tag_created": "تم إنشاء العلامة: {tag}", "tag_feature_description": "تصفح الصور ومقاطع الفيديو المجمعة حسب مواضيع العلامات المنطقية", "tag_not_found_question": "لا يمكن العثور على علامة؟ قم بإنشاء علامة جديدة.", + "tag_people": "علِّم الأشخاص", "tag_updated": "تم تحديث العلامة: {tag}", "tagged_assets": "تم وضع علامة {count, plural, one {# asset} other {# assets}}", "tags": "العلامات", @@ -1290,6 +1303,7 @@ "unlink_motion_video": "إلغاء ربط فيديو الحركة", "unlink_oauth": "إلغاء ربط OAuth", "unlinked_oauth_account": "تم إلغاء ربط حساب OAuth", + "unmute_memories": "تشغيل الصوت للذكريات", "unnamed_album": "ألبوم بلا إسم", "unnamed_album_delete_confirmation": "هل أنت متأكد أنك تريد حذف هذا الألبوم؟", "unnamed_share": "مشاركة بلا إسم", @@ -1343,6 +1357,7 @@ "view_all": "عرض الكل", "view_all_users": "عرض كافة المستخدمين", "view_in_timeline": "عرض في الجدول الزمني", + "view_link": "عرض الرابط", "view_links": "عرض الروابط", "view_name": "عرض", "view_next_asset": "عرض المحتوى التالي", diff --git a/i18n/bg.json b/i18n/bg.json index 47c1a82508..72948d8d50 100644 --- a/i18n/bg.json +++ b/i18n/bg.json @@ -20,7 +20,7 @@ "add_partner": "Добавете партньор", "add_path": "Добави път", "add_photos": "Добавете снимки", - "add_to": "Добави към...", + "add_to": "Добави към…", "add_to_album": "Добави към албум", "add_to_shared_album": "Добави към споделен албум", "add_url": "Добави URL", @@ -41,6 +41,7 @@ "backup_settings": "Настройка на резервни копия", "backup_settings_description": "Управление на настройките за резервно копие на базата данни", "check_all": "Провери всичко", + "cleanup": "Почистване", "cleared_jobs": "Изчистени задачи от тип: {job}", "config_set_by_file": "Конфигурацията е зададена от файл", "confirm_delete_library": "Сигурни ли сте че искате да изтриете библиотеката - {library} ?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Включване на периодичното сканиране на библиотеката", "library_settings": "Външна библиотека", "library_settings_description": "Управление на настройките за външна библиотека", - "library_tasks_description": "Извършване на задачи за библиотеката", + "library_tasks_description": "Сканирайте външни библиотеки за нови и/или променени активи", "library_watching_enable_description": "Наблюдаване за промяна на файловете във външната библиотека", "library_watching_settings": "Наблюдаване на библиотеката (ЕКСПЕРИМЕНТАЛНО)", "library_watching_settings_description": "Автоматично наблюдавай за променени файлове", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Семантично търсене на изображения с помощта на CLIP вграждания", "machine_learning_smart_search_enabled": "Включване на Интелигентно Търсене", "machine_learning_smart_search_enabled_description": "Ако е деактивирано, изображенията няма да бъдат кодирани за Интелигентно Търсене.", - "machine_learning_url_description": "URL на сървъра за машинно обучение. Ако са предоставени повече от един URL, всеки сървър ще бъде опитан един по един, докато един не отговори успешно, в реда от първия до последния.", + "machine_learning_url_description": "URL на сървъра за машинно обучение. Ако са предоставени повече от един URL, всеки сървър ще бъде опитан един по един, докато един отговори успешно, в реда от първия до последния. Сървъри, които не отговорят, ще бъдат временно игнорирани, докато не се върнат онлайн.", "manage_concurrency": "Управление на паралелност", "manage_log_settings": "Управление на настройките на записване", "map_dark_style": "Тъмен стил", @@ -147,6 +148,8 @@ "map_settings": "Карта", "map_settings_description": "Управление на настройките на картата", "map_style_description": "URL адрес към файл \"style.json\" за задаване на стил на картата", + "memory_cleanup_job": "Почистване на паметта", + "memory_generate_job": "Генериране на паметта", "metadata_extraction_job": "Извличане на метаданни", "metadata_extraction_job_description": "Извличане на метаданни от всеки от елемент, като GPS локация, лица и резолюция на файловете", "metadata_faces_import_setting": "Включи импорт на лице", @@ -219,7 +222,7 @@ "reset_settings_to_default": "Възстановяване на настройките по подразбиране", "reset_settings_to_recent_saved": "Възстановяване на настройките до последните запазени настройки", "scanning_library": "Сканиране на библиотеката", - "search_jobs": "Търсене на задачи...", + "search_jobs": "Търсене на задачи…", "send_welcome_email": "Изпращане на имейл за добре дошли", "server_external_domain_settings": "Външен домейн", "server_external_domain_settings_description": "Домейн за публични споделени връзки, включително http(s)://", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "Максимални B-фрейма", "transcoding_max_b_frames_description": "По-високите стойности подобряват ефективността на компресията, но забавят разкодирането. Може да не е съвместим с хардуерното ускорение на по-стари устройства. 0 деактивира B-фрейма, докато -1 задава тази стойност автоматично.", "transcoding_max_bitrate": "Максимален битрейт", - "transcoding_max_bitrate_description": "Задаването на максимален битрейт може да направи размерите на файловете по-предвидими при незначителни разлики за качеството. При 720p типичните стойности са 2600k за VP9 или HEVC или 4500k за H.264. Деактивирано, ако е зададено на 0.", + "transcoding_max_bitrate_description": "Задаването на максимален битрейт може да направи размерите на файловете по-предвидими при незначителни разлики за качеството. При 720p типичните стойности са 2600 kbit/s за VP9 или HEVC или 4500 kbit/s за H.264. Деактивирано, ако е зададено на 0.", "transcoding_max_keyframe_interval": "Максимален интервал между ключовите кадри", "transcoding_max_keyframe_interval_description": "Задава максималното разстояние между ключовите кадри. По-ниските стойности влошават ефективността на компресията, но подобряват времето за търсене и могат да подобрят качеството в сцени с бързо движение. 0 задава тази стойност автоматично.", "transcoding_optimal_description": "Видеоклипове с по-висока от целевата разделителна способност или не в приетия формат", @@ -391,6 +394,7 @@ "allow_edits": "Позволяване на редакции", "allow_public_user_to_download": "Позволете на публичен потребител да може да изтегля", "allow_public_user_to_upload": "Позволете на публичния потребител да може да качва", + "alt_text_qr_code": "Изображение на QR код", "anti_clockwise": "Обратно на часовниковата стрелка", "api_key": "API ключ", "api_key_description": "Тази стойност ще бъде показана само веднъж. Моля, не забравяйте да го копирате, преди да затворите прозореца.", @@ -406,17 +410,17 @@ "are_these_the_same_person": "Това едно и също лице ли е?", "are_you_sure_to_do_this": "Сигурни ли сте, че искате да направите това?", "asset_added_to_album": "Добавено в албум", - "asset_adding_to_album": "Добавяне в албум...", + "asset_adding_to_album": "Добавяне в албум…", "asset_description_updated": "Описанието на елемента е обновено", "asset_filename_is_offline": "Активът {filename} е офлайн", "asset_has_unassigned_faces": "Елементът има незададени лица", - "asset_hashing": "Хеширане...", + "asset_hashing": "Хеширане…", "asset_offline": "Елементът е офлайн", "asset_offline_description": "Този външен актив вече не се намира на диска. Моля, свържете се с администратора на Immich за помощ.", "asset_skipped": "Пропуснато", "asset_skipped_in_trash": "В кошчето", "asset_uploaded": "Качено", - "asset_uploading": "Качване...", + "asset_uploading": "Качване…", "assets": "Елементи", "assets_added_count": "Добавено {count, plural, one {# asset} other {# assets}}", "assets_added_to_album_count": "Добавен(и) са {count, plural, one {# актив} other {# актива}} в албума", @@ -481,6 +485,7 @@ "comments_are_disabled": "Коментарите са деактивирани", "confirm": "Потвърди", "confirm_admin_password": "Потвърждаване на паролата на администратора", + "confirm_delete_face": "Сигурни ли сте, че искате да изтриете лицето на {name} от актива?", "confirm_delete_shared_link": "Сигурни ли сте, че искате да изтриете тази споделена връзка?", "confirm_keep_this_delete_others": "Всички останали файлове в стека ще бъдат изтрити, с изключение на този файл. Сигурни ли сте, че искате да продължите?", "confirm_password": "Потвърдете паролата", @@ -533,6 +538,7 @@ "delete_album": "Изтрий албум", "delete_api_key_prompt": "Сигурни ли сте, че искате да изтриете този API ключ?", "delete_duplicates_confirmation": "Сигурни ли сте, че искате да изтриете окончателно тези дубликати?", + "delete_face": "Изтрий лице", "delete_key": "Изтрий ключ", "delete_library": "Изтрий библиотека", "delete_link": "Изтрий линк", @@ -600,6 +606,7 @@ "enabled": "Включено", "end_date": "Крайна дата", "error": "Грешка", + "error_delete_face": "Грешка при изтриване на лице от актива", "error_loading_image": "Грешка при зареждане на изображението", "error_title": "Грешка - нещо се обърка", "errors": { @@ -766,8 +773,10 @@ "go_to_folder": "Отиди в папката", "go_to_search": "Преминаване към търсене", "group_albums_by": "Групирай албум по...", + "group_country": "Групирай по държава", "group_no": "Няма група", "group_owner": "Групиране по собственик", + "group_places_by": "Групирай места по…", "group_year": "Групиране по година", "has_quota": "Лимит", "hi_user": "Здравей, {name} {email}", @@ -800,6 +809,7 @@ "include_shared_albums": "Включване на споделени албуми", "include_shared_partner_assets": "Включване на споделените с партньор елементи", "individual_share": "Индивидуално споделяне", + "individual_shares": "Индивидуални споделяния", "info": "Информация", "interval": { "day_at_onepm": "Всеки ден в 13:00", @@ -822,6 +832,7 @@ "latest_version": "Последна версия", "latitude": "Ширина", "leave": "Излез", + "lens_model": "Модел леща", "let_others_respond": "Позволете на другите да отговорят", "level": "Ниво", "library": "Библиотека", @@ -880,6 +891,7 @@ "month": "Месец", "more": "Още", "moved_to_trash": "Преместено в кошчето", + "mute_memories": "Изключване на звука на спомените", "my_albums": "Мои албуми", "name": "Име", "name_or_nickname": "Име или прякор", @@ -984,6 +996,7 @@ "pick_a_location": "Избери локация", "place": "Местоположение", "places": "Местоположения", + "places_count": "{count, plural, one {{count, number} Място} other {{count, number} Места}}", "play": "Възпроизвеждане", "play_memories": "Възпроизвеждане на спомени", "play_motion_photo": "Възпроизведи Motion Photo", @@ -1067,10 +1080,12 @@ "remove_from_shared_link": "Премахни от споделения линк", "remove_url": "Премахни URL", "remove_user": "Премахни потребителя", - "removed_api_key": "Премахни API Key: {name}", - "removed_from_archive": "Премахни от Архива", - "removed_from_favorites": "Премахнато от Любими", + "removed_api_key": "Премахат API ключ: {name}", + "removed_from_archive": "Премахни от архива", + "removed_from_favorites": "Премахнато от любими", "removed_from_favorites_count": "{count, plural, other {Премахнати #}} от Любими", + "removed_memory": "Премахнат спомен", + "removed_photo_from_memory": "Премахната снимка от спомен", "removed_tagged_assets": "Премахнат е етикетът от {count, plural, one {# елемент} other {# елемента}}", "rename": "Преименувай", "repair": "Поправи", @@ -1079,6 +1094,7 @@ "repository": "Хранилище", "require_password": "Изискай парола", "require_user_to_change_password_on_first_login": "Изисквай потребителят да промени паролата си при първото влизане", + "rescan": "Пресканиране", "reset": "Нулиране", "reset_password": "Нулиране на паролата", "reset_people_visibility": "Нулиране на видимостта на хората", @@ -1107,18 +1123,22 @@ "search": "Търсене", "search_albums": "Търси албуми", "search_by_context": "Търси по контекст", + "search_by_description": "Търси по описание", + "search_by_description_example": "Разходка в Сапа", "search_by_filename": "Търси по име на файла или разширение", "search_by_filename_example": "например IMG_1234.JPG или PNG", "search_camera_make": "Търси производител на камерата...", "search_camera_model": "Търси модел на камерата...", "search_city": "Търси град...", "search_country": "Търси държава...", + "search_for": "Търси за", "search_for_existing_person": "Търси съществуващ човек", "search_no_people": "Няма хора", "search_no_people_named": "Няма хора на име \"{name}\"", "search_options": "Опции за търсене", "search_people": "Търсете на хора", "search_places": "Търсене на места", + "search_rating": "Търси по рейтинг…", "search_settings": "Търсене на настройки", "search_state": "Търсене на щат...", "search_tags": "Търсене на етикети...", @@ -1165,6 +1185,7 @@ "shared_from_partner": "Снимки от {partner}", "shared_link_options": "Опции за споделена връзка", "shared_links": "Споделени връзки", + "shared_links_description": "Сподели снимки и видеа с линк", "shared_photos_and_videos_count": "{assetCount, plural, other {# споделени снимки и видеа.}}", "shared_with_partner": "Споделено с {partner}", "sharing": "Споделени", @@ -1187,6 +1208,7 @@ "show_person_options": "Показване на опции за лица", "show_progress_bar": "Показване на прогрес бара", "show_search_options": "Показване на опциите за търсене", + "show_shared_links": "Покажи споделени линкове", "show_slideshow_transition": "Покажи прехода на слайдшоуто", "show_supporter_badge": "Значка поддръжник", "show_supporter_badge_description": "Покажи значка поддръжник", @@ -1240,6 +1262,7 @@ "tag_created": "Създаден етикет: {tag}", "tag_feature_description": "Разглеждане на снимки и видеоклипове, групирани по теми с логически тагове", "tag_not_found_question": "Не можете да намерите етикет? Създайте такъв тук", + "tag_people": "Отбележи Хора", "tag_updated": "Актуализиран етикет: {tag}", "tagged_assets": "Тагнати {count, plural, one {# елемент} other {# елементи}}", "tags": "Етикет", @@ -1274,11 +1297,13 @@ "unfavorite": "Премахване от любимите", "unhide_person": "Покажи отново човека", "unknown": "Неизвестно", + "unknown_country": "Непозната Държава", "unknown_year": "Неизвестна година", "unlimited": "Неограничено", "unlink_motion_video": "Премахни връзката с видео", "unlink_oauth": "Премахни OAuth", "unlinked_oauth_account": "Премахни OAuth акаунт", + "unmute_memories": "Включване на звука на спомените", "unnamed_album": "Албум без име", "unnamed_album_delete_confirmation": "Сигурни ли сте, че искате да изтриете този албум?", "unnamed_share": "Споделяне без име", @@ -1332,6 +1357,7 @@ "view_all": "Преглед на всички", "view_all_users": "Преглед на всички потребители", "view_in_timeline": "Покажи във времева линия", + "view_link": "Преглед на връзката", "view_links": "Преглед на връзките", "view_name": "Прегледай", "view_next_asset": "Преглед на следващия файл", @@ -1348,4 +1374,4 @@ "yes": "Да", "you_dont_have_any_shared_links": "Нямате споделени връзки", "zoom_image": "Увеличаване на изображението" -} +} \ No newline at end of file diff --git a/i18n/ca.json b/i18n/ca.json index ff513d9683..77cb4a584e 100644 --- a/i18n/ca.json +++ b/i18n/ca.json @@ -41,6 +41,7 @@ "backup_settings": "Ajustes de les còpies de seguretat", "backup_settings_description": "Gestionar la configuració de la còpia de seguretat de la base de dades", "check_all": "Marca-ho tot", + "cleanup": "Neteja", "cleared_jobs": "Tasques esborrades per a: {job}", "config_set_by_file": "La configuració està definida per un fitxer de configuració", "confirm_delete_library": "Esteu segurs que voleu eliminar la llibreria {library}?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Habilita l'escaneig periòdic de biblioteques", "library_settings": "Llibreria externes", "library_settings_description": "Gestiona la configuració de les llibreries externes", - "library_tasks_description": "Realitza tasques de la bilbioteca", + "library_tasks_description": "Escaneja biblioteques externes per arxius nous o canviats", "library_watching_enable_description": "Consultar llibreries externes per detectar canvis en fitxers", "library_watching_settings": "Monitoratge de la llibreria (EXPERIMENTAL)", "library_watching_settings_description": "Monitorització automàtica de fitxers modificats", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Cerca imatges semànticament emprant incrustacions CLIP", "machine_learning_smart_search_enabled": "Activa la cerca intel·ligent", "machine_learning_smart_search_enabled_description": "Si està deshabilitat les imatges no es codificaran per la cerca intel·ligent.", - "machine_learning_url_description": "La URL del servidor d'aprenentatge automàtic. Si es proporciona més d'una URL, s'intentarà accedir a cada servidor en ordre fins que un d'ells respongui correctament.", + "machine_learning_url_description": "L'URL del servidor d'aprenentatge automàtic. Si es proporciona més d'un URL, s'intentarà accedir a cada servidor en ordre fins que un d'ells respongui correctament.", "manage_concurrency": "Gestiona la concurrència", "manage_log_settings": "Gestiona la configuració del registre", "map_dark_style": "Tema fosc", @@ -147,6 +148,8 @@ "map_settings": "Mapa", "map_settings_description": "Gestiona la configuració del mapa", "map_style_description": "URL a un tema del mapa style.json", + "memory_cleanup_job": "Neteja de memòries", + "memory_generate_job": "Generació de memòries", "metadata_extraction_job": "Extreure metadades", "metadata_extraction_job_description": "Extreu la informació de metadades de cada element, com per exemple el GPS i la resolució", "metadata_faces_import_setting": "Activar la importació de cares", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "Activa la verificació de hash. No la desactiveu a menys que estigueu segurs de les implicacions", "storage_template_migration": "Migració de plantilles d'emmagatzematge", "storage_template_migration_description": "Aplica la {template} actual als elements pujats prèviament", - "storage_template_migration_info": "Els canvis de plantilla només s'aplicaran a nous elements. Per aplicar la plantilla rectroactivament a elements pujats prèviament, executeu la {job}.", + "storage_template_migration_info": "Les extensions es convertiran a minúscules. Els canvis de plantilla només s'aplicaran a nous elements. Per aplicar la plantilla rectroactivament a elements pujats prèviament, executeu la {job}.", "storage_template_migration_job": "Tasca de migració de la plantilla d'emmagatzematge", "storage_template_more_details": "Per obtenir més detalls sobre aquesta funció, consulteu la Storage Template i les seves implications", "storage_template_onboarding_description": "Quan està activada, aquesta funció organitzarà automàticament els fitxers en funció d'una plantilla definida per l'usuari. A causa de problemes d'estabilitat, la funció s'ha desactivat de manera predeterminada. Per obtenir més informació, consulteu la documentation.", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "Nombre màxim de B-frames", "transcoding_max_b_frames_description": "Els valors més alts milloren l'eficiència de la compressió, però alenteixen la codificació. És possible que no sigui compatible amb l'acceleració de maquinari en dispositius antics. 0 desactiva els B-frames, mentre que -1 estableix aquest valor automàticament.", "transcoding_max_bitrate": "Taxa de bits màxima", - "transcoding_max_bitrate_description": "Establir una taxa de bits màxima pot fer que les mides dels fitxers siguin més previsibles amb un cost menor per a la qualitat. A 720p, els valors típics són 2600k per a VP9 o HEVC, o 4500k per a H.264. Desactivat si s'estableix a 0.", + "transcoding_max_bitrate_description": "Establir una taxa de bits màxima pot fer que les mides dels fitxers siguin més previsibles amb un cost menor per a la qualitat. A 720p, els valors típics són 2600 kbit/s per a VP9 o HEVC, o 4500 kbit/s per a H.264. Desactivat si s'estableix a 0.", "transcoding_max_keyframe_interval": "Interval màxim de fotogrames clau", "transcoding_max_keyframe_interval_description": "Estableix la distància màxima entre fotogrames clau. Els valors més baixos empitjoren l'eficiència de la compressió, però milloren els temps de cerca i poden millorar la qualitat en escenes amb moviment ràpid. 0 estableix aquest valor automàticament.", "transcoding_optimal_description": "Vídeos superiors a la resolució objectiu o que no tenen un format acceptat", @@ -391,6 +394,7 @@ "allow_edits": "Permet editar", "allow_public_user_to_download": "Permet que l'usuari públic pugui descarregar", "allow_public_user_to_upload": "Permet que l'usuari públic pugui carregar", + "alt_text_qr_code": "Codi QR", "anti_clockwise": "En sentit antihorari", "api_key": "Clau API", "api_key_description": "Aquest valor només es mostrarà una vegada. Assegureu-vos de copiar-lo abans de tancar la finestra.", @@ -410,7 +414,7 @@ "asset_description_updated": "La descripció del recurs s'ha actualitzat", "asset_filename_is_offline": "L'element {filename} està fora de línia", "asset_has_unassigned_faces": "L'element té cares no assignades", - "asset_hashing": "Hashing…", + "asset_hashing": "Hasheant…", "asset_offline": "Element fora de línia", "asset_offline_description": "Aquest recurs extern ja no es troba al disc. Poseu-vos en contacte amb el vostre administrador d'Immich per obtenir ajuda.", "asset_skipped": "Saltat", @@ -464,7 +468,7 @@ "check_logs": "Comprovar els registres", "choose_matching_people_to_merge": "Trieu les persones que coincideixin per combinar-les", "city": "Ciutat", - "clear": "Neteja", + "clear": "Buida", "clear_all": "Neteja-ho tot", "clear_all_recent_searches": "Esborra totes les cerques recents", "clear_message": "Neteja el missatge", @@ -481,6 +485,7 @@ "comments_are_disabled": "Els comentaris estan desactivats", "confirm": "Confirmar", "confirm_admin_password": "Confirmeu la contrasenya d'administrador", + "confirm_delete_face": "Estàs segur que vols eliminar la cara de {name} de les cares reconegudes?", "confirm_delete_shared_link": "Esteu segurs que voleu eliminar aquest enllaç compartit?", "confirm_keep_this_delete_others": "Excepte aquest element, tots els altres de la pila se suprimiran. Esteu segur que voleu continuar?", "confirm_password": "Confirmació de contrasenya", @@ -533,6 +538,7 @@ "delete_album": "Esborra l'àlbum", "delete_api_key_prompt": "Esteu segurs que voleu eliminar aquesta clau API?", "delete_duplicates_confirmation": "Esteu segurs que voleu eliminar aquests duplicats permanentment?", + "delete_face": "Esborrar cara", "delete_key": "Suprimeix la clau", "delete_library": "Suprimeix la Llibreria", "delete_link": "Esborra l'enllaç", @@ -600,6 +606,7 @@ "enabled": "Activat", "end_date": "Data final", "error": "Error", + "error_delete_face": "Error esborrant cara de les cares reconegudes", "error_loading_image": "Error carregant la imatge", "error_title": "Error - Quelcom ha anat malament", "errors": { @@ -766,8 +773,10 @@ "go_to_folder": "Anar al directori", "go_to_search": "Vés a cercar", "group_albums_by": "Agrupa àlbums per...", + "group_country": "Agrupar per país", "group_no": "Cap agrupació", "group_owner": "Agrupar per propietari", + "group_places_by": "Agrupar llocs per...", "group_year": "Agrupar per any", "has_quota": "Quota", "hi_user": "Hola {name} ({email})", @@ -800,6 +809,7 @@ "include_shared_albums": "Inclou àlbums compartits", "include_shared_partner_assets": "Incloure elements dels companys", "individual_share": "Compartit individualment", + "individual_shares": "Espais individuals", "info": "Informació", "interval": { "day_at_onepm": "Cada dia a les 13h", @@ -881,6 +891,7 @@ "month": "Mes", "more": "Més", "moved_to_trash": "S'ha mogut a la paperera", + "mute_memories": "Silenciar records", "my_albums": "Els meus àlbums", "name": "Nom", "name_or_nickname": "Nom o sobrenom", @@ -985,6 +996,7 @@ "pick_a_location": "Triar una ubicació", "place": "Lloc", "places": "Llocs", + "places_count": "{count, plural, one {{count, number} Lloc} other {{count, number} Llocs}}", "play": "Reprodueix", "play_memories": "Reproduir records", "play_motion_photo": "Reproduir Fotos en Moviment", @@ -1072,6 +1084,8 @@ "removed_from_archive": "Eliminat de l'arxiu", "removed_from_favorites": "Eliminat dels preferits", "removed_from_favorites_count": "{count, plural, other {# eliminats}} dels preferits", + "removed_memory": "Eliminat memòria", + "removed_photo_from_memory": "Eliminat foto de memòria", "removed_tagged_assets": "Etiqueta eliminada de {count, plural, one {# actiu} other {# actius}}", "rename": "Canviar nom", "repair": "Reparació", @@ -1080,6 +1094,7 @@ "repository": "Repositori", "require_password": "Requereix contrasenya", "require_user_to_change_password_on_first_login": "Requerir que l'usuari canviï la contrasenya en el primer inici de sessió", + "rescan": "Tornar a escanejar", "reset": "Restablir", "reset_password": "Restablir contrasenya", "reset_people_visibility": "Restablir la visibilitat de les persones", @@ -1108,6 +1123,8 @@ "search": "Cerca", "search_albums": "Buscar àlbums", "search_by_context": "Buscar per context", + "search_by_description": "Cercar per descripció", + "search_by_description_example": "Jornada de senderisme a Sapa", "search_by_filename": "Cerca per nom de fitxer o extensió", "search_by_filename_example": "per exemple IMG_1234.JPG o PNG", "search_camera_make": "Buscar per fabricant de càmara...", @@ -1121,6 +1138,7 @@ "search_options": "Opcions de cerca", "search_people": "Buscar persones", "search_places": "Buscar llocs", + "search_rating": "Buscar per qualificació...", "search_settings": "Configuració de cerca", "search_state": "Buscar per regió...", "search_tags": "Cercant etiquetes...", @@ -1167,6 +1185,7 @@ "shared_from_partner": "Fotos de {partner}", "shared_link_options": "Opcions d'enllaços compartits", "shared_links": "Enllaços compartits", + "shared_links_description": "Comparteix fotos i vídeos amb un enllaç", "shared_photos_and_videos_count": "{assetCount, plural, other {# fotos i vídeos compartits.}}", "shared_with_partner": "Compartit amb {partner}", "sharing": "Compartit", @@ -1189,6 +1208,7 @@ "show_person_options": "Mostra opcions de la persona", "show_progress_bar": "Mostra barra de progrés", "show_search_options": "Mostra opcions de cerca", + "show_shared_links": "Mostra els enllaços compartits", "show_slideshow_transition": "Mostra la transició de la presentació de diapositives", "show_supporter_badge": "Insígnia de contribuent", "show_supporter_badge_description": "Mostra una insígnia de contributor", @@ -1242,6 +1262,7 @@ "tag_created": "Etiqueta creada: {tag}", "tag_feature_description": "Exploreu fotos i vídeos agrupats per temes d'etiquetes lògiques", "tag_not_found_question": "No trobeu una etiqueta? Crear una nova etiqueta", + "tag_people": "Etiquetar personas", "tag_updated": "Etiqueta actualizada: {tag}", "tagged_assets": "{count, plural, one {#Etiquetat} other {#Etiquetats}} {count, plural, one {# actiu} other {# actius}}", "tags": "Etiquetes", @@ -1276,11 +1297,13 @@ "unfavorite": "Reverteix preferit", "unhide_person": "Mostra persona", "unknown": "Desconegut", + "unknown_country": "País Desconegut", "unknown_year": "Any desconegut", "unlimited": "Il·limitat", "unlink_motion_video": "Desvincular vídeo en moviment", "unlink_oauth": "Desvincula OAuth", "unlinked_oauth_account": "Compte Oauth desvinculat", + "unmute_memories": "Activar el so dels records", "unnamed_album": "Àlbum sense nom", "unnamed_album_delete_confirmation": "Segur que voleu esborrar aquest àlbum?", "unnamed_share": "Compartit sense nom", @@ -1334,6 +1357,7 @@ "view_all": "Veure tot", "view_all_users": "Mostra tot els usuaris", "view_in_timeline": "Mostrar a la línia de temps", + "view_link": "Veure enllaç", "view_links": "Mostra enllaços", "view_name": "Veure", "view_next_asset": "Mostra el següent element", @@ -1350,4 +1374,4 @@ "yes": "Sí", "you_dont_have_any_shared_links": "No tens cap enllaç compartit", "zoom_image": "Ampliar Imatge" -} +} \ No newline at end of file diff --git a/i18n/cs.json b/i18n/cs.json index 9551ba0b9e..f43be9ee9f 100644 --- a/i18n/cs.json +++ b/i18n/cs.json @@ -41,6 +41,7 @@ "backup_settings": "Nastavení zálohování", "backup_settings_description": "Správa nastavení zálohování databáze", "check_all": "Vše zkontrolovat", + "cleanup": "Vyčištění", "cleared_jobs": "Hotové úlohy pro: {job}", "config_set_by_file": "Konfigurace je aktuálně prováděna konfiguračním souborem", "confirm_delete_library": "Opravdu chcete odstranit knihovnu {library}?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Povolit pravidelné prohledávání knihovny", "library_settings": "Externí knihovna", "library_settings_description": "Správa nastavení externí knihovny", - "library_tasks_description": "Provádění úkolů v knihovně", + "library_tasks_description": "Vyhledávání nových nebo změněných položek v externích knihovnách", "library_watching_enable_description": "Sledovat změny souborů v externích knihovnách", "library_watching_settings": "Sledování knihovny (EXPERIMENTÁLNÍ)", "library_watching_settings_description": "Automatické sledování změněných souborů", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Sémantické vyhledávání obrázků pomocí CLIP embeddings", "machine_learning_smart_search_enabled": "Povolit chytré vyhledávání", "machine_learning_smart_search_enabled_description": "Pokud je vypnuto, obrázky nebudou kódovány pro inteligentní vyhledávání.", - "machine_learning_url_description": "URL serveru strojového učení. Pokud je zadáno více URL adres, budou jednotlivé servery zkoušeny postupně, dokud jeden z nich neodpoví úspěšně, a to v pořadí od prvního k poslednímu.", + "machine_learning_url_description": "URL serveru strojového učení. Pokud je zadáno více URL adres, budou jednotlivé servery zkoušeny postupně, dokud jeden z nich neodpoví úspěšně, a to v pořadí od prvního k poslednímu. Servery, které neodpoví, budou dočasně ignorovány, dokud nebudou opět online.", "manage_concurrency": "Správa souběžnosti", "manage_log_settings": "Správa nastavení protokolu", "map_dark_style": "Tmavý motiv", @@ -147,6 +148,8 @@ "map_settings": "Mapa", "map_settings_description": "Správa nastavení mapy", "map_style_description": "URL na style.json motivu", + "memory_cleanup_job": "Promazání vzpomínek", + "memory_generate_job": "Vytvoření vzpomínek", "metadata_extraction_job": "Extrakce metadat", "metadata_extraction_job_description": "Získání informací o metadatech z každého snímku, jako je GPS, obličeje a rozlišení", "metadata_faces_import_setting": "Povolit import obličeje", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "Povolí ověřování hashe, nevypínejte ji, pokud si nejste jisti důsledky", "storage_template_migration": "Migrace šablony úložiště", "storage_template_migration_description": "Použít aktuální {template} na dříve nahrané položky", - "storage_template_migration_info": "Změny šablon se uplatní pouze u nových položek. Chcete-li šablonu zpětně použít na dříve nahrané položky, spusťte {job}.", + "storage_template_migration_info": "Šablona úložiště převede všechny přípony na malá písmena. Změny šablon se uplatní pouze u nových položek. Chcete-li šablonu zpětně použít na dříve nahrané položky, spusťte {job}.", "storage_template_migration_job": "Úloha migrace šablony úložiště", "storage_template_more_details": "Další podrobnosti o této funkci naleznete v sekci Šablona úložiště včetně jejích důsledků", "storage_template_onboarding_description": "Je-li tato funkce povolena, automaticky uspořádá soubory na základě uživatelem definované šablony. Z důvodu problémů se stabilitou byla tato funkce ve výchozím nastavení vypnuta. Další informace naleznete v dokumentaci.", @@ -288,7 +291,7 @@ "transcoding_constant_quality_mode_description": "ICQ je lepší než CQP, ale některá zařízení pro hardwarovou akceleraci tento režim nepodporují. Nastavením této volby se při použití kódování založeného na kvalitě upřednostní zadaný režim. Ignorováno NVENC, protože nepodporuje ICQ.", "transcoding_constant_rate_factor": "Faktor konstantní rychlosti (-crf)", "transcoding_constant_rate_factor_description": "Úroveň kvality videa. Typické hodnoty jsou 23 pro H.264, 28 pro HEVC, 31 pro VP9 a 35 pro AV1. Nižší je lepší, ale vytváří větší soubory.", - "transcoding_disabled_description": "Nepřekódovávejte žádná videa, u některých klientů může dojít k znemožnění přehrávání", + "transcoding_disabled_description": "Nepřekódovávat žádná videa, u některých klientů může dojít k znemožnění přehrávání", "transcoding_encoding_options": "Možnosti kódování", "transcoding_encoding_options_description": "Nastavte kodeky, rozlišení, kvalitu a další možnosti pro kódovaná videa", "transcoding_hardware_acceleration": "Hardwarová akcelerace", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "Maximální počet B-snímků", "transcoding_max_b_frames_description": "Vyšší hodnoty zvyšují účinnost komprese, ale zpomalují kódování. Nemusí být kompatibilní s hardwarovou akcelerací na starších zařízeních. Hodnota 0 zakáže B-snímky, zatímco -1 tuto hodnotu nastaví automaticky.", "transcoding_max_bitrate": "Maximální datový tok", - "transcoding_max_bitrate_description": "Nastavení maximálního datového toku může zvýšit předvídatelnost velikosti souborů za cenu menší újmy na kvalitě. Při rozlišení 720p jsou typické hodnoty 2600k pro VP9 nebo HEVC nebo 4500k pro H.264. Je zakázáno, pokud je nastavena hodnota 0.", + "transcoding_max_bitrate_description": "Nastavení maximálního datového toku může zvýšit předvídatelnost velikosti souborů za cenu menší újmy na kvalitě. Při rozlišení 720p jsou typické hodnoty 2600 kbit/s pro VP9 nebo HEVC nebo 4500 kbit/s pro H.264. Je zakázáno, pokud je nastavena hodnota 0.", "transcoding_max_keyframe_interval": "Maximální interval klíčových snímků", "transcoding_max_keyframe_interval_description": "Nastavuje maximální vzdálenost mezi klíčovými snímky. Nižší hodnoty zhoršují účinnost komprese, ale zlepšují rychlost při přeskakování a mohou zlepšit kvalitu ve scénách s rychlým pohybem. Hodnota 0 nastavuje tuto hodnotu automaticky.", "transcoding_optimal_description": "Videa s vyšším než cílovým rozlišením nebo videa, která nejsou v akceptovaném formátu", @@ -391,6 +394,7 @@ "allow_edits": "Povolit úpravy", "allow_public_user_to_download": "Povolit veřejnosti stahovat", "allow_public_user_to_upload": "Povolit veřejnosti nahrávat", + "alt_text_qr_code": "Obrázek QR kódu", "anti_clockwise": "Proti směru hodinových ručiček", "api_key": "API klíč", "api_key_description": "Tato hodnota se zobrazí pouze jednou. Před zavřením okna ji nezapomeňte zkopírovat.", @@ -464,11 +468,11 @@ "check_logs": "Zkontrolujte protokoly", "choose_matching_people_to_merge": "Zvolte odpovídající osoby ke sloučení", "city": "Město", - "clear": "Vyčistit", + "clear": "Vymazat", "clear_all": "Vymazat vše", "clear_all_recent_searches": "Vymazat všechna nedávná vyhledávání", - "clear_message": "Vyčistit zprávu", - "clear_value": "Vyčistit hodnotu", + "clear_message": "Vymazat zprávu", + "clear_value": "Vymazat hodnotu", "clockwise": "Po směru hodinových ručiček", "close": "Zavřít", "collapse": "Sbalit", @@ -481,6 +485,7 @@ "comments_are_disabled": "Komentáře jsou vypnuty", "confirm": "Potvrdit", "confirm_admin_password": "Potvrzení hesla správce", + "confirm_delete_face": "Opravdu chcete z položky odstranit obličej osoby {name}?", "confirm_delete_shared_link": "Opravdu chcete odstranit tento sdílený odkaz?", "confirm_keep_this_delete_others": "Všechny ostatní položky v tomto uskupení mimo této budou odstraněny. Opravdu chcete pokračovat?", "confirm_password": "Potvrzení hesla", @@ -533,6 +538,7 @@ "delete_album": "Smazat album", "delete_api_key_prompt": "Opravdu chcete tento API klíč odstranit?", "delete_duplicates_confirmation": "Opravdu chcete tyto duplicity trvale odstranit?", + "delete_face": "Odstranit obličej", "delete_key": "Smazat klíč", "delete_library": "Smazat knihovnu", "delete_link": "Smazat odkaz", @@ -600,6 +606,7 @@ "enabled": "Povoleno", "end_date": "Konečné datum", "error": "Chyba", + "error_delete_face": "Chyba při odstraňování obličeje z položky", "error_loading_image": "Chyba při načítání obrázku", "error_title": "Chyba - Něco se pokazilo", "errors": { @@ -751,8 +758,8 @@ "features_setting_description": "Správa funkcí aplikace", "file_name": "Název souboru", "file_name_or_extension": "Název nebo přípona souboru", - "filename": "Filename", - "filetype": "Filetype", + "filename": "Název souboru", + "filetype": "Typ souboru", "filter_people": "Filtrovat lidi", "find_them_fast": "Najděte je rychle vyhledáním jejich jména", "fix_incorrect_match": "Opravit nesprávnou shodu", @@ -884,6 +891,7 @@ "month": "Měsíc", "more": "Více", "moved_to_trash": "Přesunuto do koše", + "mute_memories": "Ztlumit vzpomínky", "my_albums": "Moje alba", "name": "Jméno", "name_or_nickname": "Jméno nebo přezdívka", @@ -979,6 +987,7 @@ "permanently_deleted_asset": "Položka trvale odstraněna", "permanently_deleted_assets_count": "{count, plural, one {Položka trvale vymazána} other {Položky trvale vymazány}}", "person": "Osoba", + "person_birthdate": "Narozen/a {date}", "person_hidden": "{name}{hidden, select, true { (skryto)} other {}}", "photo_shared_all_users": "Vypadá to, že jste fotky sdíleli se všemi uživateli, nebo nemáte žádného uživatele, se kterým byste je mohli sdílet.", "photos": "Fotky", @@ -1076,6 +1085,8 @@ "removed_from_archive": "Odstraněno z archivu", "removed_from_favorites": "Odstraněno z oblíbených", "removed_from_favorites_count": "{count, plural, one {Odstraněn #} few {Odstraněny #} other {Odstraněno #}} z oblíbených", + "removed_memory": "Vzpomínka odstraněna", + "removed_photo_from_memory": "Fotografie odstraněna ze vzpomínky", "removed_tagged_assets": "Odstraněná značka z {count, plural, one {# položky} other {# položek}}", "rename": "Přejmenovat", "repair": "Opravy", @@ -1084,6 +1095,7 @@ "repository": "Repozitář", "require_password": "Požadovat heslo", "require_user_to_change_password_on_first_login": "Požadovat, aby si uživatel při prvním přihlášení změnil heslo", + "rescan": "Znovu prohledat", "reset": "Výchozí", "reset_password": "Obnovit heslo", "reset_people_visibility": "Obnovit viditelnost lidí", @@ -1127,6 +1139,7 @@ "search_options": "Možnosti vyhledávání", "search_people": "Vyhledat lidi", "search_places": "Vyhledat místa", + "search_rating": "Vyhledávání podle hodnocení...", "search_settings": "Hledat nastavení", "search_state": "Vyhledat stát...", "search_tags": "Vyhledávat značky...", @@ -1250,6 +1263,7 @@ "tag_created": "Vytvořena značka: {tag}", "tag_feature_description": "Procházení fotografií a videí seskupených podle témat logických značek", "tag_not_found_question": "Nemůžete najít značku? Vytvořte novou.", + "tag_people": "Označit lidi", "tag_updated": "Aktualizována značka: {tag}", "tagged_assets": "Přiřazena značka {count, plural, one {# položce} other {# položkám}}", "tags": "Značky", @@ -1290,6 +1304,7 @@ "unlink_motion_video": "Odpojit pohyblivé video", "unlink_oauth": "Zrušit OAuth propojení", "unlinked_oauth_account": "OAuth účet odpojen", + "unmute_memories": "Zrušit ztlumení vzpomínek", "unnamed_album": "Nepojmenované album", "unnamed_album_delete_confirmation": "Opravdu chcete toto album smazat?", "unnamed_share": "Nepojmenované sdílení", @@ -1343,6 +1358,7 @@ "view_all": "Zobrazit vše", "view_all_users": "Zobrazit všechny uživatele", "view_in_timeline": "Zobrazit na časové ose", + "view_link": "Zobrazit odkaz", "view_links": "Zobrazit odkazy", "view_name": "Zobrazit", "view_next_asset": "Zobrazit další položku", @@ -1355,8 +1371,8 @@ "welcome": "Vítejte", "welcome_to_immich": "Vítejte v Immichi", "year": "Rok", - "years_ago": "Před {years, plural, one {# rokem} other {# lety}}", + "years_ago": "Před {years, plural, one {rokem} other {# lety}}", "yes": "Ano", "you_dont_have_any_shared_links": "Nemáte žádné sdílené odkazy", "zoom_image": "Zvětšit obrázek" -} +} \ No newline at end of file diff --git a/i18n/da.json b/i18n/da.json index ec05232e6f..0e7ce712e8 100644 --- a/i18n/da.json +++ b/i18n/da.json @@ -147,6 +147,8 @@ "map_settings": "Kort", "map_settings_description": "Administrer kortindstillinger", "map_style_description": "URL til en style.json for et korttema", + "memory_cleanup_job": "Mindeoprydning", + "memory_generate_job": "Mindegeneration", "metadata_extraction_job": "Udtræk metadata", "metadata_extraction_job_description": "Udtræk metadataoplysninger fra hvert Billede/Video, såsom GPS og opløsning", "metadata_faces_import_setting": "Aktivér for at importere ansigter", @@ -299,7 +301,7 @@ "transcoding_max_b_frames": "Maksimum B-frames", "transcoding_max_b_frames_description": "Højere værdier forbedrer kompressionseffektivitet, men kan gøre indkodning langsommere. Er måske ikke kompatibelt med hardware-acceleration på ældre enheder. 0 slår B-frames fra, mens -1 sætter denne værdi automatisk.", "transcoding_max_bitrate": "Maksimal bitrate", - "transcoding_max_bitrate_description": "At sætte en maksmimal bitrate kan gøre filstørrelserne mere forudsigelige med et lille tab i kvalitet. Ved 720p er almindelige værdier 2600k for VP9 eller HEVC, eller 4500K for H.264. Slået fra hvis sat til 0.", + "transcoding_max_bitrate_description": "At sætte en maksmimal bitrate kan gøre filstørrelserne mere forudsigelige med et lille tab i kvalitet. Ved 720p er almindelige værdier 2600 kbit/s for VP9 eller HEVC, eller 4500 kbit/s for H.264. Slået fra hvis sat til 0.", "transcoding_max_keyframe_interval": "Maksimal keyframe-interval", "transcoding_max_keyframe_interval_description": "Sætter den maksimale frameafstand mellem keyframes. Lavere værdier forringer kompressionseffektiviteten, men forbedrer søgetider og kan forbedre kvaliteten i scener med hurtig bevægelse. 0 sætter denne værdi automatisk.", "transcoding_optimal_description": "Videoer højere end målopløsningen eller ikke i et godkendt format", @@ -481,6 +483,7 @@ "comments_are_disabled": "Kommentarer er slået fra", "confirm": "Bekræft", "confirm_admin_password": "Bekræft administratoradgangskode", + "confirm_delete_face": "Er du sikker på, du vil slette {name}s ansigt fra denne mediefil?", "confirm_delete_shared_link": "Er du sikker på, at du vil slette dette delte link?", "confirm_keep_this_delete_others": "Alle andre aktiver i stakken vil blive slettet undtagen dette aktiv. Er du sikker på, at du vil fortsætte?", "confirm_password": "Bekræft adgangskode", @@ -504,7 +507,7 @@ "create_library": "Opret bibliotek", "create_link": "Opret link", "create_link_to_share": "Opret link for at dele", - "create_link_to_share_description": "Lad alle med linket se de(t) valgte billede(r)", + "create_link_to_share_description": "Tillad alle med linket at se de(t) valgte billede(r)", "create_new_person": "Opret ny person", "create_new_person_hint": "Tildel valgte aktiver til en ny person", "create_new_user": "Opret ny bruger", @@ -519,20 +522,21 @@ "date_after": "Dato efter", "date_and_time": "Dato og klokkeslæt", "date_before": "Dato før", - "date_of_birth_saved": "Fødselsdatoen blev gemt", + "date_of_birth_saved": "Fødselsdatoen blev gemt korrekt", "date_range": "Datointerval", "day": "Dag", - "deduplicate_all": "Dedupliker alle", + "deduplicate_all": "Kopier alle", "deduplication_criteria_1": "Billedstørrelse i bytes", "deduplication_criteria_2": "Antal EXIF-data", "deduplication_info": "Deduplikerings info", "deduplication_info_description": "For automatisk at forudvælge emner og fjerne dubletter i bulk ser vi på:", "default_locale": "Standardlokalitet", - "default_locale_description": "Formatér datoer og tal", + "default_locale_description": "Formatér datoer og tal baseret på din browsers regions indstillinger", "delete": "Slet", "delete_album": "Slet album", "delete_api_key_prompt": "Er du sikker på, at du vil slette denne API-nøgle?", "delete_duplicates_confirmation": "Er du sikker på, at du vil slette disse dubletter permanent?", + "delete_face": "Slet ansigt", "delete_key": "Slet nøgle", "delete_library": "Slet bibliotek", "delete_link": "Slet link", @@ -565,7 +569,7 @@ "download_settings": "Download", "download_settings_description": "Administrer indstillinger relateret til mediefil-downloads", "downloading": "Downloader", - "downloading_asset_filename": "Downloader aktiv {filename}", + "downloading_asset_filename": "Downloader mediefil {filename}", "drop_files_to_upload": "Slip filer hvor som helst for at uploade dem", "duplicates": "Duplikater", "duplicates_description": "Løs hver gruppe ved at angive, hvilke, hvis nogen, er dubletter", @@ -600,6 +604,7 @@ "enabled": "Aktiveret", "end_date": "Slutdato", "error": "Fejl", + "error_delete_face": "Fejl ved sletning af ansigt fra mediefil", "error_loading_image": "Fejl ved indlæsning af billede", "error_title": "Fejl - Noget gik galt", "errors": { @@ -607,11 +612,11 @@ "cannot_navigate_previous_asset": "Kan ikke navigere til forrige mediefil", "cant_apply_changes": "Ændringerne kan ikke anvendes", "cant_change_activity": "Kan ikke {enabled, select, true {disable} other {enable}} aktivitet", - "cant_change_asset_favorite": "Kan ikke ændre favorit til aktiv", + "cant_change_asset_favorite": "Kan ikke ændre favorit til mediefil", "cant_change_metadata_assets_count": "Kan ikke ændre metadata for {count, plural, one {# objekt} other {# objekter}}", "cant_get_faces": "Kan ikke hente ansigter", "cant_get_number_of_comments": "Kan ikke få antallet af kommentarer", - "cant_search_people": "Kan ikke søge efter folk", + "cant_search_people": "Kan ikke søge efter personer", "cant_search_places": "Kan ikke søge efter steder", "cleared_jobs": "Ryddede opgaver for: {job}", "error_adding_assets_to_album": "Fejl i tilføjelse af mediefiler til album", @@ -620,20 +625,20 @@ "error_downloading": "Fejl i download af {filename}", "error_hiding_buy_button": "Fejl i skjulning af køb-knap", "error_removing_assets_from_album": "Fejl i fjernelse af mediefiler fra album. Tjek konsol for flere detaljer", - "error_selecting_all_assets": "Fejl ved valg af alle aktiver", + "error_selecting_all_assets": "Fejl ved valg af alle mediefiler", "exclusion_pattern_already_exists": "Denne udelukkelsesmønster findes allerede.", "failed_job_command": "Kommando {command} slog fejl for opgave: {job}", "failed_to_create_album": "Oprettelse af album mislykkedes", "failed_to_create_shared_link": "Oprettelse af delt link mislykkedes", "failed_to_edit_shared_link": "Redigering af delt link mislykkedes", - "failed_to_get_people": "Det lykkedes ikke at hente folk", - "failed_to_keep_this_delete_others": "Kunne ikke beholde dette aktiv og slette de andre aktiver", + "failed_to_get_people": "Det lykkedes ikke at hente personer", + "failed_to_keep_this_delete_others": "Kunne ikke beholde denne mediefil og slette de andre mediefiler", "failed_to_load_asset": "Indlæsning af mediefil mislykkedes", "failed_to_load_assets": "Indlæsning af mediefiler mislykkedes", "failed_to_load_people": "Indlæsning af personer mislykkedes", "failed_to_remove_product_key": "Fjernelse af produktnøgle mislykkedes", - "failed_to_stack_assets": "Det lykkedes ikke at stable aktiver", - "failed_to_unstack_assets": "Det lykkedes ikke at fjerne stablen af aktiver", + "failed_to_stack_assets": "Det lykkedes ikke at stable mediefiler", + "failed_to_unstack_assets": "Det lykkedes ikke at fjerne gruperingen af mediefiler", "import_path_already_exists": "Denne importsti findes allerede.", "incorrect_email_or_password": "Forkert email eller kodeord", "paths_validation_failed": "{paths, plural, one {# sti} other {# stier}} slog fejl ved validering", @@ -641,7 +646,7 @@ "quota_higher_than_disk_size": "Du har sat en kvote der er større end disken", "repair_unable_to_check_items": "Kunne ikke tjekke {count, select, one {element} other {elementer}}", "unable_to_add_album_users": "Ikke i stand til at tilføje brugere til album", - "unable_to_add_assets_to_shared_link": "Kan ikke tilføje aktiver til delt link", + "unable_to_add_assets_to_shared_link": "Kan ikke tilføje mediefiler til det delte link", "unable_to_add_comment": "Ikke i stand til at tilføje kommentar", "unable_to_add_exclusion_pattern": "Kunne ikke tilføje udelukkelsesmønster", "unable_to_add_import_path": "Kunne ikke tilføje importsti", @@ -651,7 +656,7 @@ "unable_to_archive_unarchive": "Ude af stand til at {archived, select, true {arkivere} other {fjerne fra arkiv}}", "unable_to_change_album_user_role": "Ikke i stand til at ændre albumbrugerens rolle", "unable_to_change_date": "Ikke i stand til at ændre dato", - "unable_to_change_favorite": "Kan ikke ændre favorit for aktiv", + "unable_to_change_favorite": "Kan ikke ændre favorit for mediefil", "unable_to_change_location": "Ikke i stand til at ændre sted", "unable_to_change_password": "Kunne ikke ændre adgangskode", "unable_to_change_visibility": "Kan ikke ændre synligheden for {count, plural, one {# person} other {# personer}}", @@ -698,16 +703,16 @@ "unable_to_remove_deleted_assets": "Kunne ikke fjerne offlinefiler", "unable_to_remove_library": "Ikke i stand til at fjerne bibliotek", "unable_to_remove_partner": "Ikke i stand til at fjerne partner", - "unable_to_remove_reaction": "Ikke i stand til at reaktion", + "unable_to_remove_reaction": "Ikke i stand til at fjerne reaktion", "unable_to_repair_items": "Ikke i stand til at reparere ting", "unable_to_reset_password": "Ikke i stand til at nulstille adgangskode", "unable_to_resolve_duplicate": "Kunne ikke opklare duplikat", - "unable_to_restore_assets": "Kunne ikke genoprette medier", - "unable_to_restore_trash": "Ikke i stand til at genoprette skrald", - "unable_to_restore_user": "Ikke i stand til at genoprette bruger", + "unable_to_restore_assets": "Kunne ikke gendanne medierfil", + "unable_to_restore_trash": "Ikke i stand til at gendanne fra skraldespanden", + "unable_to_restore_user": "Ikke i stand til at gendanne bruger", "unable_to_save_album": "Ikke i stand til at gemme album", "unable_to_save_api_key": "Kunne ikke gemme API-nøgle", - "unable_to_save_date_of_birth": "Kan ikke gemme fødselsdatoen", + "unable_to_save_date_of_birth": "Kunne ikke gemme fødselsdatoen", "unable_to_save_name": "Ikke i stand til at gemme navn", "unable_to_save_profile": "Ikke i stand til at gemme profil", "unable_to_save_settings": "Ikke i stand til at gemme indstillinger", @@ -729,7 +734,7 @@ "unable_to_upload_file": "Filen kunne ikke uploades" }, "exif": "Exif", - "exit_slideshow": "Forlad slideshow", + "exit_slideshow": "Afslut slideshow", "expand_all": "Udvid alle", "expire_after": "Udløb efter", "expired": "Udløbet", @@ -742,7 +747,7 @@ "external": "Ekstern", "external_libraries": "Eksterne biblioteker", "face_unassigned": "Ikke tildelt", - "failed_to_load_assets": "Kunne ikke indlæse aktiver", + "failed_to_load_assets": "Kunne ikke indlæse mediefiler", "favorite": "Favorit", "favorite_or_unfavorite_photo": "Tilføj eller fjern fra yndlingsbilleder", "favorites": "Favoritter", @@ -774,10 +779,10 @@ "has_quota": "Har kvote", "hi_user": "Hej {name} ({email})", "hide_all_people": "Skjul alle personer", - "hide_gallery": "Gem galleri", + "hide_gallery": "Skjul galleri", "hide_named_person": "Skjul person {name}", - "hide_password": "Gem adgangskode", - "hide_person": "Gem person", + "hide_password": "Skjul adgangskode", + "hide_person": "Skjul person", "hide_unnamed_people": "Skjul unavngivne personer", "host": "Host", "hour": "Time", @@ -817,7 +822,7 @@ "keep": "Behold", "keep_all": "Behold alle", "keep_this_delete_others": "Behold dette, slet andre", - "kept_this_deleted_others": "Beholdt dette aktiv og slettede {count, plural, one {# aktiv} other {# aktiver}}", + "kept_this_deleted_others": "Beholdt denne mediefil og slettede {count, plural, one {# aktiv} other {# aktiver}}", "keyboard_shortcuts": "Tastaturgenveje", "language": "Sprog", "language_setting_description": "Vælg dit foretrukne sprog", @@ -837,8 +842,8 @@ "link_to_oauth": "Link til OAuth", "linked_oauth_account": "Tilsluttet OAuth-konto", "list": "Liste", - "loading": "Loader", - "loading_search_results_failed": "At loade søgeresultater slog fejl", + "loading": "Indlæser", + "loading_search_results_failed": "Indlæsning af søgeresultater fejlede", "log_out": "Log ud", "log_out_all_devices": "Log ud af alle enheder", "logged_out_all_devices": "Logget ud af alle enheder", @@ -874,7 +879,7 @@ "merge": "Sammenflet", "merge_people": "Sammenflet personer", "merge_people_limit": "Du kan kun flette op til 5 ansigter ad gangen", - "merge_people_prompt": "Vil du slå disse mennesker sammen? Denne handling er uigenkaldelig.", + "merge_people_prompt": "Vil du flette disse mennesker sammen? Denne handling er uigenkaldelig.", "merge_people_successfully": "Personer sammenflettet med succes", "merged_people_count": "{count, plural, one {# person} other {# personer}} lagt sammen", "minimize": "Minimér", @@ -901,7 +906,7 @@ "no_albums_message": "Opret et album for at organisere dine billeder og videoer", "no_albums_with_name_yet": "Det ser ud til, at du ikke har noget album med dette navn endnu.", "no_albums_yet": "Det ser ud til, at du ikke har nogen album endnu.", - "no_archived_assets_message": "Arkivér billeder og fotos for at gemme dem væk fra dit Billed-view", + "no_archived_assets_message": "Arkivér billeder og videoer for at gemme dem væk fra din Billede oversigt", "no_assets_message": "KLIK FOR AT UPLOADE DIT FØRSTE BILLEDE", "no_duplicates_found": "Ingen duplikater fundet.", "no_exif_info_available": "Ingen tilgængelig exif information", @@ -948,7 +953,7 @@ "owner": "Ejer", "partner": "Partner", "partner_can_access": "{partner} kan tilgå", - "partner_can_access_assets": "Alle dine billeder og videoer, bortset fra dem i Arkiveret og Slettet", + "partner_can_access_assets": "Alle dine billeder og videoer, bortset fra dem i Arkivet og Slettet", "partner_can_access_location": "Stedet, hvor dine billeder blev taget", "partner_sharing": "Partnerdeling", "partners": "Partnere", @@ -992,7 +997,7 @@ "play": "Afspil", "play_memories": "Afspil minder", "play_motion_photo": "Afspil bevægelsesbillede", - "play_or_pause_video": "Afspil eller paus video", + "play_or_pause_video": "Afspil eller pause video", "port": "Port", "preset": "Forudindstilling", "preview": "Forhåndsvisning", @@ -1046,7 +1051,7 @@ "reassign": "Gentildel", "reassigned_assets_to_existing_person": "{count, plural, one {# mediefil} other {# mediefiler}} er blevet gentildelt til {name, select, null {en eksisterende person} other {{name}}}", "reassigned_assets_to_new_person": "Gentildelt {count, plural, one {# aktiv} other {# aktiver}} til en ny person", - "reassing_hint": "Tildel valgte aktiver til en eksisterende person", + "reassing_hint": "Tildel valgte mediefiler til en eksisterende person", "recent": "For nylig", "recent-albums": "Seneste albums", "recent_searches": "Seneste søgninger", @@ -1064,9 +1069,9 @@ "remove": "Fjern", "remove_assets_album_confirmation": "Er du sikker på, at du vil fjerne {count, plural, one {# aktiv} other {# aktiver}} fra albummet?", "remove_assets_shared_link_confirmation": "Er du sikker på, at du vil fjerne {count, plural, one {# aktiv} other {# aktiver}} fra dette delte link?", - "remove_assets_title": "Fjern aktiver?", + "remove_assets_title": "Fjern mediefiler?", "remove_custom_date_range": "Fjern tilpasset datointerval", - "remove_deleted_assets": "Fjern fra offlinefiler", + "remove_deleted_assets": "Fjern slettede mediefiler", "remove_from_album": "Fjern fra album", "remove_from_favorites": "Fjern fra favoritter", "remove_from_shared_link": "Fjern fra delt link", @@ -1076,14 +1081,17 @@ "removed_from_archive": "Fjernet fra arkiv", "removed_from_favorites": "Fjernet fra favoritter", "removed_from_favorites_count": "{count, plural, other {Fjernede #}} fra favoritter", + "removed_memory": "Fjernede minde", + "removed_photo_from_memory": "Fjernede foto fra minde", "removed_tagged_assets": "Fjernede tag fra {count, plural, one {# aktiv} other {# aktiver}}", "rename": "Omdøb", "repair": "Reparér", - "repair_no_results_message": "Utrackede og manglende filer vil blive vist her", + "repair_no_results_message": "Usporede og manglende filer vil blive vist her", "replace_with_upload": "Erstat med upload", "repository": "Depot", "require_password": "Kræv adgangskode", "require_user_to_change_password_on_first_login": "Kræv at bruger skifter adgangskode ved første login", + "rescan": "Genopfrisk", "reset": "Nulstil", "reset_password": "Nulstil adgangskode", "reset_people_visibility": "Nulstil personsynlighed", @@ -1093,19 +1101,19 @@ "restore": "Gendan", "restore_all": "Gendan alle", "restore_user": "Gendan bruger", - "restored_asset": "Gendannet aktiv", + "restored_asset": "Gendannet mediefilen", "resume": "Genoptag", "retry_upload": "Forsøg upload igen", "review_duplicates": "Gennemgå dubletter", "role": "Rolle", - "role_editor": "Editor", + "role_editor": "Redaktør", "role_viewer": "Seer", "save": "Gem", "saved_api_key": "Gemt API-nøgle", "saved_profile": "Gemte profil", "saved_settings": "Gemte indstillinger", "say_something": "Skriv noget", - "scan_all_libraries": "Skan gennem alle biblioteker", + "scan_all_libraries": "Skan alle biblioteker", "scan_library": "Skan", "scan_settings": "Skanningsindstillinger", "scanning_for_album": "Skanner efter albummer...", @@ -1127,8 +1135,9 @@ "search_options": "Søgemuligheder", "search_people": "Søg i personer", "search_places": "Søg i steder", + "search_rating": "Søg efter vurdering...", "search_settings": "søgeindstillinger", - "search_state": "Søg efter stat...", + "search_state": "Søg efter lansdel...", "search_tags": "Søg tags...", "search_timezone": "Søg i tidszone...", "search_type": "Søg efter type", @@ -1183,15 +1192,15 @@ "show_album_options": "Vis albumindstillinger", "show_albums": "Vis albummer", "show_all_people": "Vis alle personer", - "show_and_hide_people": "Vis & gem personer", + "show_and_hide_people": "Vis & skjul personer", "show_file_location": "Vis filplacering", "show_gallery": "Vis galleri", - "show_hidden_people": "Vis gemte personer", + "show_hidden_people": "Vis skjulte personer", "show_in_timeline": "Vis på tidslinje", "show_in_timeline_setting_description": "Vis billeder og videoer fra denne bruger på din tidslinje", "show_keyboard_shortcuts": "Vis tastaturgenveje", "show_metadata": "Vis metadata", - "show_or_hide_info": "Vis eller gem info", + "show_or_hide_info": "Vis eller skjul info", "show_password": "Vis adgangskode", "show_person_options": "Vis personindstillinger", "show_progress_bar": "Vis statuslinje", @@ -1216,7 +1225,7 @@ "sort_items": "Antal genstande", "sort_modified": "Ændret dato", "sort_oldest": "Ældste foto", - "sort_people_by_similarity": "Sorter folk efter lighed", + "sort_people_by_similarity": "Sorter efter personer der ligner hinanden", "sort_recent": "Seneste foto", "sort_title": "Titel", "source": "Kilde", @@ -1242,14 +1251,15 @@ "sunrise_on_the_beach": "Solopgang på stranden", "support": "Support", "support_and_feedback": "Support & Feedback", - "support_third_party_description": "Din Immich-installation blev pakket af en tredjepart. Problemer, du oplever, kan være forårsaget af denne pakke, så rejs venligst problemer med dem i første omgang ved at bruge nedenstående links.", + "support_third_party_description": "Din Immich-installation blev sammensat af en tredjepart. Problemer, du oplever, kan være forårsaget af denne udvikler, så rejs venligst problemer med dem i første omgang ved at bruge nedenstående links.", "swap_merge_direction": "Byt retning for sammenfletning", "sync": "Synkronisér", "tag": "Tag", - "tag_assets": "Tag aktiver", + "tag_assets": "Tag mediefiler", "tag_created": "Oprettet tag: {tag}", "tag_feature_description": "Gennemse billeder og videoer grupperet efter logiske tag-emner", "tag_not_found_question": "Kan du ikke finde et tag? Opret et nyt tag.", + "tag_people": "Tag personer", "tag_updated": "Opdateret tag: {tag}", "tagged_assets": "Tagget {count, plural, one {# aktiv} other {# aktiver}}", "tags": "Tags", @@ -1275,14 +1285,14 @@ "trash": "Papirkurv", "trash_all": "Smid alle ud", "trash_count": "Slet {count, number}", - "trash_delete_asset": "Papirkurv/slet aktiv", + "trash_delete_asset": "Flyt mediefil til Papirkurv", "trash_no_results_message": "Billeder og videoer markeret til sletning vil blive vist her.", "trashed_items_will_be_permanently_deleted_after": "Mediefiler i skraldespanden vil blive slettet permanent efter {days, plural, one {# dag} other {# dage}}.", "type": "Type", "unarchive": "Afakivér", "unarchived_count": "{count, plural, other {Uarkiveret #}}", "unfavorite": "Fjern favorit", - "unhide_person": "Hold op med at gemme person væk", + "unhide_person": "Stop med at skjule person", "unknown": "Ukendt", "unknown_country": "Ukendt land", "unknown_year": "Ukendt år", @@ -1303,7 +1313,7 @@ "up_next": "Næste", "updated_password": "Opdaterede adgangskode", "upload": "Upload", - "upload_concurrency": "Uploadsamtidighed", + "upload_concurrency": "Upload samtidighed", "upload_errors": "Upload afsluttet med {count, plural, one {# fejl} other {# fejl}}. Opdater siden for at se nye uploadaktiver.", "upload_progress": "Resterende {remaining, number} - Behandlet {processed, number}/{total, number}", "upload_skipped_duplicates": "Sprang over {count, plural, one {# duplet aktiv} other {# duplikerede aktiver}}", @@ -1321,7 +1331,7 @@ "user_purchase_settings_description": "Administrer dit køb", "user_role_set": "Indstil {user} som {role}", "user_usage_detail": "Detaljer om brugers forbrug", - "user_usage_stats": "Konto anvendelsesstatistik", + "user_usage_stats": "Kontoens anvendelsesstatistik", "user_usage_stats_description": "Vis konto anvendelsesstatistik", "username": "Brugernavn", "users": "Brugere", @@ -1343,6 +1353,7 @@ "view_all": "Se alle", "view_all_users": "Se alle brugere", "view_in_timeline": "Se på tidslinjen", + "view_link": "Vis Link", "view_links": "Vis links", "view_name": "Se", "view_next_asset": "Se næste medie", @@ -1359,4 +1370,4 @@ "yes": "Ja", "you_dont_have_any_shared_links": "Du har ikke nogen delte links", "zoom_image": "Zoom billede" -} +} \ No newline at end of file diff --git a/i18n/de.json b/i18n/de.json index e1efb48ba7..dd8d9ed9a6 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -41,6 +41,7 @@ "backup_settings": "Datensicherungs-Einstellungen", "backup_settings_description": "Datensicherungs-Einstellungen verwalten", "check_all": "Alle überprüfen", + "cleanup": "Aufräumen", "cleared_jobs": "Folgende Aufgaben zurückgesetzt: {job}", "config_set_by_file": "Ist derzeit in einer Konfigurationsdatei festgelegt", "confirm_delete_library": "Bist du sicher, dass du die Bibliothek {library} löschen willst?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Regelmäßiges Scannen der Bibliothek aktivieren", "library_settings": "Externe Bibliothek", "library_settings_description": "Einstellungen externer Bibliotheken verwalten", - "library_tasks_description": "Diese Aufgabe aktualisiert und überprüft die Bibliotheken", + "library_tasks_description": "Überprüfe externe Bibliotheken auf neue oder veränderte Medien", "library_watching_enable_description": "Überwache externe Bibliotheken auf Dateiänderungen", "library_watching_settings": "Bibliotheksüberwachung (EXPERIMENTELL)", "library_watching_settings_description": "Automatisch auf geänderte Dateien prüfen", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Semantische Bildsuche mittels CLIP-Einbettungen", "machine_learning_smart_search_enabled": "Intelligente Suche aktivieren", "machine_learning_smart_search_enabled_description": "Ist diese Option deaktiviert, werden die Bilder nicht für die intelligente Suche verwendet.", - "machine_learning_url_description": "Die URL des Servers für maschinelles Lernen. Wenn mehr als eine URL angegeben wird, wird jeder Server einzeln ausprobiert, bis einer erfolgreich antwortet, und zwar in der Reihenfolge vom ersten bis zum letzten.", + "machine_learning_url_description": "Die URL des Servers für maschinelles Lernen. Wenn mehr als eine URL angegeben wird, wird jeder Server einzeln ausprobiert, bis einer erfolgreich antwortet, und zwar in der Reihenfolge vom ersten bis zum letzten. Server die nicht antworten werden temporär ignoriert, bis sie wieder verfügbar sind.", "manage_concurrency": "Gleichzeitige Ausführungen verwalten", "manage_log_settings": "Log-Einstellungen verwalten", "map_dark_style": "Dunkler Stil", @@ -147,6 +148,8 @@ "map_settings": "Karte", "map_settings_description": "Karten- und GPS-Einstellungen verwalten", "map_style_description": "URL zu einem style.json Karten-Theme", + "memory_cleanup_job": "Erinnerungen aufräumen", + "memory_generate_job": "Erinnerungen Generierung", "metadata_extraction_job": "Metadaten extrahieren", "metadata_extraction_job_description": "Extrahieren von Metadaten, wie zum Beispiel GPS, Gesichtern und Auflösung aus jeder Datei", "metadata_faces_import_setting": "Import von Gesichtern aktivieren", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "Aktiviert die Hash-Verifizierung. Deaktiviere diese Option nur, wenn du dir über die damit verbundenen Auswirkungen im Klaren bist", "storage_template_migration": "Migration von Speichervorlagen", "storage_template_migration_description": "Diese Aufgabe wendet die aktuelle {template} auf zuvor hochgeladene Dateien an", - "storage_template_migration_info": "Vorlagenänderungen gelten nur für neue Dateien. Um die Vorlage rückwirkend auf bereits hochgeladene Assets anzuwenden, führe den {job} aus.", + "storage_template_migration_info": "Die Vorlage wird alle Dateierweiterungen in Kleinbuchstaben umwandeln. Vorlagenänderungen gelten nur für neue Dateien. Um die Vorlage rückwirkend auf bereits hochgeladene Assets anzuwenden, führe den {job} aus.", "storage_template_migration_job": "Speichervorlagenmigrations-Aufgabe", "storage_template_more_details": "Weitere Details zu dieser Funktion findest du unter Speichervorlage und dessen Implikationen", "storage_template_onboarding_description": "Wenn aktiviert, sortiert diese Funktion Dateien automatisch basierend auf einer benutzerdefinierten Vorlage. Aufgrund von Stabilitätsproblemen ist die Funktion standardmäßig deaktiviert. Weitere Informationen findest du in der Dokumentation.", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "Maximale B-Frames", "transcoding_max_b_frames_description": "Höhere Werte verbessern die Komprimierungseffizienz, verlangsamen aber die Kodierung. Ist möglicherweise nicht mit der Hardware-Beschleunigung älterer Geräte kompatibel. 0 deaktiviert die B-Frames, während -1 diesen Wert automatisch setzt.", "transcoding_max_bitrate": "Maximale Bitrate", - "transcoding_max_bitrate_description": "Die Festlegung einer maximalen Bitrate kann die Dateigrößen vorhersagbarer machen, ohne dass die Qualität darunter leidet. Bei 720p sind typische Werte 2600k für VP9 oder HEVC oder 4500k für H.264. Deaktiviert, wenn der Wert auf 0 gesetzt ist.", + "transcoding_max_bitrate_description": "Die Festlegung einer maximalen Bitrate kann die Dateigrößen vorhersagbarer machen, ohne dass die Qualität darunter leidet. Bei 720p sind typische Werte 2600 kbit/s für VP9 oder HEVC oder 4500 kbit/s für H.264. Deaktiviert, wenn der Wert auf 0 gesetzt ist.", "transcoding_max_keyframe_interval": "Maximales Keyframe-Intervall", "transcoding_max_keyframe_interval_description": "Legt den maximalen Frame-Abstand zwischen Keyframes fest. Niedrigere Werte verschlechtern die Komprimierungseffizienz, verbessern aber die Suchzeiten und können die Qualität in Szenen mit schnellen Bewegungen verbessern. Bei 0 wird dieser Wert automatisch eingestellt.", "transcoding_optimal_description": "Videos mit einer höheren Auflösung als der Zielauflösung oder in einem nicht akzeptierten Format", @@ -391,6 +394,7 @@ "allow_edits": "Bearbeiten erlauben", "allow_public_user_to_download": "Erlaube öffentlichen Benutzern, herunterzuladen", "allow_public_user_to_upload": "Erlaube öffentlichen Benutzern, hochzuladen", + "alt_text_qr_code": "QR-Code Bild", "anti_clockwise": "Gegen den Uhrzeigersinn", "api_key": "API-Schlüssel", "api_key_description": "Dieser Wert wird nur einmal angezeigt. Bitte kopiere ihn, bevor du das Fenster schließt.", @@ -481,6 +485,7 @@ "comments_are_disabled": "Kommentare sind deaktiviert", "confirm": "Bestätigen", "confirm_admin_password": "Administrator Passwort bestätigen", + "confirm_delete_face": "Bist du sicher dass du das Gesicht von {name} aus der Datei entfernen willst?", "confirm_delete_shared_link": "Bist du sicher, dass du diesen geteilten Link löschen willst?", "confirm_keep_this_delete_others": "Alle anderen Dateien im Stapel bis auf diese werden gelöscht. Bist du sicher, dass du fortfahren möchten?", "confirm_password": "Passwort bestätigen", @@ -533,6 +538,7 @@ "delete_album": "Album löschen", "delete_api_key_prompt": "Bist du sicher, dass du diesen API-Schlüssel löschen willst?", "delete_duplicates_confirmation": "Bist du sicher, dass du diese Duplikate endgültig löschen willst?", + "delete_face": "Gesicht löschen", "delete_key": "Schlüssel löschen", "delete_library": "Bibliothek löschen", "delete_link": "Link löschen", @@ -600,6 +606,7 @@ "enabled": "Aktiviert", "end_date": "Enddatum", "error": "Fehler", + "error_delete_face": "Fehler beim Löschen des Gesichts", "error_loading_image": "Fehler beim Laden des Bildes", "error_title": "Fehler - Etwas ist schief gelaufen", "errors": { @@ -884,6 +891,7 @@ "month": "Monat", "more": "Mehr", "moved_to_trash": "In den Papierkorb verschoben", + "mute_memories": "Erinnerungen stumm schalten", "my_albums": "Meine Alben", "name": "Name", "name_or_nickname": "Name oder Nickname", @@ -979,6 +987,7 @@ "permanently_deleted_asset": "Endgültig gelöschtes Objekt", "permanently_deleted_assets_count": "{count, plural, one {# Datei} other {# Dateien}} endgültig gelöscht", "person": "Person", + "person_birthdate": "Geboren am {date}", "person_hidden": "{name}{hidden, select, true { (verborgen)} other {}}", "photo_shared_all_users": "Es sieht so aus, als hättest du deine Fotos mit allen Benutzern geteilt oder du hast keine Benutzer, mit denen du teilen kannst.", "photos": "Fotos", @@ -1076,6 +1085,8 @@ "removed_from_archive": "Aus dem Archiv entfernt", "removed_from_favorites": "Aus den Favoriten entfernt", "removed_from_favorites_count": "{count, plural, other {#}} aus den Favoriten entfernt", + "removed_memory": "Erinnerung entfernt", + "removed_photo_from_memory": "Foto aus Erinnerung entfernt", "removed_tagged_assets": "Tag von {count, plural, one {# Datei} other {# Dateien}} entfernt", "rename": "Umbenennen", "repair": "Reparatur", @@ -1084,6 +1095,7 @@ "repository": "Repository", "require_password": "Passwort erforderlich", "require_user_to_change_password_on_first_login": "Benutzer muss das Passwort beim ersten Login ändern", + "rescan": "Erneut scannen", "reset": "Zurücksetzen", "reset_password": "Passwort zurücksetzen", "reset_people_visibility": "Sichtbarkeit von Personen zurücksetzen", @@ -1127,6 +1139,7 @@ "search_options": "Suchoptionen", "search_people": "Suche nach Personen", "search_places": "Suche nach Orten", + "search_rating": "Suche nach Bewertung...", "search_settings": "Suche nach Einstellungen", "search_state": "Suche nach Bundesland / Provinz...", "search_tags": "Sache nach Tags...", @@ -1250,6 +1263,7 @@ "tag_created": "Tag erstellt: {tag}", "tag_feature_description": "Durchsuchen von Fotos und Videos, gruppiert nach logischen Tag-Themen", "tag_not_found_question": "Kein Tag zu finden? Erstelle einen neuen Tag.", + "tag_people": "Personen taggen", "tag_updated": "Tag aktualisiert: {tag}", "tagged_assets": "{count, plural, one {# Datei} other {# Dateien}} getagged", "tags": "Tags", @@ -1290,6 +1304,7 @@ "unlink_motion_video": "Verknüpfung zum Bewegungsvideo aufheben", "unlink_oauth": "OAuth entfernen", "unlinked_oauth_account": "OAuth-Konto entfernt", + "unmute_memories": "Stummschaltung für Erinnerungen aufheben", "unnamed_album": "Unbenanntes Album", "unnamed_album_delete_confirmation": "Bist du sicher, dass du dieses Album löschen willst?", "unnamed_share": "Unbenannte Freigabe", @@ -1343,6 +1358,7 @@ "view_all": "Alles anzeigen", "view_all_users": "Alle Nutzer anzeigen", "view_in_timeline": "In Zeitleiste anzeigen", + "view_link": "Link anzeigen", "view_links": "Links anzeigen", "view_name": "Ansicht", "view_next_asset": "Nächste Datei anzeigen", @@ -1359,4 +1375,4 @@ "yes": "Ja", "you_dont_have_any_shared_links": "Du hast keine geteilten Links", "zoom_image": "Bild vergrößern" -} +} \ No newline at end of file diff --git a/i18n/el.json b/i18n/el.json index 0371e76285..6c2bee5c79 100644 --- a/i18n/el.json +++ b/i18n/el.json @@ -131,7 +131,7 @@ "machine_learning_smart_search_description": "Αναζητήστε εικόνες σημασιολογικά χρησιμοποιώντας ενσωματώσεις CLIP", "machine_learning_smart_search_enabled": "Ενεργοποίηση έξυπνης αναζήτησης", "machine_learning_smart_search_enabled_description": "Αν απενεργοποιηθεί, οι εικόνες δεν θα κωδικοποιούνται για έξυπνη αναζήτηση.", - "machine_learning_url_description": "Η διεύθυνση URL του διακομιστή μηχανικής μάθησης. Αν παρέχονται περισσότερες από μία διευθύνσεις, τότε θα γίνει προσπάθεια σύνδεσης σε κάθε μια διαδοχικά από την πρώτη μέχρι την τελευταία, έως ότου κάποια να είναι επιτυχής.", + "machine_learning_url_description": "Η διεύθυνση URL του διακομιστή μηχανικής μάθησης. Αν δοθούν περισσότερες από μία διευθύνσεις URL, κάθε διακομιστής θα δοκιμάζεται διαδοχικά μέχρι να ανταποκριθεί ένας με επιτυχία, με τη σειρά από την πρώτη έως την τελευταία. Οι διακομιστές που δεν ανταποκρίνονται θα αγνοούνται προσωρινά μέχρι να επανέλθουν σε λειτουργία.", "manage_concurrency": "Διαχείριση ταυτόχρονη εκτέλεσης", "manage_log_settings": "Διαχείριση ρυθμίσεων αρχείου καταγραφής", "map_dark_style": "Σκούρο Θέμα", @@ -147,6 +147,8 @@ "map_settings": "Χάρτης", "map_settings_description": "Διαχείριση ρυθμίσεων χάρτη", "map_style_description": "URL προς αρχείο θέματος του χάρτη style.json", + "memory_cleanup_job": "Καθαρισμός μνήμης", + "memory_generate_job": "Δημιουργία μνήμης", "metadata_extraction_job": "Εξαγωγή μεταδεδομένων", "metadata_extraction_job_description": "Εξαγωγή μεταδεδομένων από κάθε αρχείο, όπως τοποθεσία, πρόσωπα και ανάλυση", "metadata_faces_import_setting": "Ενεργοποίηση εισαγωγής προσώπων", @@ -299,7 +301,7 @@ "transcoding_max_b_frames": "Μέγιστος αριθμός B-frames(Bidirectional Predictive Frames)", "transcoding_max_b_frames_description": "Οι υψηλότερες τιμές βελτιώνουν την αποδοτικότητα της συμπίεσης, αλλά επιβραδύνουν την κωδικοποίηση. Ενδέχεται να μην είναι συμβατές με την επιτάχυνση υλικού σε παλαιότερες συσκευές. Η τιμή 0 απενεργοποιεί τα B-frames, ενώ η -1, τη ρυθμίζει αυτόματα.", "transcoding_max_bitrate": "Μέγιστος ρυθμός μετάδοσης (bitrate)", - "transcoding_max_bitrate_description": "Η ρύθμιση ενός μέγιστου ρυθμού μετάδοσης(bitrate) μπορεί να κάνει το μέγεθος των αρχείων πιο προβλέψιμο, αλλά με ένα μικρό κόστος στην ποιότητα. Στην ανάλυση των 720p, οι τυπικές τιμές είναι 2600k για VP9 ή HEVC, ή 4500k για H.264. Απενεργοποιείται εάν οριστεί σε 0.", + "transcoding_max_bitrate_description": "Η ρύθμιση ενός μέγιστου ρυθμού μετάδοσης(bitrate) μπορεί να κάνει το μέγεθος των αρχείων πιο προβλέψιμο, αλλά με ένα μικρό κόστος στην ποιότητα. Στην ανάλυση των 720p, οι τυπικές τιμές είναι 2600 kbit/s για VP9 ή HEVC, ή 4500 kbit/s για H.264. Απενεργοποιείται εάν οριστεί σε 0.", "transcoding_max_keyframe_interval": "Μέγιστο χρονικό διάστημα μεταξύ των καρέ αναφοράς (keyframe)", "transcoding_max_keyframe_interval_description": "Ορίζει το μέγιστο διάστημα μεταξύ των καρέ αναφοράς. Χαμηλότερες τιμές μειώνουν την αποδοτικότητα συμπίεσης, αλλά βελτιώνουν τον χρόνο αναζήτησης και μπορεί να βελτιώσουν την ποιότητα σε σκηνές με γρήγορη κίνηση. Η τιμή 0 ρυθμίζει αυτό το διάστημα αυτόματα.", "transcoding_optimal_description": "Βίντεο με ανώτερη ανάλυση από την επιθυμητή ή σε μη αποδεκτή μορφή", @@ -481,6 +483,7 @@ "comments_are_disabled": "Τα σχόλια είναι απενεργοποιημένα", "confirm": "Επιβεβαίωση", "confirm_admin_password": "Επιβεβαίωση κωδικού Διαχειριστή", + "confirm_delete_face": "Είστε σίγουροι ότι θέλετε να διαγράψετε το πρόσωπο του/της {name} από το στοιχείο;", "confirm_delete_shared_link": "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτόν τον κοινόχρηστο σύνδεσμο;", "confirm_keep_this_delete_others": "Όλα τα άλλα στοιχεία της στοίβας θα διαγραφούν, εκτός από αυτό το στοιχείο. Είστε σίγουροι ότι θέλετε να συνεχίσετε;", "confirm_password": "Επιβεβαίωση κωδικού", @@ -533,6 +536,7 @@ "delete_album": "Διαγραφή άλμπουμ", "delete_api_key_prompt": "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό κλειδί API;", "delete_duplicates_confirmation": "Είστε σίγουροι ότι επιθυμείτε τη μόνιμη διαγραφή αυτών των διπλότυπων;", + "delete_face": "Διαγραφή προσώπου", "delete_key": "Διαγραφή κλειδιού", "delete_library": "Διαγραφή Βιβλιοθήκης", "delete_link": "Διαγραφή συνδέσμου", @@ -600,6 +604,7 @@ "enabled": "Ενεργοποιημένο", "end_date": "Τελική ημερομηνία", "error": "Σφάλμα", + "error_delete_face": "Σφάλμα διαγραφής προσώπου από το στοιχείο", "error_loading_image": "Σφάλμα κατά τη φόρτωση της εικόνας", "error_title": "Σφάλμα - Κάτι πήγε στραβά", "errors": { @@ -1076,6 +1081,8 @@ "removed_from_archive": "Αφαιρέθηκε/καν από το Αρχείο", "removed_from_favorites": "Αφαιρέθηκε από τα αγαπημένα", "removed_from_favorites_count": "Αφαιρέθηκαν {count, plural, other {#}} από τα αγαπημένα", + "removed_memory": "Διαγραμμένη μνήμη", + "removed_photo_from_memory": "Διαγραμμένη φωτογραφία από τη μνήμη", "removed_tagged_assets": "Αφαιρέθηκε η ετικέτα από {count, plural, one {# στοιχείο} other {# στοιχεία}}", "rename": "Μετονομασία", "repair": "Επισκευή", @@ -1127,6 +1134,7 @@ "search_options": "Επιλογές αναζήτησης", "search_people": "Αναζήτηση ατόμων", "search_places": "Αναζήτηση τοποθεσιών", + "search_rating": "Αναζήτηση κατά βαθμολογία...", "search_settings": "Ρυθμίσεις αναζήτησης", "search_state": "Αναζήτηση νομού...", "search_tags": "Αναζήτηση ετικετών...", @@ -1250,6 +1258,7 @@ "tag_created": "Δημιουργήθηκε ετικέτα: {tag}", "tag_feature_description": "Περιήγηση σε φωτογραφίες και βίντεο που είναι οργανωμένα σύμφωνα με λογικά θέματα ετικετών", "tag_not_found_question": "Δεν μπορείτε να βρείτε μια ετικέτα; Δημιουργήστε μια νέα ετικέτα.", + "tag_people": "Επισήμανση ατόμων", "tag_updated": "Ενημερώθηκε η ετικέτα: {tag}", "tagged_assets": "Ετικετοποιημένο/α {count, plural, one {# στοιχείο} other {# στοιχεία}}", "tags": "Ετικέτες", @@ -1359,4 +1368,4 @@ "yes": "Ναι", "you_dont_have_any_shared_links": "Δεν έχετε κοινόχρηστους συνδέσμους", "zoom_image": "Ζουμ Εικόνας" -} +} \ No newline at end of file diff --git a/i18n/en.json b/i18n/en.json index 5bd0f7d371..e8726b3d20 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -299,7 +299,7 @@ "transcoding_max_b_frames": "Maximum B-frames", "transcoding_max_b_frames_description": "Higher values improve compression efficiency, but slow down encoding. May not be compatible with hardware acceleration on older devices. 0 disables B-frames, while -1 sets this value automatically.", "transcoding_max_bitrate": "Maximum bitrate", - "transcoding_max_bitrate_description": "Setting a max bitrate can make file sizes more predictable at a minor cost to quality. At 720p, typical values are 2600k for VP9 or HEVC, or 4500k for H.264. Disabled if set to 0.", + "transcoding_max_bitrate_description": "Setting a max bitrate can make file sizes more predictable at a minor cost to quality. At 720p, typical values are 2600 kbit/s for VP9 or HEVC, or 4500 kbit/s for H.264. Disabled if set to 0.", "transcoding_max_keyframe_interval": "Maximum keyframe interval", "transcoding_max_keyframe_interval_description": "Sets the maximum frame distance between keyframes. Lower values worsen compression efficiency, but improve seek times and may improve quality in scenes with fast movement. 0 sets this value automatically.", "transcoding_optimal_description": "Videos higher than target resolution or not in an accepted format", @@ -1150,6 +1150,7 @@ "second": "Second", "see_all_people": "See all people", "select_album_cover": "Select album cover", + "select": "Select", "select_all": "Select all", "select_all_duplicates": "Select all duplicates", "select_avatar_color": "Select avatar color", @@ -1375,4 +1376,4 @@ "yes": "Yes", "you_dont_have_any_shared_links": "You don't have any shared links", "zoom_image": "Zoom Image" -} +} \ No newline at end of file diff --git a/i18n/es.json b/i18n/es.json index c33f8fd1c6..4885a1d1b2 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -7,7 +7,7 @@ "actions": "Acciones", "active": "Activo", "activity": "Actividad", - "activity_changed": "La actividad está {enabled, select, true {activada} other {desactivada}}", + "activity_changed": "La actividad está {enabled, select, true {habilitada} other {deshabilitada}}", "add": "Agregar", "add_a_description": "Agregar descripción", "add_a_location": "Agregar ubicación", @@ -24,7 +24,7 @@ "add_to_album": "Incluir en álbum", "add_to_shared_album": "Incluir en álbum compartido", "add_url": "Añadir URL", - "added_to_archive": "Archivado", + "added_to_archive": "Agregado al Archivado", "added_to_favorites": "Agregado a favoritos", "added_to_favorites_count": "Agregado {count, number} a favoritos", "admin": { @@ -41,6 +41,7 @@ "backup_settings": "Ajustes de respaldo", "backup_settings_description": "Administrar configuración de respaldo de base de datos", "check_all": "Verificar todo", + "cleanup": "Limpieza", "cleared_jobs": "Trabajos borrados para: {job}", "config_set_by_file": "La configuración está definida por un archivo de configuración", "confirm_delete_library": "¿Estás seguro de que quieres eliminar la biblioteca {library}?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Activar el escaneo periódico de la biblioteca", "library_settings": "Biblioteca externa", "library_settings_description": "Administrar configuración biblioteca externa", - "library_tasks_description": "Realizar tareas de biblioteca", + "library_tasks_description": "Buscar archivos nuevos o modificados en bibliotecas externas", "library_watching_enable_description": "Vigilar las bibliotecas externas para detectar cambios en los archivos", "library_watching_settings": "Vigilancia de la biblioteca (EXPERIMENTAL)", "library_watching_settings_description": "Vigilar automaticamente en busca de archivos modificados", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Busque imágenes semánticamente utilizando incrustaciones CLIP (Contrastive Language-Image Pre-Training)", "machine_learning_smart_search_enabled": "Habilitar búsqueda inteligente", "machine_learning_smart_search_enabled_description": "Al desactivarlo las imágenes no se procesarán para usar la búsqueda inteligente.", - "machine_learning_url_description": "La URL del servidor de aprendizaje automático. Si se proporciona más de una URL se intentará acceder a cada servidor sucesivamente hasta que uno responda correctamente en el orden especificado.", + "machine_learning_url_description": "La URL del servidor de aprendizaje automático. Si se proporciona más de una URL se intentará acceder a cada servidor sucesivamente hasta que uno responda correctamente en el orden especificado. Los servidores que no respondan serán ignorados temporalmente hasta que vuelvan a estar en línea.", "manage_concurrency": "Ajustes de concurrencia", "manage_log_settings": "Administrar la configuración de los registros", "map_dark_style": "Estilo oscuro", @@ -147,6 +148,8 @@ "map_settings": "Mapa", "map_settings_description": "Administrar la configuración del mapa", "map_style_description": "Dirección URL a un tema de mapa (style.json)", + "memory_cleanup_job": "Limpieza de memoria", + "memory_generate_job": "Generación de memoria", "metadata_extraction_job": "Extracción de metadatos", "metadata_extraction_job_description": "Extraer información de metadatos de cada activo, como GPS, caras y resolución", "metadata_faces_import_setting": "Activar importación de caras", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "Habilita la verificación de hash, no la desactive a menos que esté seguro de las implicaciones", "storage_template_migration": "Migración de plantillas de almacenamiento", "storage_template_migration_description": "Aplicar la {template} actual a los elementos subidos previamente", - "storage_template_migration_info": "Los cambios en las plantillas solo se aplican a los elementos nuevos. Para aplicarlos retroactivamente a los elementos subidos previamente ejecute la {job}.", + "storage_template_migration_info": "La plantilla de almacenamiento convertirá todas las extensiones a minúscula. Los cambios en las plantillas solo se aplican a los elementos nuevos. Para aplicarlos retroactivamente a los elementos subidos previamente ejecute la {job}.", "storage_template_migration_job": "Migración de la plantilla de almacenamiento", "storage_template_more_details": "Para obtener más detalles sobre esta función, consulte la Plantilla de almacenamiento y sus implicaciones", "storage_template_onboarding_description": "Cuando está habilitada, esta función organizará automáticamente los archivos según una plantilla definida por el usuario. Debido a problemas de estabilidad, la función se ha desactivado de forma predeterminada. Para obtener más información, consulte la documentación.", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "Maximos B-frames", "transcoding_max_b_frames_description": "Los valores más altos mejoran la eficiencia de la compresión, pero ralentizan la codificación. Puede que no sea compatible con la aceleración de hardware en dispositivos más antiguos. 0 desactiva los fotogramas B, mientras que -1 establece este valor automáticamente.", "transcoding_max_bitrate": "Máxima tasa de bits", - "transcoding_max_bitrate_description": "Establecer una tasa de bits máxima puede hacer que los tamaños de archivos sean más predecibles con un costo menor para la calidad. A 720p, los valores típicos son 2600k para VP9 o HEVC, o 4500k para H.264. Deshabilitado si se establece en 0.", + "transcoding_max_bitrate_description": "Establecer una tasa de bits máxima puede hacer que los tamaños de archivos sean más predecibles con un costo menor para la calidad. A 720p, los valores típicos son 2600 kbit/s para VP9 o HEVC, o 4500 kbit/s para H.264. Deshabilitado si se establece en 0.", "transcoding_max_keyframe_interval": "Intervalo máximo de fotogramas clave", "transcoding_max_keyframe_interval_description": "Establece la distancia máxima de fotograma entre fotogramas clave. Los valores más bajos empeoran la eficiencia de la compresión, pero mejoran los tiempos de búsqueda y pueden mejorar la calidad en escenas con movimientos rápidos. 0 establece este valor automáticamente.", "transcoding_optimal_description": "Vídeos con una resolución superior a la fijada o que no están en un formato aceptado", @@ -391,6 +394,7 @@ "allow_edits": "Permitir edición", "allow_public_user_to_download": "Permitir descargar al usuario público", "allow_public_user_to_upload": "Permitir cargar al usuario publico", + "alt_text_qr_code": "Código QR", "anti_clockwise": "En sentido antihorario", "api_key": "Clave API", "api_key_description": "Este valor sólo se mostrará una vez. Asegúrese de copiarlo antes de cerrar la ventana.", @@ -438,7 +442,7 @@ "blurred_background": "Fondo borroso", "bugs_and_feature_requests": "Errores y solicitudes de funciones", "build": "Compilación", - "build_image": "Construir imagen", + "build_image": "Crear imagen", "bulk_delete_duplicates_confirmation": "¿Estás seguro de que deseas eliminar de forma masiva {count, plural, one {# elemento duplicado} other {# elementos duplicados}}? Esto mantendrá el activo más grande de cada grupo y eliminará permanentemente todos los demás duplicados. ¡Esta acción no se puede deshacer!", "bulk_keep_duplicates_confirmation": "¿Estas seguro de que desea mantener {count, plural, one {# duplicate asset} other {# duplicate assets}} archivos duplicados? Esto resolverá todos los grupos duplicados sin borrar nada.", "bulk_trash_duplicates_confirmation": "¿Estas seguro de que desea eliminar masivamente {count, plural, one {# duplicate asset} other {# duplicate assets}} archivos duplicados? Esto mantendrá el archivo más grande de cada grupo y eliminará todos los demás duplicados.", @@ -481,6 +485,7 @@ "comments_are_disabled": "Los comentarios están deshabilitados", "confirm": "Confirmar", "confirm_admin_password": "Confirmar Contraseña de Administrador", + "confirm_delete_face": "¿Estás seguro que deseas eliminar la cara de {name} del archivo?", "confirm_delete_shared_link": "¿Estás seguro de que deseas eliminar este enlace compartido?", "confirm_keep_this_delete_others": "Todos los demás activos de la pila se eliminarán excepto este activo. ¿Está seguro de que quiere continuar?", "confirm_password": "Confirmar contraseña", @@ -533,6 +538,7 @@ "delete_album": "Eliminar álbum", "delete_api_key_prompt": "¿Está seguro de que desea eliminar esta clave API?", "delete_duplicates_confirmation": "¿Está seguro de que desea eliminar permanentemente estos duplicados?", + "delete_face": "Eliminar cara", "delete_key": "Eliminar clave", "delete_library": "Eliminar biblioteca", "delete_link": "Eliminar enlace", @@ -600,6 +606,7 @@ "enabled": "Habilitado", "end_date": "Fecha final", "error": "Error", + "error_delete_face": "Error al eliminar la cara del archivo", "error_loading_image": "Error al cargar la imagen", "error_title": "Error: algo salió mal", "errors": { @@ -884,6 +891,7 @@ "month": "Mes", "more": "Mas", "moved_to_trash": "Movido a la papelera", + "mute_memories": "Silenciar Recuerdos", "my_albums": "Mis albums", "name": "Nombre", "name_or_nickname": "Nombre o apodo", @@ -979,6 +987,7 @@ "permanently_deleted_asset": "Archivo eliminado permanentemente", "permanently_deleted_assets_count": "Eliminado permanentemente {count, plural, one {# elemento} other {# elementos}}", "person": "Persona", + "person_birthdate": "Nacido el {date}", "person_hidden": "{name}{hidden, select, true { (oculto)} other {}}", "photo_shared_all_users": "Parece que compartiste tus fotos con todos los usuarios o no tienes ningún usuario con quien compartirlas.", "photos": "Fotos", @@ -1076,6 +1085,8 @@ "removed_from_archive": "Eliminado del archivo", "removed_from_favorites": "Eliminado de favoritos", "removed_from_favorites_count": "{count, plural, other {Eliminados #}} de favoritos", + "removed_memory": "Memoria eliminada", + "removed_photo_from_memory": "Se ha eliminado la foto de la memoria", "removed_tagged_assets": "Etiqueta eliminada de {count, plural, one {# activo} other {# activos}}", "rename": "Renombrar", "repair": "Reparar", @@ -1084,6 +1095,7 @@ "repository": "Repositorio", "require_password": "Contraseña requerida", "require_user_to_change_password_on_first_login": "Requerir que el usuario cambie la contraseña en el primer inicio de sesión", + "rescan": "Volver a escanear", "reset": "Reiniciar", "reset_password": "Restablecer la contraseña", "reset_people_visibility": "Restablecer la visibilidad de las personas", @@ -1127,6 +1139,7 @@ "search_options": "Opciones de búsqueda", "search_people": "Buscar personas", "search_places": "Buscar lugar", + "search_rating": "Buscar por calificación...", "search_settings": "Ajustes de la búsqueda", "search_state": "Buscar región/estado...", "search_tags": "Buscando etiquetas...", @@ -1250,6 +1263,7 @@ "tag_created": "Etiqueta creada: {tag}", "tag_feature_description": "Explore fotos y videos agrupados por temas de etiquetas lógicas", "tag_not_found_question": "¿No encuentra una etiqueta? Crea una nueva etiqueta.", + "tag_people": "Etiquetar personas", "tag_updated": "Etiqueta actualizada: {tag}", "tagged_assets": "Etiquetado(s) {count, plural, one {# activo} other {# activos}}", "tags": "Etiquetas", @@ -1290,6 +1304,7 @@ "unlink_motion_video": "Desvincular vídeo en movimiento", "unlink_oauth": "Desvincular OAuth", "unlinked_oauth_account": "Cuenta OAuth desconectada", + "unmute_memories": "Habilitar sonido recuerdos", "unnamed_album": "Album sin nombre", "unnamed_album_delete_confirmation": "¿Seguro que quieres borrar este álbum?", "unnamed_share": "Compartido sin nombre", @@ -1343,6 +1358,7 @@ "view_all": "Ver todas", "view_all_users": "Mostrar todos los usuarios", "view_in_timeline": "Mostrar en la línea de tiempo", + "view_link": "Ver enlace", "view_links": "Mostrar enlaces", "view_name": "Ver", "view_next_asset": "Mostrar siguiente elemento", @@ -1359,4 +1375,4 @@ "yes": "Sí", "you_dont_have_any_shared_links": "No tienes ningún enlace compartido", "zoom_image": "Acercar Imagen" -} +} \ No newline at end of file diff --git a/i18n/et.json b/i18n/et.json index dea16174f9..0fa6ba0247 100644 --- a/i18n/et.json +++ b/i18n/et.json @@ -41,6 +41,7 @@ "backup_settings": "Varundamise seaded", "backup_settings_description": "Halda andmebaasi varundamise seadeid", "check_all": "Märgi kõik", + "cleanup": "Koristus", "cleared_jobs": "Tööted eemaldatud: {job}", "config_set_by_file": "Konfiguratsioon on määratud konfifaili abil", "confirm_delete_library": "Kas oled kindel, et soovid kustutada {library} kogu?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Luba kogu perioodiline skaneerimine", "library_settings": "Väline kogu", "library_settings_description": "Halda välise kogu seadeid", - "library_tasks_description": "Soorita kogu toiminguid", + "library_tasks_description": "Otsi välistest kogudest uusi ja muutunud üksuseid", "library_watching_enable_description": "Jälgi välises kogus failide muudatusi", "library_watching_settings": "Kogu jälgimine (EKSPERIMENTAALNE)", "library_watching_settings_description": "Jälgi automaatselt muutunud faile", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Otsi pilte semantiliselt CLIP-manuste abil", "machine_learning_smart_search_enabled": "Luba nutiotsing", "machine_learning_smart_search_enabled_description": "Kui keelatud, siis ei kodeerita pilte nutiotsingu jaoks.", - "machine_learning_url_description": "Masinõppe serveri URL. Kui ette on antud rohkem kui üks URL, proovitakse neid järjest ükshaaval, kuni üks edukalt vastab.", + "machine_learning_url_description": "Masinõppe serveri URL. Kui ette on antud rohkem kui üks URL, proovitakse neid järjest ükshaaval, kuni üks edukalt vastab. Servereid, mis ei vasta, ignoreeritakse ajutiselt, kuni ühendus taastub.", "manage_concurrency": "Halda samaaegsust", "manage_log_settings": "Halda logi seadeid", "map_dark_style": "Tume stiil", @@ -147,6 +148,8 @@ "map_settings": "Kaart", "map_settings_description": "Halda kaardi seadeid", "map_style_description": "Kaarditeema style.json URL", + "memory_cleanup_job": "Mälestuste korrastamine", + "memory_generate_job": "Mälestuste genereerimine", "metadata_extraction_job": "Metaandmete eraldamine", "metadata_extraction_job_description": "Eralda igast üksusest metaandmed, nagu GPS-koordinaadid, näod ja resolutsioon", "metadata_faces_import_setting": "Luba nägude import", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "Lülitab sisse räsi kontrolli; ära lülita seda välja, kui sa ei ole tagajärgedest teadlik", "storage_template_migration": "Talletusmalli migreerimine", "storage_template_migration_description": "Rakenda praegune {template} varem üleslaaditud üksustele", - "storage_template_migration_info": "Malli muudatused rakenduvad ainult uutele üksustele. Et rakendada malli tagasiulatuvalt varem üleslaaditud üksustele, käivita {job}.", + "storage_template_migration_info": "Talletusmall teeb kõik faililaiendid väiketähtedeks. Malli muudatused rakenduvad ainult uutele üksustele. Et rakendada malli tagasiulatuvalt varem üleslaaditud üksustele, käivita {job}.", "storage_template_migration_job": "Talletusmallide migreerimise tööde", "storage_template_more_details": "Et selle funktsiooni kohta rohkem teada saada, loe talletusmallide ja nende tagajärgede kohta", "storage_template_onboarding_description": "Kui sisse lülitatud, võimaldab see faile kasutaja määratud malli alusel automaatselt organiseerida. Stabiilsusprobleemide tõttu on see funktsioon vaikimisi välja lülitatud. Rohkem infot leiad dokumentatsioonist.", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "Maksimaalne B-kaadrite arv", "transcoding_max_b_frames_description": "Kõrgemad väärtused parandavad pakkimise efektiivsust, aga aeglustavad kodeerimist. See valik ei pruugi olla ühilduv riistvaralise kiirendusega vanematel seadmetel. 0 lülitab B-kaadrid välja, -1 määrab väärtuse automaatselt.", "transcoding_max_bitrate": "Maksimaalne bitisagedus", - "transcoding_max_bitrate_description": "Maksimaalse bitisageduse määramine teeb failisuurused ennustatavamaks, väikese kvaliteedikao hinnaga. 720p resolutsiooni puhul on tüüpilised väärtused 2600k (VP9 ja HEVC) või 4500k (H.264). Väärtus 0 eemaldab piirangu.", + "transcoding_max_bitrate_description": "Maksimaalse bitisageduse määramine teeb failisuurused ennustatavamaks, väikese kvaliteedikao hinnaga. 720p resolutsiooni puhul on tüüpilised väärtused 2600 kbit/s (VP9 ja HEVC) või 4500 kbit/s (H.264). Väärtus 0 eemaldab piirangu.", "transcoding_max_keyframe_interval": "Maksimaalne võtmekaadri intervall", "transcoding_max_keyframe_interval_description": "Määrab maksimaalse kauguse võtmekaadrite vahel. Madalamad väärtused vähendavad pakkimise efektiivsust, aga parandavad otsimiskiirust ning võivad tõsta kiire liikumisega stseenide kvaliteeti. 0 määrab väärtuse automaatselt.", "transcoding_optimal_description": "Kõrgema kui lubatud resolutsiooniga või mittelubatud formaadis videod", @@ -391,6 +394,7 @@ "allow_edits": "Luba muutmine", "allow_public_user_to_download": "Luba avalikul kasutajal alla laadida", "allow_public_user_to_upload": "Luba avalikul kasutajal üles laadida", + "alt_text_qr_code": "QR kood", "anti_clockwise": "Vastupäeva", "api_key": "API võti", "api_key_description": "Seda väärtust kuvatakse ainult üks kord. Kopeeri see enne akna sulgemist.", @@ -431,7 +435,7 @@ "assets_were_part_of_album_count": "{count, plural, one {Üksus oli} other {Üksused olid}} juba osa albumist", "authorized_devices": "Autoriseeritud seadmed", "back": "Tagasi", - "back_close_deselect": "Tagasi, sulge, või tühista valik", + "back_close_deselect": "Tagasi, sulge või tühista valik", "backward": "Tagasi", "birthdate_saved": "Sünnikuupäev salvestatud", "birthdate_set_description": "Sünnikuupäeva kasutatakse isiku vanuse arvutamiseks foto tegemise hetkel.", @@ -481,6 +485,7 @@ "comments_are_disabled": "Kommentaarid on keelatud", "confirm": "Kinnita", "confirm_admin_password": "Kinnita administraatori parool", + "confirm_delete_face": "Kas oled kindel, et soovid isiku {name} näo üksuselt kustutada?", "confirm_delete_shared_link": "Kas oled kindel, et soovid selle jagatud lingi kustutada?", "confirm_keep_this_delete_others": "Kõik muud üksused selles virnas kustutatakse. Kas oled kindel, et soovid jätkata?", "confirm_password": "Kinnita parool", @@ -533,6 +538,7 @@ "delete_album": "Kustuta album", "delete_api_key_prompt": "Kas oled kindel, et soovid selle API võtme kustutada?", "delete_duplicates_confirmation": "Kas oled kindel, et soovid need duplikaadid jäädavalt kustutada?", + "delete_face": "Kustuta nägu", "delete_key": "Kustuta võti", "delete_library": "Kustuta kogu", "delete_link": "Kustuta link", @@ -600,6 +606,7 @@ "enabled": "Lubatud", "end_date": "Lõppkuupäev", "error": "Viga", + "error_delete_face": "Viga näo kustutamisel", "error_loading_image": "Viga pildi laadimisel", "error_title": "Viga - midagi läks valesti", "errors": { @@ -718,6 +725,7 @@ "unable_to_submit_job": "Tööte edastamine ebaõnnestus", "unable_to_trash_asset": "Üksuse prügikasti liigutamine ebaõnnestus", "unable_to_unlink_account": "Konto lahtiühendamine ebaõnnestus", + "unable_to_unlink_motion_video": "Liikuva video linkimise tühistamine ebaõnnestus", "unable_to_update_album_cover": "Albumi kaanepildi muutmine ebaõnnestus", "unable_to_update_album_info": "Albumi info muutmine ebaõnnestus", "unable_to_update_library": "Kogu uuendamine ebaõnnestus", @@ -734,6 +742,7 @@ "expired": "Aegunud", "expires_date": "Aegub {date}", "explore": "Avasta", + "explorer": "Brauser", "export": "Ekspordi", "export_as_json": "Ekspordi JSON-formaati", "extension": "Laiend", @@ -742,6 +751,7 @@ "face_unassigned": "Seostamata", "failed_to_load_assets": "Üksuste laadimine ebaõnnestus", "favorite": "Lemmik", + "favorite_or_unfavorite_photo": "Lisa foto lemmikutesse või eemalda lemmikutest", "favorites": "Lemmikud", "feature_photo_updated": "Esiletõstetud foto muudetud", "features": "Funktsioonid", @@ -799,6 +809,7 @@ "include_shared_albums": "Kaasa jagatud albumid", "include_shared_partner_assets": "Kaasa partneri jagatud üksused", "individual_share": "Jagatud üksus", + "individual_shares": "Jagatud üksused", "info": "Info", "interval": { "day_at_onepm": "Iga päev kell 13", @@ -828,6 +839,7 @@ "library_options": "Kogu seaded", "light": "Hele", "like_deleted": "Meeldimine kustutatud", + "link_motion_video": "Lingi liikuv video", "link_options": "Lingi valikud", "link_to_oauth": "Ühenda OAuth", "linked_oauth_account": "OAuth konto ühendatud", @@ -879,6 +891,7 @@ "month": "Kuu", "more": "Rohkem", "moved_to_trash": "Liigutatud prügikasti", + "mute_memories": "Vaigista mälestused", "my_albums": "Minu albumid", "name": "Nimi", "name_or_nickname": "Nimi või hüüdnimi", @@ -974,6 +987,7 @@ "permanently_deleted_asset": "Üksus jäädavalt kustutatud", "permanently_deleted_assets_count": "{count, plural, one {# üksus} other {# üksust}} jäädavalt kustutatud", "person": "Isik", + "person_birthdate": "Sündinud {date}", "person_hidden": "{name}{hidden, select, true { (peidetud)} other {}}", "photo_shared_all_users": "Paistab, et oled oma fotosid kõigi kasutajatega jaganud, või pole ühtegi kasutajat, kellega jagada.", "photos": "Fotod", @@ -1071,6 +1085,8 @@ "removed_from_archive": "Arhiivist eemaldatud", "removed_from_favorites": "Lemmikutest eemaldatud", "removed_from_favorites_count": "{count, plural, other {# eemaldatud}} lemmikutest", + "removed_memory": "Mäletus eemaldatud", + "removed_photo_from_memory": "Foto mälestustest eemaldatud", "removed_tagged_assets": "Silt eemaldatud {count, plural, one {# üksuselt} other {# üksuselt}}", "rename": "Nimeta ümber", "repair": "Parandus", @@ -1079,6 +1095,7 @@ "repository": "Koodihoidla", "require_password": "Nõua parooli", "require_user_to_change_password_on_first_login": "Nõua kasutajalt esmakordsel sisenemisel parooli muutmist", + "rescan": "Skaneeri uuesti", "reset": "Lähtesta", "reset_password": "Lähtesta parool", "reset_people_visibility": "Lähtesta isikute nähtavus", @@ -1122,6 +1139,7 @@ "search_options": "Otsingu valikud", "search_people": "Otsi inimesi", "search_places": "Otsi kohti", + "search_rating": "Otsi hinnangu järgi...", "search_settings": "Otsi seadeid", "search_state": "Otsi osariiki...", "search_tags": "Otsi silte...", @@ -1225,7 +1243,7 @@ "start_date": "Alguskuupäev", "state": "Osariik", "status": "Staatus", - "stop_motion_photo": "Peata liikuv pilt", + "stop_motion_photo": "Peata liikuv foto", "stop_photo_sharing": "Lõpeta oma fotode jagamine?", "stop_photo_sharing_description": "{partner} ei pääse rohkem su fotodele ligi.", "stop_sharing_photos_with_user": "Lõpeta oma fotode selle kasutajaga jagamine", @@ -1245,6 +1263,7 @@ "tag_created": "Lisatud silt: {tag}", "tag_feature_description": "Fotode ja videote lehitsemine siltide kaupa grupeeritult", "tag_not_found_question": "Ei leia silti? Lisa uus silt.", + "tag_people": "Sildista inimesi", "tag_updated": "Muudetud silt: {tag}", "tagged_assets": "{count, plural, one {# üksus} other {# üksust}} sildistatud", "tags": "Sildid", @@ -1282,10 +1301,13 @@ "unknown_country": "Tundmatu riik", "unknown_year": "Teadmata aasta", "unlimited": "Piiramatu", + "unlink_motion_video": "Tühista liikuva video linkimine", "unlink_oauth": "Eemalda OAuth ühendus", "unlinked_oauth_account": "OAuth ühendus eemaldatud", + "unmute_memories": "Tühista mälestuste vaigistamine", "unnamed_album": "Nimetu album", "unnamed_album_delete_confirmation": "Kas oled kindel, et soovid selle albumi kustutada?", + "unnamed_share": "Nimetu jagamine", "unsaved_change": "Salvestamata muudatus", "unselect_all": "Ära vali ühtegi", "unselect_all_duplicates": "Ära vali duplikaate", @@ -1336,6 +1358,7 @@ "view_all": "Vaata kõiki", "view_all_users": "Vaata kõiki kasutajaid", "view_in_timeline": "Vaata ajajoonel", + "view_link": "Vaata linki", "view_links": "Vaata linke", "view_name": "Vaade", "view_next_asset": "Vaata järgmist üksust", @@ -1352,4 +1375,4 @@ "yes": "Jah", "you_dont_have_any_shared_links": "Sul pole ühtegi jagatud linki", "zoom_image": "Suumi pilti" -} +} \ No newline at end of file diff --git a/i18n/fa.json b/i18n/fa.json index ef058deb65..ca9b75c5e4 100644 --- a/i18n/fa.json +++ b/i18n/fa.json @@ -254,7 +254,7 @@ "transcoding_max_b_frames": "بیشترین B-frames", "transcoding_max_b_frames_description": "مقادیر بالاتر کارایی فشرده سازی را بهبود می‌بخشند، اما کدگذاری را کند می‌کنند. ممکن است با شتاب دهی سخت‌افزاری در دستگاه‌های قدیمی سازگار نباشد. مقدار( 0 ) B-frames را غیرفعال می‌کند، در حالی که مقدار ( 1 ) این مقدار را به صورت خودکار تنظیم می‌کند.", "transcoding_max_bitrate": "بیشترین بیت ریت", - "transcoding_max_bitrate_description": "تنظیم حداکثر بیت‌ریت می‌تواند اندازه فایل‌ها را در حدی قابل پیش‌بینی‌تر کند، هرچند که هزینه کمی برای کیفیت دارد. در وضوح 720p، مقادیر معمول 2600k برای VP9 یا HEVC و 4500k برای H.264 است. اگر به 0 تنظیم شود، غیرفعال می‌شود.", + "transcoding_max_bitrate_description": "تنظیم حداکثر بیت‌ریت می‌تواند اندازه فایل‌ها را در حدی قابل پیش‌بینی‌تر کند، هرچند که هزینه کمی برای کیفیت دارد. در وضوح 720p، مقادیر معمول 2600 kbit/s برای VP9 یا HEVC و 4500 kbit/s برای H.264 است. اگر به 0 تنظیم شود، غیرفعال می‌شود.", "transcoding_max_keyframe_interval": "حداکثر فاصله کلید فریم", "transcoding_max_keyframe_interval_description": "حداکثر فاصله فریم بین کلیدفریم‌ها را تنظیم می‌کند. مقادیر پایین‌تر کارایی فشرده‌سازی را کاهش می‌دهند، اما زمان جستجو را بهبود می‌بخشند و ممکن است کیفیت را در صحنه‌های با حرکت سریع بهبود دهند. مقدار 0 این مقدار را به‌طور خودکار تنظیم می‌کند.", "transcoding_optimal_description": "ویدیوهایی که از رزولوشن هدف بالاتر هستند یا در قالب پذیرفته شده نیستند", @@ -926,4 +926,4 @@ "yes": "بله", "you_dont_have_any_shared_links": "", "zoom_image": "بزرگنمایی تصویر" -} +} \ No newline at end of file diff --git a/i18n/fi.json b/i18n/fi.json index 843e42f887..ea36a994b4 100644 --- a/i18n/fi.json +++ b/i18n/fi.json @@ -299,7 +299,7 @@ "transcoding_max_b_frames": "B-kehysten enimmäismäärä", "transcoding_max_b_frames_description": "Korkeampi arvo parantaa pakkausta, mutta hidastaa enkoodausta. Ei välttämättä ole yhteensopiva vanhempien laitteiden kanssa. 0 poistaa B-kehykset käytöstä, -1 määrittää arvon automaattisesti.", "transcoding_max_bitrate": "Suurin bittinopeus", - "transcoding_max_bitrate_description": "Suurimman sallitun bittinopeuden asettaminen tekee tiedostojen koosta ennustettavampaa vaikka laatu voi hieman heiketä. 720p videossa tyypilliset arvot ovat 2600k VP9:lle ja HEVC:lle, tai 4500k H.254:lle. Jos 0, ei käytössä.", + "transcoding_max_bitrate_description": "Suurimman sallitun bittinopeuden asettaminen tekee tiedostojen koosta ennustettavampaa vaikka laatu voi hieman heiketä. 720p videossa tyypilliset arvot ovat 2600 kbit/s VP9:lle ja HEVC:lle, tai 4500 kbit/s H.254:lle. Jos 0, ei käytössä.", "transcoding_max_keyframe_interval": "Suurin avainkehysten väli", "transcoding_max_keyframe_interval_description": "Asettaa avainkehysten välin maksimiarvon. Alempi arvo huonontaa pakkauksen tehoa, mutta parantaa hakuaikoja ja voi parantaa laatua nopealiikkeisissä kohtauksissa. 0 asettaa arvon automaattisesti.", "transcoding_optimal_description": "Videot, joiden resoluutio on korkeampi kuin kohteen, tai ei hyväksytyssä formaatissa", @@ -766,8 +766,10 @@ "go_to_folder": "Mene kansioon", "go_to_search": "Siirry hakuun", "group_albums_by": "Ryhmitä albumi...", + "group_country": "Ryhmitä maan mukaan", "group_no": "Ei ryhmitystä", "group_owner": "Ryhmitä omistajan mukaan", + "group_places_by": "Ryhmitä paikat...", "group_year": "Ryhmitä vuoden mukaan", "has_quota": "On kiintiö", "hi_user": "Hei {name} ({email})", @@ -800,6 +802,7 @@ "include_shared_albums": "Sisällytä jaetut albumit", "include_shared_partner_assets": "Sisällytä jaetut kumppanikohteet", "individual_share": "Yksittäinen jako", + "individual_shares": "Yksittäiset jaot", "info": "Lisätietoja", "interval": { "day_at_onepm": "Joka päivä klo 13:00", @@ -1107,6 +1110,7 @@ "search": "Haku", "search_albums": "Etsi albumeita", "search_by_context": "Etsi kontekstin perusteella", + "search_by_description": "Etsi kuvauksen perusteella", "search_by_filename": "Hae tiedostonimen tai -päätteen mukaan", "search_by_filename_example": "esim. IMG_1234.JPG tai PNG", "search_camera_make": "Etsi kameramerkkiä...", @@ -1348,4 +1352,4 @@ "yes": "Kyllä", "you_dont_have_any_shared_links": "Sinulla ei ole jaettuja linkkejä", "zoom_image": "Zoomaa kuvaa" -} +} \ No newline at end of file diff --git a/i18n/fr.json b/i18n/fr.json index dfb095046f..3f479ab28f 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -41,6 +41,7 @@ "backup_settings": "Paramètres de la sauvegarde", "backup_settings_description": "Gérer les paramètres de la sauvegarde", "check_all": "Tout cocher", + "cleanup": "Nettoyage", "cleared_jobs": "Tâches supprimées pour : {job}", "config_set_by_file": "La configuration est actuellement définie par un fichier de configuration", "confirm_delete_library": "Êtes-vous sûr de vouloir supprimer la bibliothèque {library} ?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Activer l'analyse périodique de la bibliothèque", "library_settings": "Bibliothèque externe", "library_settings_description": "Gestion des paramètres des bibliothèques externes", - "library_tasks_description": "Exécution d'actions sur la bibliothèque", + "library_tasks_description": "Scanner les bibliothèques externes pour les nouveaux et/ou les éléments modifiés", "library_watching_enable_description": "Surveiller les modifications de fichiers dans les bibliothèques externes", "library_watching_settings": "Surveillance de bibliothèque (EXPÉRIMENTAL)", "library_watching_settings_description": "Surveiller automatiquement les fichiers modifiés", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Rechercher des images de manière sémantique en utilisant les intégrations CLIP", "machine_learning_smart_search_enabled": "Activer la recherche intelligente", "machine_learning_smart_search_enabled_description": "Si cette option est désactivée, les images ne seront pas encodées pour la recherche intelligente.", - "machine_learning_url_description": "L’URL du serveur d'apprentissage automatique. Si plusieurs URL sont fournies, chaque serveur sera essayé un par un jusqu’à ce que l’un d’eux réponde avec succès, dans l’ordre de la première à la dernière.", + "machine_learning_url_description": "L’URL du serveur d'apprentissage automatique. Si plusieurs URL sont fournies, chaque serveur sera essayé un par un jusqu’à ce que l’un d’eux réponde avec succès, dans l’ordre de la première à la dernière. Les serveurs ne répondant pas seront temporairement ignorés jusqu'à ce qu'ils soient de nouveau opérationnels.", "manage_concurrency": "Gérer du multitâche", "manage_log_settings": "Gérer les paramètres de journalisation", "map_dark_style": "Thème sombre", @@ -147,6 +148,8 @@ "map_settings": "Carte", "map_settings_description": "Gérer les paramètres de la carte", "map_style_description": "URL vers un thème de carte au format style.json", + "memory_cleanup_job": "Nettoyage des souvenirs", + "memory_generate_job": "Génération des souvenirs", "metadata_extraction_job": "Extraction des métadonnées", "metadata_extraction_job_description": "Extraction des informations des métadonnées de chaque média, telles que la position GPS, les visages et la résolution", "metadata_faces_import_setting": "Active l'importation des visages", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "Active la vérification du hachage, ne désactivez pas cette option à moins d'être sûr de ce que vous faites", "storage_template_migration": "Migration du modèle de stockage", "storage_template_migration_description": "Appliquer le modèle courant {template} aux médias précédemment envoyés", - "storage_template_migration_info": "Les changements de modèle ne s'appliqueront qu'aux nouveaux médias. Pour appliquer rétroactivement le modèle aux médias précédemment envoyés, exécutez la tâche {job}.", + "storage_template_migration_info": "L'enregistrement des modèles convertit toutes les extensions en minuscule. Les changements de modèle ne s'appliqueront qu'aux nouveaux médias. Pour appliquer rétroactivement le modèle aux médias précédemment envoyés, exécutez la tâche {job}.", "storage_template_migration_job": "Tâche de migration du modèle de stockage", "storage_template_more_details": "Pour plus de détails sur cette fonctionnalité, reportez-vous au Modèle de stockage et à ses implications", "storage_template_onboarding_description": "Lorsqu'elle est activée, cette fonctionnalité réorganise les fichiers basés sur un modèle défini par l'utilisateur. En raison de problèmes de stabilité, la fonction a été désactivée par défaut. Pour plus d'informations, veuillez consulter la documentation.", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "Nombre maximum de trames B", "transcoding_max_b_frames_description": "Des valeurs plus élevées améliorent l'efficacité de la compression, mais ralentissent l'encodage. Elles peuvent ne pas être compatibles avec l'accélération matérielle sur les anciens appareils. Une valeur de 0 désactive les trames B, tandis qu'une valeur de -1 définit automatiquement ce paramètre.", "transcoding_max_bitrate": "Débit binaire maximal", - "transcoding_max_bitrate_description": "Définir un débit binaire maximal peut résulter en des fichiers de taille plus prédictible, au prix d'une légère perte en qualité. En 720p, les valeurs sont 2600k pour du VP9 ou du HEVC ou 4500k pour du H.264. Désactivé si le débit binaire est à 0.", + "transcoding_max_bitrate_description": "Définir un débit binaire maximal peut résulter en des fichiers de taille plus prédictible, au prix d'une légère perte en qualité. En 720p, les valeurs sont 2600 kbit/s pour du VP9 ou du HEVC ou 4500 kbit/s pour du H.264. Désactivé si le débit binaire est à 0.", "transcoding_max_keyframe_interval": "Intervalle maximal entre les images clés", "transcoding_max_keyframe_interval_description": "Définit la distance maximale de trames entre les images clés. Les valeurs plus basses diminuent l'efficacité de la compression, mais améliorent les temps de recherche et peuvent améliorer la qualité dans les scènes avec des mouvements rapides. Une valeur de 0 définit automatiquement ce paramètre.", "transcoding_optimal_description": "Les vidéos dont la résolution est supérieure à celle attendue ou celles qui ne sont pas dans un format accepté", @@ -391,6 +394,7 @@ "allow_edits": "Autoriser les modifications", "allow_public_user_to_download": "Permettre aux utilisateurs non connectés de télécharger", "allow_public_user_to_upload": "Permettre l'envoi aux utilisateurs non connectés", + "alt_text_qr_code": "Image du code QR", "anti_clockwise": "Sens anti-horaire", "api_key": "Clé API", "api_key_description": "Cette valeur ne sera affichée qu'une seule fois. Assurez-vous de la copier avant de fermer la fenêtre.", @@ -481,6 +485,7 @@ "comments_are_disabled": "Les commentaires sont désactivés", "confirm": "Confirmer", "confirm_admin_password": "Confirmer le mot de passe Admin", + "confirm_delete_face": "Êtes-vous sûr de vouloir supprimer le visage de {name} du média ?", "confirm_delete_shared_link": "Voulez-vous vraiment supprimer ce lien partagé ?", "confirm_keep_this_delete_others": "Tous les autres médias dans la pile seront supprimés sauf celui-ci. Êtes-vous sûr de vouloir continuer ?", "confirm_password": "Confirmer le mot de passe", @@ -533,6 +538,7 @@ "delete_album": "Supprimer l'album", "delete_api_key_prompt": "Voulez-vous vraiment supprimer cette clé API ?", "delete_duplicates_confirmation": "Êtes-vous certain de vouloir supprimer définitivement ces doublons ?", + "delete_face": "Supprimer le visage", "delete_key": "Supprimer la clé", "delete_library": "Supprimer la bibliothèque", "delete_link": "Supprimer le lien", @@ -600,6 +606,7 @@ "enabled": "Activé", "end_date": "Date de fin", "error": "Erreur", + "error_delete_face": "Erreur lors de la suppression du visage pour le média", "error_loading_image": "Erreur de chargement de l'image", "error_title": "Erreur - Quelque chose s'est mal passé", "errors": { @@ -884,6 +891,7 @@ "month": "Mois", "more": "Plus", "moved_to_trash": "Déplacé dans la corbeille", + "mute_memories": "Mettre en sourdine les souvenirs", "my_albums": "Mes albums", "name": "Nom", "name_or_nickname": "Nom ou surnom", @@ -1076,6 +1084,8 @@ "removed_from_archive": "Supprimé de l'archive", "removed_from_favorites": "Supprimé des favoris", "removed_from_favorites_count": "{count, plural, one {# supprimé} other {# supprimés}} des favoris", + "removed_memory": "Souvenir supprimé", + "removed_photo_from_memory": "Photo supprimée du souvenir", "removed_tagged_assets": "Tag supprimé de {count, plural, one {# média} other {# médias}}", "rename": "Renommer", "repair": "Réparer", @@ -1084,6 +1094,7 @@ "repository": "Dépôt", "require_password": "Demander le mot de passe", "require_user_to_change_password_on_first_login": "Demander à l'utilisateur de changer son mot de passe lors de sa première connexion", + "rescan": "Rescanner", "reset": "Réinitialiser", "reset_password": "Réinitialiser le mot de passe", "reset_people_visibility": "Réinitialiser la visibilité des personnes", @@ -1127,6 +1138,7 @@ "search_options": "Rechercher une option", "search_people": "Rechercher une personne", "search_places": "Rechercher un lieu", + "search_rating": "Chercher par évaluation...", "search_settings": "Paramètres de recherche", "search_state": "Rechercher par état/région...", "search_tags": "Recherche d'étiquettes...", @@ -1250,6 +1262,7 @@ "tag_created": "Étiquette créée : {tag}", "tag_feature_description": "Parcourir les photos et vidéos groupées par thèmes logiques", "tag_not_found_question": "Vous ne trouvez pas une étiquette ? Créer une nouvelle étiquette.", + "tag_people": "Étiqueter les personnes", "tag_updated": "Étiquette mise à jour : {tag}", "tagged_assets": "Étiquette ajoutée à {count, plural, one {# média} other {# médias}}", "tags": "Étiquettes", @@ -1290,6 +1303,7 @@ "unlink_motion_video": "Détacher la photo animée", "unlink_oauth": "Déconnecter OAuth", "unlinked_oauth_account": "Compte OAuth non connecté", + "unmute_memories": "Réactiver les souvenirs", "unnamed_album": "Album sans nom", "unnamed_album_delete_confirmation": "Êtes-vous sûr de vouloir supprimer cet album ?", "unnamed_share": "Partage sans nom", @@ -1343,6 +1357,7 @@ "view_all": "Voir tout", "view_all_users": "Voir tous les utilisateurs", "view_in_timeline": "Voir dans la vue chronologique", + "view_link": "Voir le lien", "view_links": "Voir les liens", "view_name": "Vue", "view_next_asset": "Voir le média suivant", @@ -1359,4 +1374,4 @@ "yes": "Oui", "you_dont_have_any_shared_links": "Vous n'avez aucun lien partagé", "zoom_image": "Zoomer" -} +} \ No newline at end of file diff --git a/i18n/he.json b/i18n/he.json index 72a214079b..67321af4cd 100644 --- a/i18n/he.json +++ b/i18n/he.json @@ -41,6 +41,7 @@ "backup_settings": "הגדרות גיבוי", "backup_settings_description": "ניהול הגדרות גיבוי מסד נתונים", "check_all": "סימון הכל", + "cleanup": "ניקוי", "cleared_jobs": "נוקו משימות עבור: {job}", "config_set_by_file": "התצורה מוגדרת כעת על ידי קובץ תצורה", "confirm_delete_library": "האם את/ה בטוח/ה שברצונך למחוק את הספרייה {library}?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "אפשר סריקת ספרייה תקופתית", "library_settings": "ספרייה חיצונית", "library_settings_description": "ניהול הגדרות ספרייה חיצונית", - "library_tasks_description": "ביצוע משימות ספרייה", + "library_tasks_description": "סרוק ספריות חיצוניות עבור נכסים חדשים ו/או שהשתנו", "library_watching_enable_description": "עקוב אחר שינויי קבצים בספריות חיצוניות", "library_watching_settings": "צפיית ספרייה (ניסיוני)", "library_watching_settings_description": "עקוב אוטומטית אחר שינויי קבצים", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "חיפוש תמונות באופן סמנטי באמצעות הטמעות של CLIP", "machine_learning_smart_search_enabled": "אפשר חיפוש חכם", "machine_learning_smart_search_enabled_description": "אם מושבת, תמונות לא יקודדו לחיפוש חכם.", - "machine_learning_url_description": "כתובת האתר של שרת למידת המכונה. אם ניתנת יותר מכתובת אחת, כל שרת ינסה בתורו עד אשר יענה בחיוב, בסדר התחלתי.", + "machine_learning_url_description": "כתובת ה-URL של שרת למידת המכונה. אם ניתנת יותר מכתובת URL אחת, כל שרת ינוסה ניסיון אחד בכל פעם עד שאחד מהם יגיב בהצלחה, לפי הסדר מהראשון עד האחרון. שרתים שלא מגיבים יוזנחו זמנית עד שיחזרו להיות מקוונים.", "manage_concurrency": "ניהול בו-זמניות", "manage_log_settings": "ניהול הגדרות רישום ביומן", "map_dark_style": "עיצוב כהה", @@ -147,6 +148,8 @@ "map_settings": "מפה", "map_settings_description": "ניהול הגדרות מפה", "map_style_description": "כתובת אתר לערכת נושא של מפה style.json", + "memory_cleanup_job": "ניקוי זיכרון", + "memory_generate_job": "יצירת זיכרון", "metadata_extraction_job": "חלץ מטא-נתונים", "metadata_extraction_job_description": "חלץ מידע מטא-נתונים מכל נכס, כגון GPS, פנים ורזולוציה", "metadata_faces_import_setting": "אפשר יבוא פנים", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "מאפשר אימות גיבוב, אל תשבית/י זאת אלא אם כן את/ה בטוח/ה בהשלכות", "storage_template_migration": "העברת תבנית אחסון", "storage_template_migration_description": "החל את ה{template} הנוכחית על נכסים שהועלו בעבר", - "storage_template_migration_info": "שינויים בתבנית יחולו רק על נכסים חדשים. כדי להחיל באופן רטרואקטיבי את התבנית על נכסים שהועלו בעבר, הפעל את {job}.", + "storage_template_migration_info": "תבנית האחסון תמיר את כל ההרחבות לאותיות קטנות. שינויים בתבנית יחולו רק על נכסים חדשים. כדי להחיל באופן רטרואקטיבי את התבנית על נכסים שהועלו בעבר, הפעל את {job}.", "storage_template_migration_job": "משימת העברת תבנית אחסון", "storage_template_more_details": "לפרטים נוספים אודות תכונה זו, עיין בתבנית האחסון ובהשלכותיה", "storage_template_onboarding_description": "כאשר מופעלת, תכונה זו תארגן אוטומטית קבצים בהתבסס על תבנית שהמשתמש הגדיר. עקב בעיות יציבות התכונה כבויה כברירת מחדל. למידע נוסף, נא לראות את התיעוד.", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "B-פריימים מרביים", "transcoding_max_b_frames_description": "ערכים גבוהים יותר משפרים את יעילות הדחיסה, אך מאטים את הקידוד. ייתכן שלא יהיה תואם עם האצת חומרה במכשירים ישנים יותר. 0 משבית את B-פריימים, בעוד ש1- מגדיר את הערך זה באופן אוטומטי.", "transcoding_max_bitrate": "קצב סיביות מרבי", - "transcoding_max_bitrate_description": "קביעת קצב סיביות מרבי יכולה להפוך את גדלי הקבצים לצפויים יותר בעלות קלה לאיכות. ב-720p, ערכים טיפוסיים הם 2600k עבור VP9 או HEVC, או 4500k עבור H.264. מושבת אם מוגדר ל-0.", + "transcoding_max_bitrate_description": "קביעת קצב סיביות מרבי יכולה להפוך את גדלי הקבצים לצפויים יותר בעלות קלה לאיכות. ב-720p, ערכים טיפוסיים הם 2600 kbit/s עבור VP9 או HEVC, או 4500 kbit/s עבור H.264. מושבת אם מוגדר ל-0.", "transcoding_max_keyframe_interval": "מרווח תמונת מפתח מרבי", "transcoding_max_keyframe_interval_description": "מגדיר את מרחק הפריימים המרבי בין תמונות מפתח. ערכים נמוכים גורעים את יעילות הדחיסה, אך משפרים את זמני החיפוש ועשויים לשפר את האיכות בסצנות עם תנועה מהירה. 0 מגדיר ערך זה באופן אוטומטי.", "transcoding_optimal_description": "סרטונים גבוהים מרזולוציית היעד או לא בפורמט מקובל", @@ -391,6 +394,7 @@ "allow_edits": "אפשר עריכות", "allow_public_user_to_download": "אפשר למשתמש ציבורי להוריד", "allow_public_user_to_upload": "אפשר למשתמש ציבורי להעלות", + "alt_text_qr_code": "תמונת קוד QR", "anti_clockwise": "נגד כיוון השעון", "api_key": "מפתח API", "api_key_description": "הערך הזה יוצג רק פעם אחת. נא לוודא שהעתקת אותו לפני סגירת החלון.", @@ -437,7 +441,7 @@ "birthdate_set_description": "תאריך לידה משמש לחישוב הגיל של האדם הזה בזמן תצלום.", "blurred_background": "רקע מטושטש", "bugs_and_feature_requests": "באגים & בקשות לתכונות", - "build": "גרסאת בנייה", + "build": "גרסת בנייה", "build_image": "גרסת תוכנה", "bulk_delete_duplicates_confirmation": "האם את/ה בטוח/ה שברצונך למחוק בכמות גדולה {count, plural, one {נכס # כפול} other {# נכסים כפולים}}? זה ישמור על הנכס הכי גדול של כל קבוצה וימחק לצמיתות את כל שאר הכפילויות. את/ה לא יכול/ה לבטל את הפעולה הזו!", "bulk_keep_duplicates_confirmation": "האם את/ה בטוח/ה שברצונך להשאיר {count, plural, one {נכס # כפול} other {# נכסים כפולים}}? זה יפתור את כל הקבוצות הכפולות מבלי למחוק דבר.", @@ -481,6 +485,7 @@ "comments_are_disabled": "תגובות מושבתות", "confirm": "אישור", "confirm_admin_password": "אישור סיסמת מנהל", + "confirm_delete_face": "האם את/ה בטוח/ה שברצונך למחוק את הפנים של {name} מהנכס?", "confirm_delete_shared_link": "האם את/ה בטוח/ה שברצונך למחוק את הקישור המשותף הזה?", "confirm_keep_this_delete_others": "כל שאר הנכסים בערימה יימחקו למעט נכס זה. האם את/ה בטוח/ה שברצונך להמשיך?", "confirm_password": "אשר סיסמה", @@ -533,6 +538,7 @@ "delete_album": "מחק אלבום", "delete_api_key_prompt": "האם את/ה בטוח/ה שברצונך למחוק מפתח ה-API הזה?", "delete_duplicates_confirmation": "האם את/ה בטוח/ה שברצונך למחוק לצמיתות את הכפילויות האלה?", + "delete_face": "מחק פנים", "delete_key": "מחק מפתח", "delete_library": "מחק ספרייה", "delete_link": "מחק קישור", @@ -600,6 +606,7 @@ "enabled": "מופעל", "end_date": "תאריך סיום", "error": "שגיאה", + "error_delete_face": "שגיאה במחיקת פנים מנכס", "error_loading_image": "שגיאה בטעינת התמונה", "error_title": "שגיאה - משהו השתבש", "errors": { @@ -884,6 +891,7 @@ "month": "חודש", "more": "עוד", "moved_to_trash": "הועבר לאשפה", + "mute_memories": "השתקת זיכרונות", "my_albums": "האלבומים שלי", "name": "שם", "name_or_nickname": "שם או כינוי", @@ -1076,6 +1084,8 @@ "removed_from_archive": "הוסר מארכיון", "removed_from_favorites": "הוסר ממועדפים", "removed_from_favorites_count": "{count, plural, other {הוסרו #}} מהמועדפים", + "removed_memory": "זיכרון הוסר", + "removed_photo_from_memory": "התמונה הוסרה מהזיכרון", "removed_tagged_assets": "תג הוסר מ{count, plural, one {נכס #} other {# נכסים}}", "rename": "שנה שם", "repair": "תיקון", @@ -1084,6 +1094,7 @@ "repository": "מאגר", "require_password": "דרוש סיסמה", "require_user_to_change_password_on_first_login": "דרוש מהמשתמש לשנות סיסמה בכניסה הראשונה", + "rescan": "סרוק מחדש", "reset": "איפוס", "reset_password": "איפוס סיסמה", "reset_people_visibility": "אפס את נראות האנשים", @@ -1127,6 +1138,7 @@ "search_options": "אפשרויות חיפוש", "search_people": "חיפוש אנשים", "search_places": "חיפוש מקומות", + "search_rating": "חיפוש לפי דירוג...", "search_settings": "הגדרות חיפוש", "search_state": "חיפוש מדינה...", "search_tags": "חיפוש תגים...", @@ -1250,6 +1262,7 @@ "tag_created": "נוצר תג: {tag}", "tag_feature_description": "עיון בתמונות וסרטונים שקובצו על ידי נושאי תג לוגיים", "tag_not_found_question": "לא מצליח למצוא תג? צור תג חדש", + "tag_people": "תייג אנשים", "tag_updated": "תג מעודכן: {tag}", "tagged_assets": "תויגו {count, plural, one {נכס #} other {# נכסים}}", "tags": "תגים", @@ -1290,6 +1303,7 @@ "unlink_motion_video": "בטל קישור סרטון תנועה", "unlink_oauth": "בטל קישור OAuth", "unlinked_oauth_account": "בוטל קישור חשבון OAuth", + "unmute_memories": "בטל השתקת זיכרונות", "unnamed_album": "אלבום ללא שם", "unnamed_album_delete_confirmation": "את/ה בטוח/ה שברצונך למחוק את האלבום הזה?", "unnamed_share": "שיתוף ללא שם", @@ -1343,6 +1357,7 @@ "view_all": "הצג הכל", "view_all_users": "הצג את כל המשתמשים", "view_in_timeline": "ראה בציר הזמן", + "view_link": "הצג קישור", "view_links": "הצג קישורים", "view_name": "הצג", "view_next_asset": "הצג את הנכס הבא", @@ -1359,4 +1374,4 @@ "yes": "כן", "you_dont_have_any_shared_links": "אין לך קישורים משותפים", "zoom_image": "זום לתמונה" -} +} \ No newline at end of file diff --git a/i18n/hi.json b/i18n/hi.json index fdc79c15eb..c2534fed72 100644 --- a/i18n/hi.json +++ b/i18n/hi.json @@ -13,14 +13,14 @@ "add_a_location": "एक स्थान जोड़ें", "add_a_name": "नाम जोड़ें", "add_a_title": "एक शीर्षक जोड़ें", - "add_exclusion_pattern": "निषेध उदाहरण जोड़ें", + "add_exclusion_pattern": "अपवाद उदाहरण जोड़ें", "add_import_path": "आयात पथ जोड़ें", "add_location": "स्थान जोड़ें", "add_more_users": "अधिक उपयोगकर्ता जोड़ें", "add_partner": "जोड़ीदार जोड़ें", "add_path": "पथ जोड़ें", "add_photos": "फ़ोटो जोड़ें", - "add_to": "इसमें जोड़ें..।", + "add_to": "इसमें जोड़ें…", "add_to_album": "एल्बम में जोड़ें", "add_to_shared_album": "साझा एल्बम में जोड़ें", "add_url": "URL जोड़ें", @@ -47,7 +47,7 @@ "exclusion_pattern_description": "Exclusion पैटर्न आपको अपनी लाइब्रेरी को स्कैन करते समय फ़ाइलों और फ़ोल्डरों को अनदेखा करने देता है। यह उपयोगी है यदि आपके पास ऐसे फ़ोल्डर हैं जिनमें ऐसी फ़ाइलें हैं जिन्हें आप आयात नहीं करना चाहते हैं, जैसे RAW फ़ाइलें।", "external_library_created_at": "बाहरी लाइब्रेरी ({date} को बनाई गई)", "external_library_management": "बाहरी लाइब्रेरी प्रबंधन", - "face_detection": "चेहरे का पहचान", + "face_detection": "मुख संशोधन", "face_detection_description": "मशीन लर्निंग का उपयोग करके संपत्तियों में चेहरों का पता लगाएं। वीडियो के लिए, केवल थंबनेल पर विचार किया जाता है। \"सभी\" परिसंपत्तियों को (पुनः) संसाधित करता है। \"लापता\" उन परिसंपत्तियों को कतारबद्ध करता है जिन्हें अभी तक संसाधित नहीं किया गया है। फेस डिटेक्शन पूरा होने के बाद पहचाने गए चेहरों को चेहरे की पहचान के लिए कतारबद्ध किया जाएगा, उन्हें मौजूदा या नए लोगों में समूहित किया जाएगा।", "facial_recognition_job_description": "समूह ने लोगों में चेहरों का पता लगाया। यह चरण फेस डिटेक्शन पूरा होने के बाद चलता है। \"सभी\" चेहरों को (पुनः) समूहित करता है। \"लापता\" कतार में वे चेहरे हैं जिनके लिए कोई व्यक्ति नियुक्त नहीं है।", "failed_job_command": "कार्य {job} के लिए आदेश {command} विफल", diff --git a/i18n/hr.json b/i18n/hr.json index b6d9c97748..8b8e909391 100644 --- a/i18n/hr.json +++ b/i18n/hr.json @@ -288,7 +288,7 @@ "transcoding_max_b_frames": "Maksimalni B-frameovi", "transcoding_max_b_frames_description": "Više vrijednosti poboljšavaju učinkovitost kompresije, ali usporavaju kodiranje. Možda nije kompatibilan s hardverskim ubrzanjem na starijim uređajima. 0 onemogućuje B-frameove, dok -1 automatski postavlja ovu vrijednost.", "transcoding_max_bitrate": "Maksimalne brzina prijenosa (bitrate)", - "transcoding_max_bitrate_description": "Postavljanje maksimalne brzine prijenosa može učiniti veličine datoteka predvidljivijima uz manji trošak za kvalitetu. Pri 720p, tipične vrijednosti su 2600k za VP9 ili HEVC ili 4500k za H.264. Onemogućeno ako je postavljeno na 0.", + "transcoding_max_bitrate_description": "Postavljanje maksimalne brzine prijenosa može učiniti veličine datoteka predvidljivijima uz manji trošak za kvalitetu. Pri 720p, tipične vrijednosti su 2600 kbit/s za VP9 ili HEVC ili 4500 kbit/s za H.264. Onemogućeno ako je postavljeno na 0.", "transcoding_max_keyframe_interval": "Maksimalni interval ključnih sličica", "transcoding_max_keyframe_interval_description": "Postavlja maksimalnu udaljenost slika između ključnih kadrova. Niže vrijednosti pogoršavaju učinkovitost kompresije, ali poboljšavaju vrijeme traženja i mogu poboljšati kvalitetu u scenama s brzim kretanjem. 0 automatski postavlja ovu vrijednost.", "transcoding_optimal_description": "Videozapisi koji su veći od ciljne rezolucije ili nisu u prihvatljivom formatu", @@ -468,6 +468,7 @@ "comments_are_disabled": "Komentari onemogućeni", "confirm": "Potvrdi", "confirm_admin_password": "Potvrdite lozinku administratora", + "confirm_delete_face": "Jeste li sigurni da želite izbrisati lice {name} iz knjižnice materijala.", "confirm_delete_shared_link": "Jeste li sigurni da želite izbrisati ovu zajedničku vezu?", "confirm_keep_this_delete_others": "Sva druga sredstva u nizu bit će izbrisana osim ovog sredstva. Jeste li sigurni da želite nastaviti?", "confirm_password": "Potvrdite lozinku", @@ -1252,4 +1253,4 @@ "yes": "", "you_dont_have_any_shared_links": "", "zoom_image": "" -} +} \ No newline at end of file diff --git a/i18n/hu.json b/i18n/hu.json index 5da84cdf3a..513775e45e 100644 --- a/i18n/hu.json +++ b/i18n/hu.json @@ -41,6 +41,7 @@ "backup_settings": "Biztonsági mentés beállításai", "backup_settings_description": "Adatbázis mentési beállításainak kezelése", "check_all": "Összes Kipiálása", + "cleanup": "Takarítás", "cleared_jobs": "{job}: feladatai törölve", "config_set_by_file": "A konfigurációt jelenleg egy konfigurációs fájl állítja be", "confirm_delete_library": "Biztosan ki szeretnéd törölni a {library} képtárat?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Képtár időszakos átfésülésének engedélyezése", "library_settings": "Külső Képtár", "library_settings_description": "Külső képtár beállításainak kezelése", - "library_tasks_description": "Képtár feladatok elvégzése", + "library_tasks_description": "Külső könyvtárak szkennelése új és/vagy módosított elemek után", "library_watching_enable_description": "Külső képtár változásainak figyelése", "library_watching_settings": "Képtár figyelése (KÍSÉRLETI)", "library_watching_settings_description": "Megváltozott fájlok automatikus észlelése", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Képek szemantikai keresése CLIP beágyazások segítségével", "machine_learning_smart_search_enabled": "Okos keresés engedélyezése", "machine_learning_smart_search_enabled_description": "Ha ki van kapcsolva, a képek nem lesznek átalakítva okos kereséshez.", - "machine_learning_url_description": "Gépi tanulás szerver URL címe. Ha többi, mint egy URL van megadva, mindegyik szervert egyenként próbálja meg, amíg az egyik sikeresen nem válaszol, sorrendben az elsőtől az utólsóig.", + "machine_learning_url_description": "Gépi tanulás szerver URL címe. Ha többi, mint egy URL van megadva, mindegyik szervert egyenként próbálja meg, amíg az egyik sikeresen nem válaszol, sorrendben az elsőtől az utólsóig. A nem válaszoló szervereket átmenetileg figyelmen kívül hagyja, amíg újra online nem lesznek.", "manage_concurrency": "Párhuzamos Feladatok Kezelése", "manage_log_settings": "Naplózási beállítások kezelése", "map_dark_style": "Sötét stílus", @@ -147,6 +148,8 @@ "map_settings": "Térkép", "map_settings_description": "Térkép beállítások kezelése", "map_style_description": "Egy style.json térképtémára mutató URL cím", + "memory_cleanup_job": "Memória takarítás", + "memory_generate_job": "Emlék létrehozása", "metadata_extraction_job": "Metaadatok kinyerése", "metadata_extraction_job_description": "Metaadat információk (pl. GPS, arcok és felbontás) kinyerése minden elemből", "metadata_faces_import_setting": "Arc importálás engedélyezése", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "B-képkockák maximum száma", "transcoding_max_b_frames_description": "Nagyobb értékek megnövelik a tömörítés hatékonyságát, de lelassítják a kódolást. Nem minden hardvereszköz támogatja. A 0 érték kikapcsolja a B-képkockákat, míg -1 esetén a szoftver magának választ értéket.", "transcoding_max_bitrate": "Maximum bitráta", - "transcoding_max_bitrate_description": "Maximum bitráta beállítása konzisztensebb fájlméretet eredményez egy kevés minőségi romlás árán. 720p esetén jellemző érték lehet 2600k a VP9 vagy HEVC kódoláshoz, 4500k a H.264 kódoláshoz. A 0 érték esetén nincs maximum bitráta.", + "transcoding_max_bitrate_description": "Maximum bitráta beállítása konzisztensebb fájlméretet eredményez egy kevés minőségi romlás árán. 720p esetén jellemző érték lehet 2600 kbit/s a VP9 vagy HEVC kódoláshoz, 4500 kbit/s a H.264 kódoláshoz. A 0 érték esetén nincs maximum bitráta.", "transcoding_max_keyframe_interval": "Maximum kulcskocka intervallum", "transcoding_max_keyframe_interval_description": "Beállítja a kulcskockák közötti legnagyobb lehetséges távolságot. Alacsony érték csökkenti a tömörítési hatékonyságot, de lejátszás közben az előre- és hátratekerés gyorsabb, valamint javíthatja a gyorsan mozgó jelenetek képminőségét. 0 esetén a szoftver magának állítja be az értéket.", "transcoding_optimal_description": "A célfelbontásnál nagyobb vagy a nem elfogadott formátumú videókat", @@ -391,6 +394,7 @@ "allow_edits": "Módosítások engedélyezése", "allow_public_user_to_download": "Engedélyezi a letöltést publikus felhasználó számára", "allow_public_user_to_upload": "Engedélyezi a feltöltést publikus felhasználó számára", + "alt_text_qr_code": "QR kód kép", "anti_clockwise": "Óramutató járásával ellentétes irány", "api_key": "API Kulcs", "api_key_description": "Ez csak most az egyszer jelenik meg. Az ablak bezárása előtt feltétlenül másold.", @@ -481,6 +485,7 @@ "comments_are_disabled": "A megjegyzések le vannak tiltva", "confirm": "Jóváhagy", "confirm_admin_password": "Admin Jelszó Újból", + "confirm_delete_face": "Biztos, hogy törölni szeretnéd a(z) {name} arcát az elemről?", "confirm_delete_shared_link": "Biztosan törölni szeretnéd ezt a megosztott linket?", "confirm_keep_this_delete_others": "Minden más elem a készletben törlésre kerül, kivéve ezt az elemet. Biztosan folytatni szeretnéd?", "confirm_password": "Jelszó megerősítése", @@ -533,6 +538,7 @@ "delete_album": "Album törlése", "delete_api_key_prompt": "Biztosan törölni szeretnéd ezt az API kulcsot?", "delete_duplicates_confirmation": "Biztosan véglegesen törölni szeretnéd ezeket a duplikátumokat?", + "delete_face": "Arc törlése", "delete_key": "Kulcs törlése", "delete_library": "Képtár Törlése", "delete_link": "Link törlése", @@ -600,6 +606,7 @@ "enabled": "Engedélyezve", "end_date": "Vég dátum", "error": "Hiba", + "error_delete_face": "Hiba az arc törlése során", "error_loading_image": "Hiba a kép betöltése közben", "error_title": "Hiba - valami félresikerült", "errors": { @@ -802,6 +809,7 @@ "include_shared_albums": "Megosztott albumokkal együtt", "include_shared_partner_assets": "Partner által megosztott elemekkel együtt", "individual_share": "Egymagában megosztott elem", + "individual_shares": "Egyéni megosztások", "info": "Infó", "interval": { "day_at_onepm": "Minden nap 13 órakor", @@ -883,6 +891,7 @@ "month": "Hónap", "more": "Továbbiak", "moved_to_trash": "Áthelyezve a lomtárba", + "mute_memories": "Emlékek elnémítása", "my_albums": "Saját albumaim", "name": "Név", "name_or_nickname": "Név vagy becenév", @@ -987,6 +996,7 @@ "pick_a_location": "Hely választása", "place": "Hely", "places": "Helyek", + "places_count": "{count, plural, one {{count, number} Helyszín} other {{count, number} Helyszín}}", "play": "Lejátszás", "play_memories": "Emlékek lejátszása", "play_motion_photo": "Mozgókép lejátszása", @@ -1074,6 +1084,8 @@ "removed_from_archive": "Archívumból eltávolítva", "removed_from_favorites": "Kedvencekből eltávolítva", "removed_from_favorites_count": "A kedvencekből {count, plural, other {# elem}} eltávolítva", + "removed_memory": "Eltávolított emlék", + "removed_photo_from_memory": "Fotó törölve az emlékből", "removed_tagged_assets": "Címke eltávolítva {count, plural, one {# elemről} other {# elemről}}", "rename": "Átnevezés", "repair": "Javítás", @@ -1082,6 +1094,7 @@ "repository": "Tároló", "require_password": "Jelszó megadása szükséges", "require_user_to_change_password_on_first_login": "A felhasználónak kötelező megváltoztatnia a jelszavát az első bejelentkezéskor", + "rescan": "Újraszkennelés", "reset": "Visszaállítás", "reset_password": "Jelszó visszaállítása", "reset_people_visibility": "Személyek láthatóságának visszaállítása", @@ -1125,6 +1138,7 @@ "search_options": "Keresési lehetőségek", "search_people": "Személyek keresése", "search_places": "Helyek keresése", + "search_rating": "Keresés értékelés szerint...", "search_settings": "Keresési beállítások", "search_state": "Megye/Állam keresése...", "search_tags": "Címkék keresése...", @@ -1171,6 +1185,7 @@ "shared_from_partner": "{partner} fényképei", "shared_link_options": "Megosztott link beállításai", "shared_links": "Megosztott linkek", + "shared_links_description": "Fényképek és videók megosztása linkkel", "shared_photos_and_videos_count": "{assetCount, plural, other {# megosztott kép és videó.}}", "shared_with_partner": "Megosztva {partner} partnereddel", "sharing": "Megosztás", @@ -1247,6 +1262,7 @@ "tag_created": "Létrehozott címke: {tag}", "tag_feature_description": "Fényképek és videók böngészése a címkék témája szerint csoportosítva", "tag_not_found_question": "Nem találod a címkét? Hozz létre egy új címkét", + "tag_people": "Emberek címkézése", "tag_updated": "Frissített címke: {tag}", "tagged_assets": "{count, plural, one {# elem} other {# elem}} felcímkézve", "tags": "Címkék", @@ -1287,6 +1303,7 @@ "unlink_motion_video": "Mozgókép leválasztása", "unlink_oauth": "OAuth leválasztása", "unlinked_oauth_account": "Leválasztott OAuth fiók", + "unmute_memories": "Emlékek mutatása", "unnamed_album": "Névtelen Album", "unnamed_album_delete_confirmation": "Biztosan törölni szeretnéd ezt az albumot?", "unnamed_share": "Névtelen Megosztás", @@ -1340,6 +1357,7 @@ "view_all": "Összes Megtekintése", "view_all_users": "Minden Felhasználó Megtekintése", "view_in_timeline": "Megtekintés az idővonalon", + "view_link": "Link megtekintése", "view_links": "Linkek megtekintése", "view_name": "Megtekintés", "view_next_asset": "Következő elem megtekintése", @@ -1356,4 +1374,4 @@ "yes": "Igen", "you_dont_have_any_shared_links": "Nincsenek megosztott linkjeid", "zoom_image": "Kép Nagyítása" -} +} \ No newline at end of file diff --git a/i18n/id.json b/i18n/id.json index 79c9deb178..92f59363aa 100644 --- a/i18n/id.json +++ b/i18n/id.json @@ -41,6 +41,7 @@ "backup_settings": "Pengaturan Pencadangan", "backup_settings_description": "Kelola pengaturan pencadangan basis data", "check_all": "Periksa Semua", + "cleanup": "Pembersihan", "cleared_jobs": "Tugas terselesaikan untuk: {job}", "config_set_by_file": "Konfigurasi saat ini ditetapkan oleh berkas konfigurasi", "confirm_delete_library": "Apakah Anda yakin ingin menghapus pustaka {library}?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Aktifkan pemindaian pustaka berkala", "library_settings": "Pustaka Eksternal", "library_settings_description": "Kelola pengaturan pustaka eksternal", - "library_tasks_description": "Lakukan tugas pustaka", + "library_tasks_description": "Pindai pustaka eksternal untuk aset baru dan/atau berubah", "library_watching_enable_description": "Pantau perubahan berkas dalam pustaka eksternal", "library_watching_settings": "Pemantauan pustaka (UJI COBA)", "library_watching_settings_description": "Pantau berkas yang telah diubah secara otomatis", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Cari gambar secara semantik menggunakan penyematan CLIP", "machine_learning_smart_search_enabled": "Aktifkan pencarian pintar", "machine_learning_smart_search_enabled_description": "Jika dinonaktifkan, gambar tidak akan dienkode untuk pencarian pintar.", - "machine_learning_url_description": "URL server pembelajaran mesin. Jika lebih dari satu URL disediakan, setiap server akan dicoba satu per satu sampai salah satu berhasil merespons, dari urutan pertama sampai terakhir.", + "machine_learning_url_description": "URL server pembelajaran mesin. Jika lebih dari satu URL disediakan, setiap server akan dicoba satu per satu sampai salah satu berhasil merespons, dari urutan pertama sampai terakhir. Server yang tidak merespons akan diabaikan sementara sampai kembali daring.", "manage_concurrency": "Kelola Konkurensi", "manage_log_settings": "Kelola pengaturan log", "map_dark_style": "Gaya gelap", @@ -147,6 +148,8 @@ "map_settings": "Peta", "map_settings_description": "Kelola pengaturan peta", "map_style_description": "URL ke tema peta style.json", + "memory_cleanup_job": "Pembersihan memori", + "memory_generate_job": "Pembuatan memori", "metadata_extraction_job": "Ekstrak metadata", "metadata_extraction_job_description": "Ekstrak informasi metadata dari setiap aset, seperti GPS, wajah dan resolusi", "metadata_faces_import_setting": "Aktifkan impor wajah", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "Mengaktifkan verifikasi hash, jangan mengaktifkan ini kecuali Anda sudah tahu kekurangannya", "storage_template_migration": "Migrasi templat penyimpanan", "storage_template_migration_description": "Tetapkan {template} saat ini pada aset yang sebelumnya diunggah", - "storage_template_migration_info": "Perubahan templat hanya akan diterapkan pada aset baru. Untuk menerapkan templat pada setiap aset yang sebelumnya telah diunggah, jalankan {job}.", + "storage_template_migration_info": "Templat penyimpanan akan mengubah semua ekstensi ke huruf kecil. Perubahan templat hanya akan diterapkan pada aset baru. Untuk menerapkan templat pada setiap aset yang sebelumnya telah diunggah, jalankan {job}.", "storage_template_migration_job": "Tugas Migrasi Templat Ruang Penyimpanan", "storage_template_more_details": "Untuk detail lebih lanjut tentang fitur ini, pergi ke Templat Penyimpanan dan kekurangannya", "storage_template_onboarding_description": "Ketika diaktifkan, fitur ini akan mengelola berkas secara otomatis berdasarkan templat pengguna. Karena masalah stabilitas, fitur ini telah dimatikan secara bawaan. Untuk informasi lebih lanjut, silakan lihat dokumentasi.", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "Bingkai B maksimum", "transcoding_max_b_frames_description": "Nilai yang lebih tinggi meningkatkan efisiensi kompresi, tetapi membuat pengodean lebih lambat. Mungkin tidak kompatibel dengan akselerasi perangkat keras pada perangkat lawas. 0 menonaktifkan bingkai B, sedangkan -1 mengatur nilai ini secara otomatis.", "transcoding_max_bitrate": "Kecepatan bit maksimum", - "transcoding_max_bitrate_description": "Menetapkan kecepatan bit maksimum dapat membuat ukuran berkas lebih dapat diprediksi dengan kekurangan minor pada kualitas. Pada 720p, nilai umum adalah 2600k untuk VP9 atau HEVC, atau 4500k untuk H.264. Dinonaktifkan jika ditetapkan ke 0.", + "transcoding_max_bitrate_description": "Menetapkan kecepatan bit maksimum dapat membuat ukuran berkas lebih dapat diprediksi dengan kekurangan minor pada kualitas. Pada 720p, nilai umum adalah 2600 kbit/s untuk VP9 atau HEVC, atau 4500 kbit/s untuk H.264. Dinonaktifkan jika ditetapkan ke 0.", "transcoding_max_keyframe_interval": "Interval bingkai kunci maksimum", "transcoding_max_keyframe_interval_description": "Menetapkan jarak bingkai maksimum antara bingkai kunci. Nilai yang lebih rendah membuat efisiensi kompresi lebih buruk, tetapi meningkatkan waktu pencarian dan dapat meningkatkan kualitas dalam adegan dengan gerakan cepat. 0 menetapkan nilai ini secara otomatis.", "transcoding_optimal_description": "Video lebih tinggi dari resolusi sasaran atau tidak dalam format yang diterima", @@ -391,6 +394,7 @@ "allow_edits": "Perbolehkan penyuntingan", "allow_public_user_to_download": "Perbolehkan pengguna publik untuk mengunduh", "allow_public_user_to_upload": "Perbolehkan pengguna publik untuk mengunggah", + "alt_text_qr_code": "Gambar kode QR", "anti_clockwise": "Berlawanan arah jarum jam", "api_key": "Kunci API", "api_key_description": "Nilai ini hanya akan ditampilkan sekali. Pastikan untuk menyalin sebelum menutup jendela ini.", @@ -481,6 +485,7 @@ "comments_are_disabled": "Komentar dinonaktifkan", "confirm": "Konfirmasi", "confirm_admin_password": "Konfirmasi Kata Sandi Admin", + "confirm_delete_face": "Apakah Anda yakin ingin menghapus wajah {name} dari aset?", "confirm_delete_shared_link": "Apakah Anda yakin ingin menghapus tautan terbagi ini?", "confirm_keep_this_delete_others": "Semua aset lain di dalam stack akan dihapus kecuali aset ini. Anda yakin untuk melanjutkan?", "confirm_password": "Konfirmasi kata sandi", @@ -533,6 +538,7 @@ "delete_album": "Hapus album", "delete_api_key_prompt": "Apakah Anda yakin ingin menghapus kunci API ini?", "delete_duplicates_confirmation": "Apakah Anda yakin ingin menghapus duplikat ini secara permanen?", + "delete_face": "Hapus wajah", "delete_key": "Hapus kunci", "delete_library": "Hapus Pustaka", "delete_link": "Hapus tautan", @@ -600,6 +606,7 @@ "enabled": "Diaktifkan", "end_date": "Tanggal akhir", "error": "Eror", + "error_delete_face": "Terjadi kesalahan menghapus wajah dari aset", "error_loading_image": "Terjadi eror memuat gambar", "error_title": "Eror - Ada yang salah", "errors": { @@ -884,6 +891,7 @@ "month": "Bulan", "more": "Lainnya", "moved_to_trash": "Dipindahkan ke sampah", + "mute_memories": "Nonaktifkan Kenangan", "my_albums": "Album saya", "name": "Nama", "name_or_nickname": "Nama atau nama panggilan", @@ -1076,6 +1084,8 @@ "removed_from_archive": "Dihapus dari arsip", "removed_from_favorites": "Dihapus dari favorit", "removed_from_favorites_count": "{count, plural, other {Menghapus #}} dari favorit", + "removed_memory": "Memori dihapus", + "removed_photo_from_memory": "Foto dihapus dari memori", "removed_tagged_assets": "Hapus tag dari {count, plural, one {# aset} other {# aset}}", "rename": "Ubah nama", "repair": "Perbaiki", @@ -1084,6 +1094,7 @@ "repository": "Repositori", "require_password": "Memerlukan kata sandi", "require_user_to_change_password_on_first_login": "Memerlukan pengguna untuk mengubah kata sandi pada log masuk pertama", + "rescan": "Pindai ulang", "reset": "Atur ulang", "reset_password": "Atur ulang kata sandi", "reset_people_visibility": "Atur ulang keterlihatan orang", @@ -1127,6 +1138,7 @@ "search_options": "Pilihan pencarian", "search_people": "Cari orang", "search_places": "Cari tempat", + "search_rating": "Cari berdasarkan penilaian...", "search_settings": "Pengaturan pencarian", "search_state": "Cari negara bagian...", "search_tags": "Cari tag...", @@ -1250,6 +1262,7 @@ "tag_created": "Tag yang di buat: {tag}", "tag_feature_description": "Menjelajahi foto dan video yang dikelompokkan berdasarkan topik tag logis", "tag_not_found_question": "Tidak dapat menemukan tag? Buat tag baru.", + "tag_people": "Tandai Orang", "tag_updated": "Tag yang diperbarui: {tag}", "tagged_assets": "Ditandai {count, plural, one {# aset} other {# aset}}", "tags": "Tag", @@ -1290,6 +1303,7 @@ "unlink_motion_video": "Membatalkan tautan video gerak", "unlink_oauth": "Putuskan OAuth", "unlinked_oauth_account": "Akun OAuth terputus", + "unmute_memories": "Aktifkan Kenangan", "unnamed_album": "Album Tanpa Nama", "unnamed_album_delete_confirmation": "Apakah kamu yakin akan menghapus album ini?", "unnamed_share": "Pembagian Tanpa Nama", @@ -1343,6 +1357,7 @@ "view_all": "Tampilkan Semua", "view_all_users": "Tampilkan semua pengguna", "view_in_timeline": "Lihat di timeline", + "view_link": "Tampilkan tautan", "view_links": "Tampilkan tautan", "view_name": "Tampilkan", "view_next_asset": "Tampilkan aset berikutnya", @@ -1359,4 +1374,4 @@ "yes": "Ya", "you_dont_have_any_shared_links": "Anda tidak memiliki tautan terbagi", "zoom_image": "Perbesar Gambar" -} +} \ No newline at end of file diff --git a/i18n/it.json b/i18n/it.json index a00980bf4c..358a96d28a 100644 --- a/i18n/it.json +++ b/i18n/it.json @@ -41,6 +41,7 @@ "backup_settings": "Impostazioni di backup", "backup_settings_description": "Gestisci le impostazioni dei backup", "check_all": "Controlla Tutto", + "cleanup": "Pulisci", "cleared_jobs": "Cancellati i processi per: {job}", "config_set_by_file": "La configurazione è attualmente impostata da un file di configurazione", "confirm_delete_library": "Sei sicuro di voler cancellare la libreria {library}?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Attiva la scansione periodica della libreria", "library_settings": "Libreria Esterna", "library_settings_description": "Gestisci le impostazioni della libreria esterna", - "library_tasks_description": "Esegui processi della libreria", + "library_tasks_description": "Scansiona le librerie esterne per i nuovi aggiornamenti", "library_watching_enable_description": "Osserva le librerie esterne per cambiamenti", "library_watching_settings": "Osserva librerie (SPERIMENTALE)", "library_watching_settings_description": "Osserva automaticamente i cambiamenti dei file", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Cerca immagini semanticamente utilizzato gli embedding CLIP", "machine_learning_smart_search_enabled": "Attiva ricerca intelligente", "machine_learning_smart_search_enabled_description": "Se disabilitato le immagini non saranno codificate per la ricerca intelligente.", - "machine_learning_url_description": "URL del server machine learning. Se sono stati forniti più di un URL, verrà testato un server alla volta finché uno non risponderà, in ordine dal primo all'ultimo.", + "machine_learning_url_description": "URL del server machine learning. Se sono stati forniti più di un URL, verrà testato un server alla volta finché uno non risponderà, in ordine dal primo all'ultimo. I server che non rispondono saranno temporaneamente ignorati finché non torneranno online.", "manage_concurrency": "Gestisci Concorrenza", "manage_log_settings": "Gestisci le impostazioni dei log", "map_dark_style": "Tema scuro", @@ -147,6 +148,8 @@ "map_settings": "Impostazioni Mappa e Posizione", "map_settings_description": "Gestisci impostazioni mappa", "map_style_description": "URL per un tema della mappa style.json", + "memory_cleanup_job": "pulizia memoria", + "memory_generate_job": "Generazione della memoria", "metadata_extraction_job": "Estrazione Metadata", "metadata_extraction_job_description": "Estrai informazioni dai metadati di ciascun asset, ad esempio coordinate GPS, volti e risoluzione", "metadata_faces_import_setting": "Abilita l'importazione dei volti", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "B-frames Massimi", "transcoding_max_b_frames_description": "Valori più alti migliorano l'efficienza di compressione, ma rallentano l'encoding. Potrebbero non essere compatibili con l'accelerazione hardware su dispositivi più vecchi. 0 disabilita i B-frames, mentre -1 imposta questo valore automaticamente.", "transcoding_max_bitrate": "Bitrate massimo", - "transcoding_max_bitrate_description": "Impostare un bitrate massimo può rendere le dimensioni dei file più prevedibili a un costo minore per la qualità. A 720p, i valori tipici sono 2600k per VP9 o HEVC, o 4500k per H.264. Disabilitato se impostato su 0.", + "transcoding_max_bitrate_description": "Impostare un bitrate massimo può rendere le dimensioni dei file più prevedibili a un costo minore per la qualità. A 720p, i valori tipici sono 2600 kbit/s per VP9 o HEVC, o 4500 kbit/s per H.264. Disabilitato se impostato su 0.", "transcoding_max_keyframe_interval": "Intervallo massimo dei keyframe", "transcoding_max_keyframe_interval_description": "Imposta la distanza massima tra i keyframe. Valori più bassi peggiorano l'efficienza di compressione, però migliorano i tempi di ricerca e possono migliorare la qualità nelle scene con movimenti rapidi. 0 imposta questo valore automaticamente.", "transcoding_optimal_description": "Video con risoluzione più alta rispetto alla risoluzione desiderata o in formato non accettato", @@ -391,6 +394,7 @@ "allow_edits": "Permetti Modifiche", "allow_public_user_to_download": "Permetti agli utenti pubblici di scaricare", "allow_public_user_to_upload": "Permetti agli utenti pubblici di caricare", + "alt_text_qr_code": "Immagine QR", "anti_clockwise": "Senso anti-orario", "api_key": "Chiave API", "api_key_description": "Il valore verrà mostrato solo una volta. Assicurati di copiarlo prima di chiudere la finestra.", @@ -406,7 +410,7 @@ "are_these_the_same_person": "Sono la stessa persona?", "are_you_sure_to_do_this": "Sei sicuro di voler procedere?", "asset_added_to_album": "Aggiunto all'album", - "asset_adding_to_album": "In aggiunta all'album...", + "asset_adding_to_album": "Aggiungendo all'album…", "asset_description_updated": "La descrizione del media è stata aggiornata", "asset_filename_is_offline": "Il media {filename} è offline", "asset_has_unassigned_faces": "Il media ha dei volti non categorizzati", @@ -480,11 +484,12 @@ "comments_and_likes": "Commenti & mi piace", "comments_are_disabled": "I commenti sono disabilitati", "confirm": "Conferma", - "confirm_admin_password": "Conferma password amministratore", + "confirm_admin_password": "Conferma password dell'amministratore", + "confirm_delete_face": "Sei sicuro di voler cancellare il volto di {name} dall'asset?", "confirm_delete_shared_link": "Sei sicuro di voler eliminare questo link condiviso?", - "confirm_keep_this_delete_others": "Tutti gli altri asset nello stack saranno eliminati, eccetto questo asset. Vuoi continuare?", + "confirm_keep_this_delete_others": "Tutti gli altri asset nello stack saranno eliminati, eccetto questo asset. Sei sicuro di voler continuare?", "confirm_password": "Conferma password", - "contain": "Adatta", + "contain": "Adatta alla finestra", "context": "Contesto", "continue": "Continua", "copied_image_to_clipboard": "Immagine copiata negli appunti.", @@ -497,8 +502,8 @@ "copy_password": "Copia password", "copy_to_clipboard": "Copia negli appunti", "country": "Nazione", - "cover": "Riempi", - "covers": "Miniature", + "cover": "Riempi la finestra", + "covers": "Copre", "create": "Crea", "create_album": "Crea album", "create_library": "Crea libreria", @@ -509,21 +514,21 @@ "create_new_person_hint": "Assegna gli asset selezionati a una nuova persona", "create_new_user": "Crea nuovo utente", "create_tag": "Crea tag", - "create_tag_description": "Crea un nuova tag. Per i tag annidati, si prega di inserire il percorso completo del tag tra cui slash in avanti.", + "create_tag_description": "Crea un nuovo tag. Per i tag annidati, si prega di inserire il percorso completo del tag tra cui barre oblique.", "create_user": "Crea utente", "created": "Creato", - "current_device": "Dispositivo corrente", + "current_device": "Dispositivo attuale", "custom_locale": "Localizzazione personalizzata", "custom_locale_description": "Formatta data e numeri in base alla lingua e al paese", "dark": "Scuro", "date_after": "Data dopo", - "date_and_time": "Data e tempo", + "date_and_time": "Data e ora", "date_before": "Data prima", "date_of_birth_saved": "Data di nascita salvata con successo", "date_range": "Intervallo di date", "day": "Giorno", - "deduplicate_all": "De-duplica Tutti", - "deduplication_criteria_1": "Dimensione immagine in byte", + "deduplicate_all": "Duplica Tutti", + "deduplication_criteria_1": "Dimensione immagine in bytes", "deduplication_criteria_2": "Numero di dati EXIF", "deduplication_info": "Informazioni di deduplicazione", "deduplication_info_description": "Per preselezionare automaticamente gli asset e rimuovere i duplicati in massa, verifichiamo:", @@ -533,6 +538,7 @@ "delete_album": "Elimina album", "delete_api_key_prompt": "Sei sicuro di voler eliminare questa chiave API?", "delete_duplicates_confirmation": "Sei sicuro di voler eliminare questi duplicati per sempre?", + "delete_face": "cancella faccia", "delete_key": "Elimina chiave", "delete_library": "Elimina libreria", "delete_link": "Elimina link", @@ -600,6 +606,7 @@ "enabled": "Abilitato", "end_date": "Data Fine", "error": "Errore", + "error_delete_face": "Errore nel cancellare la faccia dalla foto", "error_loading_image": "Errore nel caricamento dell'immagine", "error_title": "Errore - Qualcosa è andato storto", "errors": { @@ -769,7 +776,7 @@ "group_country": "Raggruppa per paese", "group_no": "Nessun raggruppamento", "group_owner": "Raggruppa in base al proprietario", - "group_places_by": "Raggruppa posti per", + "group_places_by": "Raggruppa posti per...", "group_year": "Raggruppa per anno", "has_quota": "Ha limite", "hi_user": "Ciao {name} ({email})", @@ -884,6 +891,7 @@ "month": "Mese", "more": "Di più", "moved_to_trash": "Spostato nel cestino", + "mute_memories": "Silenzia ricordi", "my_albums": "I miei album", "name": "Nome", "name_or_nickname": "Nome o soprannome", @@ -988,7 +996,7 @@ "pick_a_location": "Scegli una posizione", "place": "Posizione", "places": "Luoghi", - "places_count": "{count, plural, one {{count, number} Luogo} altro {{count, number} Luoghi}}", + "places_count": "{count, plural, one {{count, number} Luogo} other {{count, number} Places}}", "play": "Avvia", "play_memories": "Avvia ricordi", "play_motion_photo": "Avvia Foto in movimento", @@ -1076,6 +1084,8 @@ "removed_from_archive": "Rimosso dall'archivio", "removed_from_favorites": "Rimosso dai preferiti", "removed_from_favorites_count": "{count, plural, one {Rimosso } other {Rimossi #}} dai preferiti", + "removed_memory": "Memoria rimossa", + "removed_photo_from_memory": "Foto rimossa dalla memoria", "removed_tagged_assets": "Rimossa etichetta {count, plural, one {# dall'asset} other {# dagli asset}}", "rename": "Rinomina", "repair": "Ripara", @@ -1084,6 +1094,7 @@ "repository": "Repository", "require_password": "Richiedi password", "require_user_to_change_password_on_first_login": "Richiedi all'utente di cambiare password al primo accesso", + "rescan": "Scansiona nuovamente", "reset": "Ripristina", "reset_password": "Ripristina password", "reset_people_visibility": "Ripristina visibilità persone", @@ -1127,6 +1138,7 @@ "search_options": "Opzioni Ricerca", "search_people": "Cerca persone", "search_places": "Cerca luoghi", + "search_rating": "Cerca per valutazione...", "search_settings": "Cerca Impostazioni", "search_state": "Cerca stato...", "search_tags": "Cerca tag...", @@ -1250,6 +1262,7 @@ "tag_created": "Tag creata: {tag}", "tag_feature_description": "Navigazione foto e video raggruppati per argomenti tag logici", "tag_not_found_question": "Non riesci a trovare un tag? Creane uno nuovo.", + "tag_people": "Tagga persone", "tag_updated": "Tag {tag} aggiornata", "tagged_assets": "{count, plural, one {# asset etichettato} other {# asset etichettati}}", "tags": "Tag", @@ -1290,6 +1303,7 @@ "unlink_motion_video": "Scollega video in movimento", "unlink_oauth": "Scollega OAuth", "unlinked_oauth_account": "Scollega account OAuth", + "unmute_memories": "Disattiva l'audio dei ricordi", "unnamed_album": "Album senza nome", "unnamed_album_delete_confirmation": "Sei sicuro di voler eliminare questo album?", "unnamed_share": "Condivisione senza nome", @@ -1330,7 +1344,7 @@ "variables": "Variabili", "version": "Versione", "version_announcement_closing": "Il tuo amico, Alex", - "version_announcement_message": "Ehilà! È stata rilasciata una nuova versione di Immich. Leggi le note di rilascio e assicurati che i tuoi file docker-compose.yml/.env siano aggiornati per evitare problemi e incongruenze, soprattutto se utilizzi WatchTower o altri strumenti per aggiornare Immich in automatico.", + "version_announcement_message": "Ehilà! È stata rilasciata una nuova versione di Immich. Leggi le release notes e assicurati che i tuoi file di configurazione siano aggiornati per evitare problemi e incongruenze, soprattutto se utilizzi WatchTower o altri strumenti per aggiornare Immich in automatico.", "version_history": "Storico delle Versioni", "version_history_item": "Versione installata {version} il {date}", "video": "Video", @@ -1343,6 +1357,7 @@ "view_all": "Vedi tutto", "view_all_users": "Visualizza tutti gli utenti", "view_in_timeline": "Visualizza in timeline", + "view_link": "Visualizza link", "view_links": "Visualizza i link", "view_name": "Visualizza", "view_next_asset": "Visualizza risorsa successiva", @@ -1359,4 +1374,4 @@ "yes": "Si", "you_dont_have_any_shared_links": "Non è presente alcun link condiviso", "zoom_image": "Ingrandisci immagine" -} +} \ No newline at end of file diff --git a/i18n/ja.json b/i18n/ja.json index 98054f14ca..154e6be42e 100644 --- a/i18n/ja.json +++ b/i18n/ja.json @@ -256,7 +256,7 @@ "transcoding_max_b_frames": "最大Bフレーム", "transcoding_max_b_frames_description": "値を高くすると圧縮効率が向上しますが、エンコード速度が遅くなります。古いデバイスのハードウェアアクセラレーションでは対応していない場合があります。\"0\" はBフレームを無効にし、\"-1\" はこの値を自動的に設定します。", "transcoding_max_bitrate": "最大ビットレート", - "transcoding_max_bitrate_description": "最大ビットレートを設定すると、品質にわずかな影響を与えながらも、ファイルサイズを予測しやすくなります。720pの場合、一般的な値は VP9 や HEVC で \"2600k\"、H.264 で \"4500k\" です。\"0\" に設定すると無効になります。", + "transcoding_max_bitrate_description": "最大ビットレートを設定すると、品質にわずかな影響を与えながらも、ファイルサイズを予測しやすくなります。720pの場合、一般的な値は VP9 や HEVC で \"2600 kbit/s\"、H.264 で \"4500 kbit/s\" です。\"0\" に設定すると無効になります。", "transcoding_max_keyframe_interval": "最大キーフレーム間隔", "transcoding_max_keyframe_interval_description": "キーフレーム間の最大フレーム間隔を設定します。値を低くすると圧縮効率が悪化しますが、シーク時間が改善され、動きの速いシーンの品質が向上する場合があります。\"0\" に設定すると、この値が自動的に設定されます。", "transcoding_optimal_description": "設定解像度を超える動画、または容認されていない形式の動画", @@ -1257,4 +1257,4 @@ "yes": "はい", "you_dont_have_any_shared_links": "共有リンクはありません", "zoom_image": "画像を拡大" -} +} \ No newline at end of file diff --git a/i18n/ko.json b/i18n/ko.json index ef8227c3f2..29971e5e30 100644 --- a/i18n/ko.json +++ b/i18n/ko.json @@ -68,7 +68,7 @@ "image_prefer_embedded_preview": "포함된 미리 보기 선호", "image_prefer_embedded_preview_setting_description": "가능한 경우 이미지 처리 시 RAW 사진에 포함된 미리 보기를 사용합니다. 포함된 미리 보기는 카메라에서 생성된 것으로 카메라마다 품질이 다릅니다. 일부 이미지의 경우 더 정확한 색상이 표현될 수 있지만 반대로 더 많은 아티팩트가 있을 수도 있습니다.", "image_prefer_wide_gamut": "넓은 색 영역 선호", - "image_prefer_wide_gamut_setting_description": "섬네일 이미지에 Display P3을 사용합니다. 많은 색상을 표현할 수 있어 더 정확한 표현이 가능하지만, 오래된 브라우저를 사용하는 경우 이미지가 다르게 보일 수 있습니다. 색상 왜곡을 방지하기 위해 sRGB 이미지는 이 설정이 적용되지 않습니다.", + "image_prefer_wide_gamut_setting_description": "섬네일 이미지에 Display P3를 사용합니다. 많은 색상을 표현할 수 있어 더 정확한 표현이 가능하지만, 오래된 브라우저를 사용하는 경우 이미지가 다르게 보일 수 있습니다. 색상 왜곡을 방지하기 위해 sRGB 이미지는 이 설정이 적용되지 않습니다.", "image_preview_description": "메타데이터를 제거한 중간 크기의 이미지, 단일 항목을 보는 경우 및 기계 학습에 사용됨", "image_preview_quality_description": "1부터 100 사이의 미리보기 품질. 값이 높을수록 좋지만 파일 크기가 커져 앱의 반응성이 떨어질 수 있으며, 값이 낮으면 기계 학습의 품질이 떨어질 수 있습니다.", "image_preview_title": "미리보기 설정", @@ -131,7 +131,7 @@ "machine_learning_smart_search_description": "CLIP 임베딩으로 자연어를 사용하여 이미지 검색", "machine_learning_smart_search_enabled": "스마트 검색 활성화", "machine_learning_smart_search_enabled_description": "비활성화된 경우 스마트 검색을 위한 이미지 처리를 진행하지 않습니다.", - "machine_learning_url_description": "기계 학습 서버의 URL을 입럭합니다. 여러 개의 URL이 입력된 경우 모든 서버에 응답을 보낸 뒤 응답에 성공한 서버가 사용됩니다.", + "machine_learning_url_description": "기계 학습 서버의 URL을 입력합니다. URL이 여러 개인 경우 첫 번째 서버부터 마지막까지 성공적으로 응답할 때까지 한 번에 하나씩 순서대로 요청을 시도합니다. 응답하지 않는 서버는 다시 사용 가능할 때까지 일시적으로 제외됩니다.", "manage_concurrency": "동시성 관리", "manage_log_settings": "로그 설정 관리", "map_dark_style": "다크 스타일", @@ -291,7 +291,7 @@ "transcoding_max_b_frames": "최대 B 프레임", "transcoding_max_b_frames_description": "값이 높으면 압축 효율이 향상되지만 인코딩 속도가 저하됩니다. 오래된 기기의 하드웨어 가속과 호환되지 않을 수 있습니다. 0을 입력한 경우 B 프레임을 비활성화하며, -1을 입력한 경우 자동으로 설정합니다.", "transcoding_max_bitrate": "최대 비트레이트", - "transcoding_max_bitrate_description": "최대 비트레이트를 지정하면 품질이 일부 저하되지만 파일 크기가 예측 가능한 수준으로 일정하게 유지됩니다. 일반적으로 720p 기준 VP9 및 HEVC는 2600k, H.264는 4500k를 사용합니다. 0을 입력한 경우 비활성화됩니다.", + "transcoding_max_bitrate_description": "최대 비트레이트를 지정하면 품질이 일부 저하되지만 파일 크기가 예측 가능한 수준으로 일정하게 유지됩니다. 일반적으로 720p 기준 VP9 및 HEVC는 2600 kbit/s, H.264는 4500 kbit/s를 사용합니다. 0을 입력한 경우 비활성화됩니다.", "transcoding_max_keyframe_interval": "최대 키프레임 간격", "transcoding_max_keyframe_interval_description": "키프레임 사이 최대 프레임 거리를 설정합니다. 값이 낮으면 압축 효율이 저하되지만 검색 시간이 개선되고 빠른 움직임이 있는 장면에서 품질이 향상됩니다. 0을 입력한 경우 자동으로 설정합니다.", "transcoding_optimal_description": "목표 해상도보다 높은 동영상 또는 허용되지 않는 형식의 동영상", @@ -1323,4 +1323,4 @@ "yes": "네", "you_dont_have_any_shared_links": "생성한 공유 링크가 없습니다.", "zoom_image": "이미지 확대" -} +} \ No newline at end of file diff --git a/i18n/lt.json b/i18n/lt.json index 5e478a37a9..738dc7bc7f 100644 --- a/i18n/lt.json +++ b/i18n/lt.json @@ -20,7 +20,7 @@ "add_partner": "Pridėti partnerį", "add_path": "Pridėti kelią", "add_photos": "Pridėti nuotraukų", - "add_to": "Pridėti į ...", + "add_to": "Pridėti į…", "add_to_album": "Pridėti į albumą", "add_to_shared_album": "Pridėti į bendrinamą albumą", "add_url": "Pridėti URL", @@ -50,6 +50,7 @@ "create_job": "Sukurti darbą", "cron_expression": "Cron išraiška", "cron_expression_description": "Nustatyti skanavimo intervalą naudojant cron formatą. Norėdami gauti daugiau informacijos žiūrėkite Crontab Guru", + "cron_expression_presets": "Išankstiniai Cron nustatymai", "disable_login": "Išjungti prisijungimą", "duplicate_detection_job_description": "Vykdykite mašininį mokymąsi panašių vaizdų aptikimui. Priklauso nuo išmaniosios paieškos", "exclusion_pattern_description": "Išimčių šablonai leidžia nepaisyti failų ir aplankų skenuojant jūsų biblioteką. Tai yra naudinga, jei turite aplankų su failais, kurių nenorite importuoti, pavyzdžiui, RAW failai.", @@ -142,6 +143,8 @@ "map_settings": "Žemėlapis", "map_settings_description": "Tvarkyti žemėlapio parametrus", "map_style_description": "URL į style.json žemėlapio temą", + "memory_cleanup_job": "Atsiminimų valymas", + "memory_generate_job": "Atsiminimų generavimas", "metadata_extraction_job": "Metaduomenų nuskaitymas", "metadata_extraction_job_description": "Kiekvieno bibliotekos elemento metaduomenų nuskaitymas, tokių kaip GPS koordinatės, veidai ar rezoliucija", "metadata_faces_import_setting": "Įjungti veidų importą", @@ -904,6 +907,8 @@ "removed_from_archive": "Pašalinta iš archyvo", "removed_from_favorites": "Pašalinta iš mėgstamiausių", "removed_from_favorites_count": "{count, plural, one {# pašalintas} few {# pašalinti} other {# pašalinta}} iš mėgstamiausių", + "removed_memory": "Atsiminimas pašalintas", + "removed_photo_from_memory": "Nuotrauka ištrinta iš atsiminimų", "removed_tagged_assets": "Žyma pašalinta iš {count, plural, one {# elemento} other {# elementų}}", "rename": "Pervadinti", "repair": "Pataisyti", diff --git a/i18n/lv.json b/i18n/lv.json index 38b0bf6426..d962ae1bd1 100644 --- a/i18n/lv.json +++ b/i18n/lv.json @@ -20,7 +20,7 @@ "add_partner": "Pievienot partneri", "add_path": "Pievienot ceļu", "add_photos": "Pievienot fotoattēlus", - "add_to": "Pievienot ..", + "add_to": "Pievienot…", "add_to_album": "Pievienot albumam", "add_to_shared_album": "Pievienot koplietotam albumam", "add_url": "Pievienot URL", @@ -49,7 +49,7 @@ "external_library_management": "Ārējo bibliotēku pārvaldība", "face_detection": "Seju noteikšana", "image_format": "Formāts", - "image_format_description": "", + "image_format_description": "WebP veido mazākus failus nekā JPEG, taču to kodēšana ir lēnāka.", "image_prefer_embedded_preview": "", "image_prefer_embedded_preview_setting_description": "", "image_prefer_wide_gamut": "", @@ -299,12 +299,13 @@ "asset_offline": "", "asset_uploading": "Augšupielādē...", "assets": "aktīvi", - "authorized_devices": "", + "authorized_devices": "Autorizētās ierīces", "back": "Atpakaļ", "backward": "", "birthdate_saved": "Dzimšanas datums veiksmīgi saglabāts", "birthdate_set_description": "Dzimšanas datums tiek izmantots, lai aprēķinātu šīs personas vecumu fotogrāfijas uzņemšanas brīdī.", "blurred_background": "", + "bugs_and_feature_requests": "Kļūdas un funkciju pieprasījumi", "camera": "", "camera_brand": "", "camera_model": "", @@ -326,12 +327,13 @@ "clear": "Notīrīt", "clear_all": "Notīrīt visu", "clear_message": "", - "clear_value": "", + "clear_value": "Notīrīt vērtību", + "clockwise": "Pulksteņrādītāja virzienā", "close": "Aizvērt", "collapse": "Sakļaut", "collapse_all": "Sakļaut visu", "color": "Krāsa", - "color_theme": "", + "color_theme": "Krāsu tēma", "comment_deleted": "Komentārs dzēsts", "comment_options": "", "comments_are_disabled": "", diff --git a/i18n/mr.json b/i18n/mr.json index 0967ef424b..ec05d6c702 100644 --- a/i18n/mr.json +++ b/i18n/mr.json @@ -1 +1,62 @@ -{} +{ + "about": "विषयी", + "account": "खाते", + "account_settings": "खाते व्यवस्था", + "acknowledge": "मान्यता", + "action": "कृती", + "actions": "कृत्ये", + "active": "सक्रिय", + "activity": "गतिविधि", + "activity_changed": "गतिविधि {enabled, select, true {enabled} other {disabled}}", + "add": "जोडा", + "add_a_description": "वर्णन करा", + "add_a_location": "एक स्थळ टाका", + "add_a_name": "नाव टाका", + "add_a_title": "शीर्षक टाका", + "add_exclusion_pattern": "अपवाद नमुना जोडा", + "add_import_path": "आयात मार्ग टाका", + "add_location": "स्थळ टाका", + "add_more_users": "अधिक वापरकर्ते जोडा", + "add_partner": "भागीदार जोडा", + "add_path": "मार्ग टाका", + "add_photos": "छायाचित्रे जोडा", + "add_to": "त्या मध्ये जोडा…", + "add_to_album": "संग्रहात टाका", + "add_to_shared_album": "सामायिक संग्रहात टाका", + "add_url": "URL जोडा", + "added_to_archive": "संग्रहालयात जोडले", + "added_to_favorites": "आवडत्यात टाकले", + "added_to_favorites_count": "आवडत्यात {count, number} टाकले", + "admin": { + "add_exclusion_pattern_description": "अपवाद अनुकूलन जोडा. ** आणि ? या उपयोगात ग्लोबिंग समर्थित आहे. कोणत्याही \"Raw\" नावाच्या निर्देशिकेमधील सर्व खतावण्या दुर्लक्षीत करण्यासाठी \"/Raw/\" वापरा. \".tif\" या सामान्य पथावर समाप्त असलेल्या सर्व खतावण्या दुर्लक्षीत करण्यासाठी \"**/.tif\" वापरा. विशिष्ट पथ दुर्लक्ष करण्यासाठी \"/path/to/ignore/**\" वापरा.", + "asset_offline_description": "ही बाह्य संग्रहालय संसाधने डिस्कवर नाहीत आणि ट्रॅशमध्ये विस्थापित केली गेली आहेत. जर फाइल संग्रहालयामध्ये विस्थापित केली गेली आहे, तर नवीन संगत संसाधन किंव्हा रोजीनिशी मध्ये तपासा. हा संसाधन वापर करण्यासाठी कृपया निम्नलिखित खतावणी पथाला इम्मीच द्वारा वापरू शकतो याची तपासणी करा आणि तो संग्रहालय चाळा.", + "authentication_settings": "प्रमाणीकरण साधक", + "authentication_settings_description": "परवलीचा शब्द, OAuth आणि अन्य प्रमाणीकरण प्रबंधन करा", + "authentication_settings_disable_all": "तुम्हाला खात्री आहे की तुम्ही सर्व प्रवेश पद्धती बंद करू इच्छिता? प्रवेश पूर्णपणे बंद होइल!.", + "authentication_settings_reenable": "परत चालू करण्यासाठी Server Command वापरा.", + "background_task_job": "पृष्ठभूमि कार्य", + "backup_database": "माहिती संचयाची सुरक्षित प्रत करा", + "backup_database_enable_description": "माहिती संचयाच्या प्रतिलिपी चालू करा", + "backup_keep_last_amount": "पूर्वीच्या किती प्रतिलिपी ठेवायच्या", + "backup_settings": "प्रतिलिपी व्यवस्था", + "backup_settings_description": "माहिती संचय प्रतिलिपी व्यवस्थापन", + "check_all": "सर्व तपासा", + "cleared_jobs": "{job}: च्या कार्यवाह्या काढल्या", + "config_set_by_file": "संरचना सध्या संरचना खतावणीद्वारे निश्चित केली आहे", + "confirm_delete_library": "तुम्हाला नक्की हे {library} संग्रहालय हटवायचे आहे का?", + "confirm_delete_library_assets": "तुम्हाला नक्की हे संग्रहालय हटवायचे आहे का? इम्मीच मधून {count, plural, one {# contained asset} other {all # contained assets}} काढले जातील, आणि पूर्ववत करता येणार नाहीत. छायाचित्रे डिस्क वर राहतील.", + "confirm_email_below": "पुष्टी करण्या साठी, खाली \"{email}\" टंकलिखित करा", + "confirm_reprocess_all_faces": "तुम्हाला खात्री आहे का की तुम्हाला सर्व चेहऱ्यांवर पुन्हा प्रक्रिया करायची आहे? यामुळे नाव दिलेले लोकही साफ होतील.", + "confirm_user_password_reset": "तुम्हाला नक्की {user} चा परवलीचा शब्द बदलायचा आहे का?", + "create_job": "कार्य बनवा", + "cron_expression": "वेळापत्रक सूत्र", + "cron_expression_description": "चाळन्याचे वेळापत्रक क्रॉन पद्धती ने करा. अधिक माहिती साठी पहा: क्रॉन गुरु", + "cron_expression_presets": "पूर्वनिर्धारित वेळापत्रक सूत्रे", + "disable_login": "प्रवेशाधिकर वर्ज्य करा", + "duplicate_detection_job_description": "सारख्या छायाचित्रांचा शोध घेण्यासाठी यांत्रिकी प्रशिक्षण द्या. ही कार्यक्षमता चतुर शोधप्रणालीवर अवलंबून आहे", + "exclusion_pattern_description": "आपले संग्रहालय चाळताना अपवाद नमुने आपल्याला खतावण्या आणि र्निर्देशिकेला दुर्लक्षीत करू देतात. आपल्याकडे कच्च्या खतावण्या सारख्या आयात करू इच्छित नसलेल्या असंपादित (RAW) खतावण्या असलेल्या निर्देशिका असल्यास हे उपयुक्त आहे.", + "external_library_created_at": "बाह्य संग्रहालय ({date} रोजी बनवले गेले)", + "external_library_management": "बाह्य संग्रहालय व्यवस्थापन", + "face_detection": "मुख संशोधन" + } +} diff --git a/i18n/ms.json b/i18n/ms.json index 9916ca62a0..7da863750d 100644 --- a/i18n/ms.json +++ b/i18n/ms.json @@ -299,7 +299,7 @@ "transcoding_max_b_frames": "Bingkai-B maksimum", "transcoding_max_b_frames_description": "Nilai yang lebih tinggi meningkatkan kecekapan mampatan, tetapi memperlahankan pengekodan. Mungkin tidak serasi dengan pecutan perkakasan pada peranti lama. 0 melumpuhkan bingkai B, manakala -1 menetapkan nilai ini secara automatik.", "transcoding_max_bitrate": "Kadar bit maksimum", - "transcoding_max_bitrate_description": "Menetapkan kadar bit maksima boleh menjadikan saiz fail lebih boleh diramal dengan kekurangan yang kecil kepada kualiti. Pada 720p, nilai biasa ialah 2600k untuk VP9 atau HEVC, atau 4500k untuk H.264. Dilumpuhkan jika ditetapkan kepada 0.", + "transcoding_max_bitrate_description": "Menetapkan kadar bit maksima boleh menjadikan saiz fail lebih boleh diramal dengan kekurangan yang kecil kepada kualiti. Pada 720p, nilai biasa ialah 2600 kbit/s untuk VP9 atau HEVC, atau 4500 kbit/s untuk H.264. Dilumpuhkan jika ditetapkan kepada 0.", "transcoding_max_keyframe_interval": "Selangan keyframe maksimum", "transcoding_max_keyframe_interval_description": "Menetapkan jarak bingkai maksimum antara keyframes. Nilai yang lebih rendah memburukkan kecekapan mampatan, tetapi menambah baik masa carian dan mungkin meningkatkan kualiti dalam adegan dengan pergerakan pantas. 0 menetapkan nilai ini secara automatik.", "transcoding_optimal_description": "Video yang lebih tinggi daripada resolusi sasaran atau tidak dalam format yang diterima", @@ -372,4 +372,4 @@ "yes": "Ya", "you_dont_have_any_shared_links": "Anda tidak mempunyai apa-apa pautan yang dikongsi", "zoom_image": "Zum Gambar" -} +} \ No newline at end of file diff --git a/i18n/nb_NO.json b/i18n/nb_NO.json index b29c8c1db6..78f7941760 100644 --- a/i18n/nb_NO.json +++ b/i18n/nb_NO.json @@ -41,6 +41,7 @@ "backup_settings": "Backupinnstillinger", "backup_settings_description": "Håndter innstillinger for databasebackup", "check_all": "Merk Alle", + "cleanup": "Opprydding", "cleared_jobs": "Ryddet opp jobber for: {job}", "config_set_by_file": "Konfigurasjonen er for øyeblikket satt av en konfigurasjonsfil", "confirm_delete_library": "Er du sikker på at du vil slette biblioteket {library}?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Aktiver periodisk skanning av bibliotek", "library_settings": "Eksternt bibliotek", "library_settings_description": "Administrer innstillinger for eksterne bibliotek", - "library_tasks_description": "Utfør bibliotekoppgaver", + "library_tasks_description": "Skann eksterne biblioteker for nye og/eller endrede ressurser", "library_watching_enable_description": "Overvåk eksterne bibliotek for filendringer", "library_watching_settings": "Overvåkning av bibliotek (EKSPERIMENTELL)", "library_watching_settings_description": "Se automatisk etter endrede filer", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Søk etter bilder semantisk ved å bruke CLIP-embeddings", "machine_learning_smart_search_enabled": "Aktiver smart søk", "machine_learning_smart_search_enabled_description": "Hvis deaktivert, vil bilder ikke bli enkodet for smart søk.", - "machine_learning_url_description": "URL til maskinlærings-serveren. Hvis mer enn en URL er lagt inn, hver server vill bli forsøkt en om gangen frem til en svarer suksessfullt, i rekkefølge fra først til sist.", + "machine_learning_url_description": "URL til maskinlærings-serveren. Hvis mer enn en URL er lagt inn, hver server vill bli forsøkt en om gangen frem til en svarer suksessfullt, i rekkefølge fra først til sist. Servere som ikke svarer vil midlertidig bli oversett frem til dem svarer igjen.", "manage_concurrency": "Administrer samtidighet", "manage_log_settings": "Administrer logginnstillinger", "map_dark_style": "Mørk stil", @@ -147,6 +148,8 @@ "map_settings": "Innstillinger for kart og GPS", "map_settings_description": "Administrer kartinnstillinger", "map_style_description": "URL til et style.json-karttema", + "memory_cleanup_job": "Minneopprydding", + "memory_generate_job": "Minnegenerering", "metadata_extraction_job": "Hent metadata", "metadata_extraction_job_description": "Hent metadatainformasjon fra hver fil, for eksempel GPS-posisjon og oppløsning", "metadata_faces_import_setting": "Aktiver ansikts importering", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "Aktiver hasjverifisering. Ikke deaktiver dette med mindre du er sikker på konsekvensene", "storage_template_migration": "Lagringsmal migrering", "storage_template_migration_description": "Bruk gjeldende {template} på tidligere opplastede bilder", - "storage_template_migration_info": "Malendringer vil kun gjelde nye ressurser. For å anvende malen på tidligere opplastede ressurser, kjør {job}.", + "storage_template_migration_info": "Lagringsmalen vil endre filtypen til små bokstaver. Malendringer vil kun gjelde nye ressurser. For å anvende malen på tidligere opplastede ressurser, kjør {job}.", "storage_template_migration_job": "Migreringsjobb for lagringsmal", "storage_template_more_details": "For mer informasjon om denne funksjonen, se lagringsmalen og dens konsekvenser", "storage_template_onboarding_description": "Når aktivert, vil denne funksjonen automatisk organisere filer basert på en brukerdefinert mal. På grunn av stabilitetsproblemer er funksjonen deaktivert som standard. For mer informasjon, se documentation.", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "Maksimalt antall B-frames", "transcoding_max_b_frames_description": "Høyere verdier forbedrer komprimeringseffektiviteten, men senker ned kodingen. Kan være inkompatibelt med maskinvareakselerasjon på eldre enheter. 0 deaktiverer B-rammer, mens -1 setter verdien automatisk.", "transcoding_max_bitrate": "Maksimal bithastighet", - "transcoding_max_bitrate_description": "Å sette en maksimal bithastighet kan gjøre filstørrelsene mer forutsigbare med en liten kostnad for kvaliteten. For 720p er typiske verdier 2600k for VP9 eller HEVC, eller 4500k for H.264. Deaktivert hvis satt til 0.", + "transcoding_max_bitrate_description": "Å sette en maksimal bithastighet kan gjøre filstørrelsene mer forutsigbare med en liten kostnad for kvaliteten. For 720p er typiske verdier 2600 kbit/s for VP9 eller HEVC, eller 4500 kbit/s for H.264. Deaktivert hvis satt til 0.", "transcoding_max_keyframe_interval": "Maksimal referansebilde intervall", "transcoding_max_keyframe_interval_description": "Setter maksimalt antall bilder mellom referansebilder. Lavere verdier reduserer kompresjonseffektiviteten, men forbedrer søketider og kan forbedre kvaliteten i scener med rask bevegelse. 0 setter verdien automatisk.", "transcoding_optimal_description": "Videoer som har høyere oppløsning enn målopppløsningen eller som ikke er i et akseptert format", @@ -391,11 +394,12 @@ "allow_edits": "Tillat redigering", "allow_public_user_to_download": "Tillat uautentiserte brukere å laste ned", "allow_public_user_to_upload": "Tillat uautentiserte brukere å laste opp", + "alt_text_qr_code": "QR-kodebilde", "anti_clockwise": "Mot klokken", "api_key": "API Nøkkel", "api_key_description": "Denne verdien vil vises kun én gang. Pass på å kopiere den før du lukker vinduet.", - "api_key_empty": "API Key-navnet bør ikke være tomt", - "api_keys": "API Nøkkler", + "api_key_empty": "API-nøkkelnavnet bør ikke være tomt", + "api_keys": "API-nøkler", "app_settings": "Appinstillinger", "appears_in": "Vises i", "archive": "Arkiver", @@ -481,6 +485,7 @@ "comments_are_disabled": "Kommentarer er deaktivert", "confirm": "Bekreft", "confirm_admin_password": "Bekreft administratorpassord", + "confirm_delete_face": "Er du sikker på at du vil slette {name} sitt ansikt fra ativia?", "confirm_delete_shared_link": "Er du sikker på at du vil slette denne delte lenken?", "confirm_keep_this_delete_others": "Alle andre ressurser i denne stabelen vil bli slettet bortsett fra denne ressursen. Er du sikker på at du vil fortsette?", "confirm_password": "Bekreft passord", @@ -533,6 +538,7 @@ "delete_album": "Slett album", "delete_api_key_prompt": "Er du sikker på at du vil slette denne API-nøkkelen?", "delete_duplicates_confirmation": "Er du sikker på at du vil slette disse duplikatene permanent?", + "delete_face": "Slett ansik", "delete_key": "Slett nøkkel", "delete_library": "Slett bibliotek", "delete_link": "Slett lenke", @@ -595,11 +601,12 @@ "editor_crop_tool_h2_rotation": "Rotasjon", "email": "E-postadresse", "empty_trash": "Tøm papirkurv", - "empty_trash_confirmation": "Er du sikker på at du vil tømme søppelbøtte ? Dette vil slette alle filene i søppelbøtta permanent fra Immich.\nDu kan ikke angre denne handlingen!", + "empty_trash_confirmation": "Er du sikker på at du vil tømme søppelbøtta? Dette vil slette alle filene i søppelbøtta permanent fra Immich.\nDu kan ikke angre denne handlingen!", "enable": "Aktivere", "enabled": "Aktivert", "end_date": "Slutt dato", "error": "Feil", + "error_delete_face": "Feil ved sletting av ansikt fra aktivia", "error_loading_image": "Feil ved lasting av bilde", "error_title": "Feil - Noe gikk galt", "errors": { @@ -766,8 +773,10 @@ "go_to_folder": "Gå til mappe", "go_to_search": "Gå til søk", "group_albums_by": "Grupper album etter...", + "group_country": "Grupper etter land", "group_no": "Ingen gruppering", "group_owner": "Grupper etter eiere", + "group_places_by": "Grupper plasser etter...", "group_year": "Grupper etter år", "has_quota": "Har kvote", "hi_user": "Hei {name} ({email})", @@ -800,6 +809,7 @@ "include_shared_albums": "Inkluder delte album", "include_shared_partner_assets": "Inkluder delte partnerfiler", "individual_share": "Individuell deling", + "individual_shares": "Individuelle delinger", "info": "Info", "interval": { "day_at_onepm": "Hver dag klokken 13:00", @@ -881,6 +891,7 @@ "month": "Måned", "more": "Mer", "moved_to_trash": "Flyttet til papirkurven", + "mute_memories": "Demp minner", "my_albums": "Mine album", "name": "Navn", "name_or_nickname": "Navn eller kallenavn", @@ -985,6 +996,7 @@ "pick_a_location": "Velg et sted", "place": "Sted", "places": "Plasseringer", + "places_count": "{count, plural, one {{count, number} Place} other {{count, number} Places}}", "play": "Spill av", "play_memories": "Spill av minner", "play_motion_photo": "Spill av bevegelsesbilde", @@ -1072,6 +1084,8 @@ "removed_from_archive": "Fjernet fra arkivet", "removed_from_favorites": "Fjernet fra favoritter", "removed_from_favorites_count": "{count, plural, other {Removed #}} fra favoritter", + "removed_memory": "Slettet minne", + "removed_photo_from_memory": "Slettet bilde fra minne", "removed_tagged_assets": "Fjern tag fra {count, plural, one {# asset} other {# assets}}", "rename": "Gi nytt navn", "repair": "Reparer", @@ -1080,6 +1094,7 @@ "repository": "Depot", "require_password": "Krev passord", "require_user_to_change_password_on_first_login": "Krev at brukeren endrer passord ved første pålogging", + "rescan": "Skann på nytt", "reset": "Tilbakestill", "reset_password": "Tilbakestill passord", "reset_people_visibility": "Tilbakestill personsynlighet", @@ -1108,6 +1123,8 @@ "search": "Søk", "search_albums": "Søk i album", "search_by_context": "Søk etter kontekst", + "search_by_description": "Søk etter beskrivelse", + "search_by_description_example": "Turdag i Sapa", "search_by_filename": "Søk etter filnavn og filtype", "search_by_filename_example": "f.eks. IMG_1234.JPG eller PNG", "search_camera_make": "Søk etter kameramerke...", @@ -1121,6 +1138,7 @@ "search_options": "Søke alternativer", "search_people": "Søk personer", "search_places": "Søk steder", + "search_rating": "Søk etter vurdering...", "search_settings": "Søke instillinger", "search_state": "Søk etter stat...", "search_tags": "Søk tags...", @@ -1167,6 +1185,7 @@ "shared_from_partner": "Bilder fra {partner}", "shared_link_options": "Alternativer for delte lenke", "shared_links": "Delte linker", + "shared_links_description": "Del bilder og videoer med lenke", "shared_photos_and_videos_count": "{assetCount, plural, other {# delte bilder og videoer.}}", "shared_with_partner": "Delt med {partner}", "sharing": "Deling", @@ -1189,6 +1208,7 @@ "show_person_options": "Vis personalternativer", "show_progress_bar": "Vis fremdriftslinje", "show_search_options": "Vis søkealternativer", + "show_shared_links": "Vis delte lenker", "show_slideshow_transition": "Vis overgang til lysbildefremvisning", "show_supporter_badge": "Supportermerke", "show_supporter_badge_description": "Vis et supportermerke", @@ -1242,6 +1262,7 @@ "tag_created": "Lag merke: {tag}", "tag_feature_description": "Bla gjennom bilder og videoer gruppert etter logiske merke-emner", "tag_not_found_question": "Finner du ikke en merke? Opprett en nytt merke.", + "tag_people": "Tag Folk", "tag_updated": "Oppdater merke: {tag}", "tagged_assets": "Merket {count, plural, one {# asset} other {# assets}}", "tags": "Merker", @@ -1276,11 +1297,13 @@ "unfavorite": "Fjern favoritt", "unhide_person": "Vis person", "unknown": "Ukjent", + "unknown_country": "Ukjent Land", "unknown_year": "Ukjent År", "unlimited": "Ubegrenset", "unlink_motion_video": "Koble fra bevegelsesvideo", "unlink_oauth": "Fjern kobling til OAuth", "unlinked_oauth_account": "Koblet fra OAuth-konto", + "unmute_memories": "Opphev demping av minner", "unnamed_album": "Navnløst album", "unnamed_album_delete_confirmation": "Er du sikker på at du vil slette dette albumet?", "unnamed_share": "Deling uten navn", @@ -1334,6 +1357,7 @@ "view_all": "Vis alle", "view_all_users": "Vis alle brukere", "view_in_timeline": "Vis i tidslinje", + "view_link": "Vis lenke", "view_links": "Vis lenker", "view_name": "Vis", "view_next_asset": "Vis neste fil", @@ -1350,4 +1374,4 @@ "yes": "Ja", "you_dont_have_any_shared_links": "Du har ingen delte lenker", "zoom_image": "Zoom Bilde" -} +} \ No newline at end of file diff --git a/i18n/nl.json b/i18n/nl.json index 43e205b52a..55de209224 100644 --- a/i18n/nl.json +++ b/i18n/nl.json @@ -41,6 +41,7 @@ "backup_settings": "Back-up instellingen", "backup_settings_description": "Database back-up instellingen beheren", "check_all": "Controleer het logboek", + "cleanup": "Opruimen", "cleared_jobs": "Taken gewist voor: {job}", "config_set_by_file": "Instellingen worden momenteel beheerd door een configuratiebestand", "confirm_delete_library": "Weet je zeker dat je de bibliotheek {library} wilt verwijderen?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Periodieke bibliotheekscan aanzetten", "library_settings": "Externe bibliotheek", "library_settings_description": "Externe bibliotheekinstellingen beheren", - "library_tasks_description": "Voer bibliotheek taken uit", + "library_tasks_description": "Scan externe bibliotheken op nieuwe en/of gewijzigde media", "library_watching_enable_description": "Externe bibliotheken monitoren op bestandswijzigingen", "library_watching_settings": "Bibliotheek monitoren (EXPERIMENTEEL)", "library_watching_settings_description": "Automatisch gewijzigde bestanden bijhouden", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Semantisch zoeken naar afbeeldingen met CLIP-embeddings", "machine_learning_smart_search_enabled": "Slim zoeken inschakelen", "machine_learning_smart_search_enabled_description": "Indien uitgeschakeld, worden afbeeldingen niet verwerkt voor slim zoeken.", - "machine_learning_url_description": "De URL van de machine learning server. Als er meer dan één URL is opgegeven, wordt elke server geprobeerd totdat er een succesvol reageert, op volgorde van eerste tot laatste.", + "machine_learning_url_description": "De URL van de machine learning server. Als er meer dan één URL is opgegeven, wordt elke server geprobeerd totdat er een succesvol reageert, op volgorde van eerste tot laatste. Servers die geen reactie geven zullen tijdelijk genegeerd worden tot zij terug online komen.", "manage_concurrency": "Beheer gelijktijdigheid", "manage_log_settings": "Beheer logboekinstellingen", "map_dark_style": "Donkere stijl", @@ -147,6 +148,8 @@ "map_settings": "Kaart", "map_settings_description": "Beheer kaartinstellingen", "map_style_description": "URL naar een style.json kaartthema", + "memory_cleanup_job": "Geheugen opschonen", + "memory_generate_job": "Geheugen genereren", "metadata_extraction_job": "Metadata ophalen", "metadata_extraction_job_description": "Metadata ophalen van iedere asset, zoals GPS, gezichten en resolutie", "metadata_faces_import_setting": "Gezichten importeren inschakelen", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "Zet hashverificatie aan, schakel dit niet uit tenzij je zeker bent van de implicaties", "storage_template_migration": "Opslagtemplate migratie", "storage_template_migration_description": "Pas de huidige {template} toe op eerder geüploade assets", - "storage_template_migration_info": "Wijzigingen in de template worden alleen toegepast op nieuwe assets. Om de template met terugwerkende kracht toe te passen op eerder geüploade assets, voer de {job} uit.", + "storage_template_migration_info": "Wijzigingen in het opslag template worden alleen toegepast op nieuwe assets. Om de template met terugwerkende kracht toe te passen op eerder geüploade assets, voer je de {job} uit.", "storage_template_migration_job": "Opslagtemplate migratietaak", "storage_template_more_details": "Voor meer details over deze functie, bekijk de Opslagstemplate en de implicaties daarvan", "storage_template_onboarding_description": "Wanneer ingeschakeld, zal deze functie bestanden automatisch organiseren gebaseerd op een gebruiker-definieerd template. Gezien de stabiliteitsproblemen is de functie standaard uitgeschakeld. Voor meer informatie, bekijk de documentatie.", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "Maximum B-Frames", "transcoding_max_b_frames_description": "Hogere waarden verbeteren de compressie efficiëntie, maar vertragen de codering. Is mogelijk niet compatibel met hardwareversnelling op oudere apparaten. 0 schakelt B-frames uit, terwijl -1 deze waarde automatisch instelt.", "transcoding_max_bitrate": "Maximum bitrate", - "transcoding_max_bitrate_description": "Het instellen van een maximale bitrate kan de bestandsgrootte voorspelbaarder maken, tegen geringe kosten voor de kwaliteit. Bij 720p zijn de typische waarden 2600k voor VP9 of HEVC, of 4500k voor H.264. Uitgeschakeld indien ingesteld op 0.", + "transcoding_max_bitrate_description": "Het instellen van een maximale bitrate kan de bestandsgrootte voorspelbaarder maken, tegen geringe kosten voor de kwaliteit. Bij 720p zijn de typische waarden 2600 kbit/s voor VP9 of HEVC, of 4500 kbit/s voor H.264. Uitgeschakeld indien ingesteld op 0.", "transcoding_max_keyframe_interval": "Maximum keyframe interval", "transcoding_max_keyframe_interval_description": "Stelt de maximale frameafstand tussen keyframes in. Lagere waarden verslechteren de compressie efficiëntie, maar verbeteren de zoektijden en kunnen de kwaliteit verbeteren in scènes met snelle bewegingen. 0 stelt deze waarde automatisch in.", "transcoding_optimal_description": "Video's met een hogere resolutie dan de doelresolutie of niet in een geaccepteerd formaat", @@ -391,11 +394,12 @@ "allow_edits": "Bewerkingen toestaan", "allow_public_user_to_download": "Sta openbare gebruiker toe om te downloaden", "allow_public_user_to_upload": "Sta openbare gebruiker toe om te uploaden", + "alt_text_qr_code": "QR-codeafbeelding", "anti_clockwise": "Linksom", - "api_key": "API sleutel", + "api_key": "API key", "api_key_description": "Deze waarde wordt slechts één keer getoond. Zorg ervoor dat je deze kopieert voordat je het venster sluit.", - "api_key_empty": "De naam van uw API sleutel mag niet leeg zijn", - "api_keys": "API sleutels", + "api_key_empty": "De naam van uw API key mag niet leeg zijn", + "api_keys": "API keys", "app_settings": "App instellingen", "appears_in": "Komt voor in", "archive": "Archief", @@ -442,7 +446,7 @@ "bulk_delete_duplicates_confirmation": "Weet je zeker dat je {count, plural, one {# duplicate asset} other {# duplicate assets}} in bulk wilt verwijderen? Dit zal de grootste asset van elke groep behouden en alle andere duplicaten permanent verwijderen. Je kunt deze actie niet ongedaan maken!", "bulk_keep_duplicates_confirmation": "Weet je zeker dat je {count, plural, one {# duplicate asset} other {# duplicate assets}} wilt behouden? Dit zal alle groepen met duplicaten oplossen zonder iets te verwijderen.", "bulk_trash_duplicates_confirmation": "Weet je zeker dat je {count, plural, one {# duplicate asset} other {# duplicate assets}} in bulk naar de prullenbak wilt verplaatsen? Dit zal de grootste asset van elke groep behouden en alle andere duplicaten naar de prullenbak verplaatsen.", - "buy": "Koop Immich", + "buy": "Immich kopen", "camera": "Camera", "camera_brand": "Cameramerk", "camera_model": "Cameramodel", @@ -452,9 +456,9 @@ "cannot_undo_this_action": "Je kunt deze actie niet ongedaan maken!", "cannot_update_the_description": "Kan de beschrijving niet bijwerken", "change_date": "Wijzig datum", - "change_expiration_time": "Wijzig verlooptijd", - "change_location": "Wijzig locatie", - "change_name": "Wijzig naam", + "change_expiration_time": "Verlooptijd wijzigen", + "change_location": "Locatie wijzigen", + "change_name": "Naam wijzigen", "change_name_successfully": "Naam succesvol gewijzigd", "change_password": "Wijzig wachtwoord", "change_password_description": "Dit is de eerste keer dat je inlogt op het systeem of er is een verzoek gedaan om je wachtwoord te wijzigen. Voer hieronder het nieuwe wachtwoord in.", @@ -481,6 +485,7 @@ "comments_are_disabled": "Opmerkingen zijn uitgeschakeld", "confirm": "Bevestigen", "confirm_admin_password": "Bevestig beheerder wachtwoord", + "confirm_delete_face": "Weet je zeker dat je {name} gezicht wilt verwijderen uit de asset?", "confirm_delete_shared_link": "Weet je zeker dat je deze gedeelde link wilt verwijderen?", "confirm_keep_this_delete_others": "Alle andere assets in de stack worden verwijderd, behalve deze. Weet je zeker dat je wilt doorgaan?", "confirm_password": "Bevestig wachtwoord", @@ -531,9 +536,10 @@ "default_locale_description": "Formatteer datums en getallen op basis van de landinstellingen van je browser", "delete": "Verwijderen", "delete_album": "Album verwijderen", - "delete_api_key_prompt": "Weet je zeker dat je deze API sleutel wilt verwijderen?", + "delete_api_key_prompt": "Weet je zeker dat je deze API key wilt verwijderen?", "delete_duplicates_confirmation": "Weet je zeker dat je deze duplicaten permanent wilt verwijderen?", - "delete_key": "Verwijder sleutel", + "delete_face": "Gezicht verwijderen", + "delete_key": "Verwijder key", "delete_library": "Verwijder bibliotheek", "delete_link": "Verwijder link", "delete_others": "Andere verwijderen", @@ -579,7 +585,7 @@ "edit_faces": "Gezichten bewerken", "edit_import_path": "Import-pad bewerken", "edit_import_paths": "Import-paden bewerken", - "edit_key": "Sleutel bewerken", + "edit_key": "Key bewerken", "edit_link": "Link bewerken", "edit_location": "Locatie bewerken", "edit_name": "Naam bewerken", @@ -600,6 +606,7 @@ "enabled": "Ingeschakeld", "end_date": "Einddatum", "error": "Fout", + "error_delete_face": "Fout bij verwijderen gezicht uit asset", "error_loading_image": "Fout bij laden afbeelding", "error_title": "Fout - Er is iets misgegaan", "errors": { @@ -631,7 +638,7 @@ "failed_to_load_asset": "Kan asset niet laden", "failed_to_load_assets": "Kan assets niet laden", "failed_to_load_people": "Kan mensen niet laden", - "failed_to_remove_product_key": "Er is een fout opgetreden bij het verwijderen van de product sleutel", + "failed_to_remove_product_key": "Er is een fout opgetreden bij het verwijderen van de licentiesleutel", "failed_to_stack_assets": "Fout bij stapelen van assets", "failed_to_unstack_assets": "Fout bij ontstapelen van assets", "import_path_already_exists": "Dit import-pad bestaat al.", @@ -660,7 +667,7 @@ "unable_to_connect_to_server": "Kan geen verbinding maken met server", "unable_to_copy_to_clipboard": "Kan niet naar klembord kopiëren, zorg ervoor dat je de pagina via https opent", "unable_to_create_admin_account": "Kan beheerdersaccount niet aanmaken", - "unable_to_create_api_key": "Kan geen nieuwe API sleutel aanmaken", + "unable_to_create_api_key": "Kan geen nieuwe API key aanmaken", "unable_to_create_library": "Kan bibliotheek niet aanmaken", "unable_to_create_user": "Kan geen gebruiker aanmaken", "unable_to_delete_album": "Kan album niet verwijderen", @@ -693,7 +700,7 @@ "unable_to_reassign_assets_new_person": "Kan assets niet opnieuw toewijzen aan een nieuw persoon", "unable_to_refresh_user": "Kan gebruiker niet vernieuwen", "unable_to_remove_album_users": "Kan gebruiker niet van album verwijderen", - "unable_to_remove_api_key": "Kan API sleutel niet verwijderen", + "unable_to_remove_api_key": "Kan API key niet verwijderen", "unable_to_remove_assets_from_shared_link": "Kan assets niet verwijderen uit gedeelde link", "unable_to_remove_deleted_assets": "Kan offline bestanden niet verwijderen", "unable_to_remove_library": "Kan bibliotheek niet verwijderen", @@ -706,7 +713,7 @@ "unable_to_restore_trash": "Kan niet herstellen uit prullenbak", "unable_to_restore_user": "Kan gebruiker niet herstellen", "unable_to_save_album": "Kan album niet opslaan", - "unable_to_save_api_key": "Kan API sleutel niet opslaan", + "unable_to_save_api_key": "Kan API key niet opslaan", "unable_to_save_date_of_birth": "Kan geboortedatum niet opslaan", "unable_to_save_name": "Kan naam niet opslaan", "unable_to_save_profile": "Kan profiel niet opslaan", @@ -857,7 +864,7 @@ "manage_sharing_with_partners": "Beheer delen met partners", "manage_the_app_settings": "Beheer de appinstellingen", "manage_your_account": "Beheer je account", - "manage_your_api_keys": "Beheer je API sleutels", + "manage_your_api_keys": "Beheer je API keys", "manage_your_devices": "Beheer je ingelogde apparaten", "manage_your_oauth_connection": "Beheer je OAuth koppeling", "map": "Kaart", @@ -884,12 +891,13 @@ "month": "Maand", "more": "Meer", "moved_to_trash": "Naar de prullenbak verplaatst", + "mute_memories": "Herrinneringen dempen", "my_albums": "Mijn albums", "name": "Naam", "name_or_nickname": "Naam of gebruikersnaam", "never": "Nooit", "new_album": "Nieuw album", - "new_api_key": "Nieuwe API sleutel", + "new_api_key": "Nieuwe API key", "new_password": "Nieuw wachtwoord", "new_person": "Nieuw persoon", "new_user_created": "Nieuwe gebruiker aangemaakt", @@ -1008,19 +1016,19 @@ "purchase_account_info": "Supporter", "purchase_activated_subtitle": "Bedankt voor het ondersteunen van Immich en open-source software", "purchase_activated_time": "Geactiveerd op {date, date}", - "purchase_activated_title": "Je sleutel is succesvol geactiveerd", + "purchase_activated_title": "Je licentiesleutel is succesvol geactiveerd", "purchase_button_activate": "Activeren", "purchase_button_buy": "Kopen", "purchase_button_buy_immich": "Koop Immich", "purchase_button_never_show_again": "Nooit meer tonen", "purchase_button_reminder": "Herinner mij over 30 dagen", - "purchase_button_remove_key": "Sleutel verwijderen", + "purchase_button_remove_key": "Licentiesleutel verwijderen", "purchase_button_select": "Selecteren", - "purchase_failed_activation": "Activeren mislukt! Controleer je e-mail voor de juiste productsleutel!", + "purchase_failed_activation": "Activeren mislukt! Controleer je e-mail voor de juiste licentiesleutel!", "purchase_individual_description_1": "Voor een gebruiker", "purchase_individual_description_2": "Supporter badge", "purchase_individual_title": "Gebruiker", - "purchase_input_suggestion": "Heb je een productsleutel? Voer de sleutel hieronder in", + "purchase_input_suggestion": "Heb je een licentiesleutel? Voer deze hieronder in", "purchase_license_subtitle": "Koop Immich om de verdere ontwikkeling van de service te ondersteunen", "purchase_lifetime_description": "Levenslange aankoop", "purchase_option_title": "AANKOOP MOGELIJKHEDEN", @@ -1029,14 +1037,14 @@ "purchase_panel_title": "Steun het project", "purchase_per_server": "Per server", "purchase_per_user": "Per gebruiker", - "purchase_remove_product_key": "Verwijder product sleutel", - "purchase_remove_product_key_prompt": "Weet je zeker dat je de product sleutel wilt verwijderen?", - "purchase_remove_server_product_key": "Verwijder server product sleutel", - "purchase_remove_server_product_key_prompt": "Weet je zeker dat je de server product sleutel wilt verwijderen?", + "purchase_remove_product_key": "Verwijder licentiesleutel", + "purchase_remove_product_key_prompt": "Weet je zeker dat je de licentiesleutel wilt verwijderen?", + "purchase_remove_server_product_key": "Verwijder server licentiesleutel", + "purchase_remove_server_product_key_prompt": "Weet je zeker dat je de server licentiesleutel wilt verwijderen?", "purchase_server_description_1": "Voor de volledige server", "purchase_server_description_2": "Supporter badge", "purchase_server_title": "Server", - "purchase_settings_server_activated": "De productcode van de server wordt beheerd door de beheerder", + "purchase_settings_server_activated": "De licentiesleutel van de server wordt beheerd door de beheerder", "rating": "Ster waardering", "rating_clear": "Waardering verwijderen", "rating_count": "{count, plural, one {# ster} other {# sterren}}", @@ -1076,6 +1084,8 @@ "removed_from_archive": "Verwijderd uit archief", "removed_from_favorites": "Verwijderd uit favorieten", "removed_from_favorites_count": "{count, plural, other {# verwijderd}} uit favorieten", + "removed_memory": "Geheugen verwijderd", + "removed_photo_from_memory": "Foto verwijderd uit geheugen", "removed_tagged_assets": "Tag verwijderd van {count, plural, one {# asset} other {# assets}}", "rename": "Hernoemen", "repair": "Repareren", @@ -1084,6 +1094,7 @@ "repository": "Repository", "require_password": "Wachtwoord vereisen", "require_user_to_change_password_on_first_login": "Vereisen dat de gebruiker het wachtwoord wijzigt bij de eerste keer inloggen", + "rescan": "Herscannen", "reset": "Resetten", "reset_password": "Wachtwoord resetten", "reset_people_visibility": "Zichtbaarheid mensen resetten", @@ -1127,6 +1138,7 @@ "search_options": "Zoekopties", "search_people": "Zoek mensen", "search_places": "Zoek plaatsen", + "search_rating": "Zoeken op beoordeling...", "search_settings": "Zoek instellingen", "search_state": "Zoek staat...", "search_tags": "Tags zoeken...", @@ -1250,6 +1262,7 @@ "tag_created": "Tag aangemaakt: {tag}", "tag_feature_description": "Bladeren door foto's en video's gegroepeerd op tags", "tag_not_found_question": "Kun je een tag niet vinden? Maak een nieuwe tag.", + "tag_people": "Mensen taggen", "tag_updated": "Tag bijgewerkt: {tag}", "tagged_assets": "{count, plural, one {# asset} other {# assets}} getagd", "tags": "Tags", @@ -1290,6 +1303,7 @@ "unlink_motion_video": "Maak bewegende video los", "unlink_oauth": "Ontkoppel OAuth", "unlinked_oauth_account": "OAuth account ontkoppeld", + "unmute_memories": "Dempen van herrinneringen opheffen", "unnamed_album": "Naamloos album", "unnamed_album_delete_confirmation": "Weet je zeker dat je dit album wilt verwijderen?", "unnamed_share": "Naamloze deellink", @@ -1343,6 +1357,7 @@ "view_all": "Bekijk alle", "view_all_users": "Bekijk alle gebruikers", "view_in_timeline": "Bekijk in tijdlijn", + "view_link": "Bekijk link", "view_links": "Links bekijken", "view_name": "Bekijken", "view_next_asset": "Bekijk volgende asset", @@ -1359,4 +1374,4 @@ "yes": "Ja", "you_dont_have_any_shared_links": "Je hebt geen gedeelde links", "zoom_image": "Inzoomen" -} +} \ No newline at end of file diff --git a/i18n/nn.json b/i18n/nn.json index 4cda30dce2..6de0f3401b 100644 --- a/i18n/nn.json +++ b/i18n/nn.json @@ -120,8 +120,20 @@ "machine_learning_max_detection_distance": "Maksimal oppdagingsverdi", "machine_learning_max_detection_distance_description": "Den største skilnaden mellom to bilete for å rekne dei som duplikat, frå 0.001-0.1. Større verdiar finn fleire duplikat, men kan gje falske treff.", "machine_learning_max_recognition_distance": "Maksimal attkjenningsverdi", + "machine_learning_min_detection_score": "Minimum deteksjonsresultat", + "machine_learning_min_detection_score_description": "Minimum tillitspoeng for at eit ansikt skal bli oppdaga, på ein skala frå 0-1. Lågare verdiar vil oppdaga fleire ansikt, men kan føre til falske positive", + "machine_learning_min_recognized_faces": "Minimum gjenkjende ansikt", + "machine_learning_settings": "Innstillingar for maskinlæring", + "machine_learning_settings_description": "Administrer maskinlæringsfunksjonar og innstillingar", "machine_learning_smart_search": "Smart Søk", + "machine_learning_smart_search_enabled": "Aktiver smart søk", + "machine_learning_smart_search_enabled_description": "Hvis deaktivert, vil bilete ikkje bli enkoda for smart søk.", + "manage_concurrency": "Administrer samtidigheit", + "manage_log_settings": "Administrer logginnstillingar", "map_dark_style": "Mørk modus", + "map_enable_description": "Aktiver kartfunksjonar", + "map_gps_settings": "Kart og GPS innstillingar", + "map_gps_settings_description": "Administrer innstillingar for kart og GPS (Reversert geokoding)", "map_light_style": "Lys modus", "map_settings": "Kart", "metadata_extraction_job": "Hent ut metadata", @@ -365,19 +377,38 @@ "usage": "Bruk", "user": "Brukar", "user_purchase_settings": "Kjøp", + "user_usage_detail": "Detaljar av brukars forbruk", + "user_usage_stats": "Vis kontobruksstatistikk", + "user_usage_stats_description": "Vis kontobruksstatistikk", "username": "Brukarnamn", "users": "Brukarar", "utilities": "Verktøy", "validate": "Validere", "variables": "Variablar", "version": "Versjon", + "version_announcement_closing": "Din ven, Alex", + "version_history": "Versjonshistorie", + "version_history_item": "Installert {version} den {date}", "video": "Video", + "video_hover_setting": "Spel av førehandsvisining medan du held over musepeikaren", "videos": "Videoar", + "videos_count": "{count, plural, one {# Video} other {# Videoar}}", + "view": "Vis", + "view_album": "Sjå Album", + "view_all": "Sjå alle", + "view_all_users": "Sjå alle brukarar", + "view_in_timeline": "Sjå på tidslinja", + "view_links": "Vis lenkjer", + "view_name": "Vis", + "view_next_asset": "Vis neste fil", + "view_previous_asset": "Vis forrige fil", + "view_stack": "Syn stabel", "visibility_changed": "Synlegheit forandra for {count, plural, one {# person} other {# personar}}", "waiting": "Ventar", "warning": "Advarsel", "week": "Veke", "welcome": "Velkomen", + "welcome_to_immich": "Velkomen til Immich", "year": "År", "years_ago": "{years, plural, one {# År} other {# År}} sidan", "yes": "Ja", diff --git a/i18n/pl.json b/i18n/pl.json index b8303604f4..dacd054c89 100644 --- a/i18n/pl.json +++ b/i18n/pl.json @@ -41,6 +41,7 @@ "backup_settings": "Ustawienia kopii zapasowej", "backup_settings_description": "Zarządzaj ustawieniami kopii zapasowej bazy danych", "check_all": "Zaznacz Wszystko", + "cleanup": "Czyszczenie", "cleared_jobs": "Usunięto zadania dla: {job}", "config_set_by_file": "Konfiguracja pochodzi z pliku konfiguracyjnego", "confirm_delete_library": "Czy na pewno chcesz usunąć bibliotekę {library}?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Włącz okresowe skanowanie bibliotek", "library_settings": "Zewnętrzne Biblioteki", "library_settings_description": "Zarządzaj ustawieniami zewnętrznych bibliotek", - "library_tasks_description": "Wykonaj zadania biblioteki", + "library_tasks_description": "Wyszukiwanie nowych lub zmienionych pozycji w zewnętrznych bibliotekach", "library_watching_enable_description": "Przejrzyj zewnętrzne biblioteki w poszukiwaniu zmienionych plików", "library_watching_settings": "Obserwowanie bibliotek (Funkcja eksperymentalna)", "library_watching_settings_description": "Automatycznie obserwuj zmienione pliki", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Szukaj obrazów semantycznie za pomocą CLIP", "machine_learning_smart_search_enabled": "Włącz inteligentne wyszukiwanie", "machine_learning_smart_search_enabled_description": "Jeżeli wyłączone, obrazy nie będą przygotowywane do inteligentnego wyszukiwania.", - "machine_learning_url_description": "URL serwera uczenia maszynowego. Jeżeli podano więcej niż jeden URL, do każdego serwera będzie wysłane żądanie do tej pory dopóki chociaż jeden nie odpowie, w kolejności od pierwszego do ostatniego.", + "machine_learning_url_description": "URL serwera uczenia maszynowego. Jeżeli podano więcej niż jeden URL, do każdego serwera po kolei będzie wysłane żądanie dopóki chociaż jeden nie odpowie, w kolejności od pierwszego do ostatniego. Serwery które nie odpowiedzą, zostaną tymczasowo ignorowane aż do momentu ich przejścia w stan online.", "manage_concurrency": "Zarządzaj współbieżnością zadań", "manage_log_settings": "Zarządzaj ustawieniami logów", "map_dark_style": "Styl ciemny", @@ -147,6 +148,8 @@ "map_settings": "Ustawienia Mapy", "map_settings_description": "Zarządzaj ustawieniami mapy", "map_style_description": "URL do pliku style.json z motywem mapy", + "memory_cleanup_job": "Czyszczenie pamięci", + "memory_generate_job": "Generowanie pamięci", "metadata_extraction_job": "Wyodrębnij metadane", "metadata_extraction_job_description": "Wyodrębnij informacje o metadanych z każdego zasobu, takie jak GPS, twarze i rozdzielczość", "metadata_faces_import_setting": "Włącz import twarzy", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "Maksymalne klatki B (B-Frames)", "transcoding_max_b_frames_description": "Wyższe wartości poprawiają wydajność kompresji, ale spowalniają kodowanie. Może nie być kompatybilny z akceleracją sprzętową na starszych urządzeniach. 0 wyłącza klatki B (B-frames), natomiast -1 ustawia tę wartość automatycznie.", "transcoding_max_bitrate": "Maksymalna szybkość transmisji", - "transcoding_max_bitrate_description": "Ustawienie maksymalnej szybkości transmisji może sprawić, że rozmiary plików będą bardziej przewidywalne przy niewielkim koszcie na jakość. Przy rozdzielczości 720p typowe wartości to 2600k dla VP9 lub HEVC, lub 4500k dla H.264. Wyłączone, jeśli ustawione na 0.", + "transcoding_max_bitrate_description": "Ustawienie maksymalnej szybkości transmisji może sprawić, że rozmiary plików będą bardziej przewidywalne przy niewielkim koszcie na jakość. Przy rozdzielczości 720p typowe wartości to 2600 kbit/s dla VP9 lub HEVC, lub 4500 kbit/s dla H.264. Wyłączone, jeśli ustawione na 0.", "transcoding_max_keyframe_interval": "Maksymalny interwał klatek kluczowych", "transcoding_max_keyframe_interval_description": "Ustawia maksymalny dystans między klatkami kluczowymi. Niższe wartości przyspieszają przeszukiwanie filmów i mogą poprawić jakość w scenach z dużą ilością ruchu, kosztem gorszej efektywności kompresji. 0 ustawia tą wartość automatycznie.", "transcoding_optimal_description": "Filmy w rozdzielczości wyższej niż docelowa lub w nieakceptowanym formacie", @@ -352,7 +355,7 @@ "version_check_enabled_description": "Włącz sprawdzanie wersji", "version_check_implications": "Funkcja sprawdzania wersji opiera się na okresowej komunikacji z github.com", "version_check_settings": "Sprawdzenie Wersji", - "version_check_settings_description": "Włącz/wyłącz powiadomienie o nowej wersji", + "version_check_settings_description": "Włącz/wyłącz powiadomienia o nowej wersji", "video_conversion_job": "Transkodowanie wideo", "video_conversion_job_description": "Transkodowanie wideo w celu zapewnienia szerokiej kompatybilności z przeglądarkami i urządzeniami" }, @@ -391,6 +394,7 @@ "allow_edits": "Pozwól edytować", "allow_public_user_to_download": "Zezwól użytkownikowi publicznemu na pobieranie", "allow_public_user_to_upload": "Zezwól użytkownikowi publicznemu na przesyłanie plików", + "alt_text_qr_code": "Obrazek kodu QR", "anti_clockwise": "Przeciwnie do ruchu wskazówek zegara", "api_key": "Klucz API", "api_key_description": "Widzisz tę wartość po raz pierwszy i ostatni, więc lepiej ją skopiuj przed zamknięciem okna.", @@ -481,6 +485,7 @@ "comments_are_disabled": "Komentarze są wyłączone", "confirm": "Potwierdź", "confirm_admin_password": "Potwierdź Hasło Administratora", + "confirm_delete_face": "Czy na pewno chcesz usunąć twarz {name} z zasobów?", "confirm_delete_shared_link": "Czy na pewno chcesz usunąć ten udostępniony link?", "confirm_keep_this_delete_others": "Wszystkie inne zasoby zostaną usunięte poza tym zasobem. Czy jesteś pewien, że chcesz kontynuować?", "confirm_password": "Potwierdź hasło", @@ -522,7 +527,7 @@ "date_of_birth_saved": "Data urodzenia zapisana pomyślnie", "date_range": "Zakres dat", "day": "Dzień", - "deduplicate_all": "Usuń Zduplikowane", + "deduplicate_all": "Usuń duplikaty", "deduplication_criteria_1": "Rozmiar obrazu w bajtach", "deduplication_criteria_2": "Ilość plików EXIF", "deduplication_info": "Stan duplikatów", @@ -533,6 +538,7 @@ "delete_album": "Usuń album", "delete_api_key_prompt": "Czy na pewno chcesz usunąć ten klucz API?", "delete_duplicates_confirmation": "Czy na pewno chcesz trwale usunąć te duplikaty?", + "delete_face": "Usuń twarz", "delete_key": "Usuń klucz", "delete_library": "Usuń bibliotekę", "delete_link": "Usuń link", @@ -548,7 +554,7 @@ "direction": "Kierunek", "disabled": "Wyłączone", "disallow_edits": "Nie pozwalaj edytować", - "discord": "Konflikt", + "discord": "Discord", "discover": "Odkryj", "dismiss_all_errors": "Odrzuć wszystkie błędy", "dismiss_error": "Odrzuć błąd", @@ -600,6 +606,7 @@ "enabled": "Włączone", "end_date": "Do dnia", "error": "Błąd", + "error_delete_face": "Wystąpił błąd podczas usuwania twarzy z zasobów", "error_loading_image": "Błąd podczas ładowania zdjęcia", "error_title": "Błąd - Coś poszło nie tak", "errors": { @@ -766,8 +773,10 @@ "go_to_folder": "Idź do folderu", "go_to_search": "Przejdź do wyszukiwania", "group_albums_by": "Grupuj albumy...", + "group_country": "Grupuj według państwa", "group_no": "Brak grupowania", "group_owner": "Grupuj według właściciela", + "group_places_by": "Grupuj miejsca według...", "group_year": "Grupuj według roku", "has_quota": "Ma limit", "hi_user": "Cześć {name} ({email})", @@ -800,6 +809,7 @@ "include_shared_albums": "Uwzględnij udostępnione albumy", "include_shared_partner_assets": "Uwzględnij udostępnione zasoby partnera", "individual_share": "Udostępniony zasób", + "individual_shares": "Indywidualne udziały", "info": "Informacje", "interval": { "day_at_onepm": "Codziennie o 13:00", @@ -881,6 +891,7 @@ "month": "Miesiąc", "more": "Więcej...", "moved_to_trash": "Przeniesiono do kosza", + "mute_memories": "Wycisz wspomnienia", "my_albums": "Moje albumy", "name": "Nazwa", "name_or_nickname": "Nazwa lub pseudonim", @@ -985,6 +996,7 @@ "pick_a_location": "Oznacz lokalizację", "place": "Miejsce", "places": "Miejsca", + "places_count": "{count, plural, one {{count, number} Miejsce} few {{count, number} Miejsca}other {{count, number} Miejsc}}", "play": "Odtwórz", "play_memories": "Odtwórz wspomnienia", "play_motion_photo": "Odtwórz Ruchome Zdjęcie", @@ -1072,6 +1084,8 @@ "removed_from_archive": "Usunięto z archiwum", "removed_from_favorites": "Usunięto z ulubionych", "removed_from_favorites_count": "{count, plural, other {Usunięto #}} z ulubionych", + "removed_memory": "Pamięć została usunięta", + "removed_photo_from_memory": "Usunięto zdjęcie z pamięci", "removed_tagged_assets": "Usunięto etykietę z {count, plural, one {# zasobu} other {# zasobów}}", "rename": "Zmień nazwę", "repair": "Napraw", @@ -1080,6 +1094,7 @@ "repository": "Repozytorium", "require_password": "Wymagaj hasło", "require_user_to_change_password_on_first_login": "Zmuś użytkownika do zmiany hasła podczas następnego logowania", + "rescan": "Ponowne skanowanie", "reset": "Reset", "reset_password": "Resetuj hasło", "reset_people_visibility": "Zresetuj widoczność osób", @@ -1109,6 +1124,7 @@ "search_albums": "Przeszukaj albumy", "search_by_context": "Wyszukaj według treści", "search_by_description": "Wyszukaj według opisu", + "search_by_description_example": "Jednodniowa wycieczka górska w Bieszczady", "search_by_filename": "Szukaj według nazwy pliku lub rozszerzenia", "search_by_filename_example": "np. IMG_1234.JPG lub PNG", "search_camera_make": "Wyszukaj markę aparatu...", @@ -1122,6 +1138,7 @@ "search_options": "Opcje wyszukiwania", "search_people": "Wyszukaj osoby", "search_places": "Wyszukaj miejsca", + "search_rating": "Wyszukaj według ocen...", "search_settings": "Ustawienia przeszukiwania", "search_state": "Wyszukaj stan...", "search_tags": "Wyszukaj etykiety...", @@ -1168,6 +1185,7 @@ "shared_from_partner": "Zdjęcia od {partner}", "shared_link_options": "Opcje udostępniania linku", "shared_links": "Udostępnione linki", + "shared_links_description": "Udostępnij zdjęcia oraz filmy przez link", "shared_photos_and_videos_count": "{assetCount, plural, other {# udostępnione zdjęcia i filmy.}}", "shared_with_partner": "Dzielisz się z {partner}", "sharing": "Udostępnianie", @@ -1190,6 +1208,7 @@ "show_person_options": "Pokaż opcje osoby", "show_progress_bar": "Pokaż pasek postępu", "show_search_options": "Wyświetl opcje wyszukiwania", + "show_shared_links": "Pokaż udostępniane linki", "show_slideshow_transition": "Pokaż przejście pokazu slajdów", "show_supporter_badge": "Odznaka wspierającego", "show_supporter_badge_description": "Pokaż odznakę wspierającego", @@ -1243,6 +1262,7 @@ "tag_created": "Stworzono etykietę: {tag}", "tag_feature_description": "Przeglądanie zdjęć i filmów pogrupowanych według logicznych etykiet wskazujących temat", "tag_not_found_question": "Nie możesz znaleźć etykiety? Utwórz ją tutaj", + "tag_people": "Dodaj etykiety osób", "tag_updated": "Uaktualniono etykietę: {tag}", "tagged_assets": "Przypisano etykietę {count, plural, one {# zasobowi} other {# zasobom}}", "tags": "Etykiety", @@ -1277,11 +1297,13 @@ "unfavorite": "Usuń z ulubionych", "unhide_person": "Przywróć osobę", "unknown": "Nieznany", + "unknown_country": "Nieznane państwo", "unknown_year": "Rok nieznany", "unlimited": "Nieograniczony", "unlink_motion_video": "Rozłącz ruchome wideo", "unlink_oauth": "Odłącz OAuth", "unlinked_oauth_account": "Odłączone konto OAuth", + "unmute_memories": "Włącz dźwięk wspomnień", "unnamed_album": "Nienazwany album", "unnamed_album_delete_confirmation": "Czy jesteś pewna/pewien, że chcesz usunąć te album?", "unnamed_share": "Nienazwany udział", @@ -1335,6 +1357,7 @@ "view_all": "Pokaż wszystkie", "view_all_users": "Pokaż wszystkich użytkowników", "view_in_timeline": "Pokaż na osi czasu", + "view_link": "Zobacz link", "view_links": "Pokaż łącza", "view_name": "Widok", "view_next_asset": "Wyświetl następny zasób", @@ -1351,4 +1374,4 @@ "yes": "Tak", "you_dont_have_any_shared_links": "Nie masz żadnych udostępnionych linków", "zoom_image": "Powiększ obraz" -} +} \ No newline at end of file diff --git a/i18n/pt.json b/i18n/pt.json index 26359a86ab..fe987f9564 100644 --- a/i18n/pt.json +++ b/i18n/pt.json @@ -41,6 +41,7 @@ "backup_settings": "Definições de Cópia de Segurança", "backup_settings_description": "Gerir definições de cópia de segurança da base de dados", "check_all": "Selecionar Tudo", + "cleanup": "Limpeza", "cleared_jobs": "Eliminadas as tarefas de: {job}", "config_set_by_file": "A configuração está atualmente definida por um ficheiro de configuração", "confirm_delete_library": "Tem a certeza de que deseja eliminar a biblioteca {library} ?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Ativar análise periódica da biblioteca", "library_settings": "Biblioteca Externa", "library_settings_description": "Gerir definições de biblioteca externa", - "library_tasks_description": "Executa tarefas de biblioteca", + "library_tasks_description": "Pesquisa bibliotecas externas em busca de itens novos e/ou alterados", "library_watching_enable_description": "Analisar bibliotecas externas por alterações de ficheiros", "library_watching_settings": "Análise de biblioteca (EXPERIMENTAL)", "library_watching_settings_description": "Analise automaticamente por ficheiros alterados", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Pesquise imagens semanticamente utilizando embeddings CLIP", "machine_learning_smart_search_enabled": "Ativar a Pesquisa Inteligente", "machine_learning_smart_search_enabled_description": "Se desativado, as imagens não serão codificadas para Pesquisa Inteligente.", - "machine_learning_url_description": "A URL do servidor de aprendizagem de máquina. Se for fornecido mais do que um URL, cada servidor será testado, um a um, até um deles responder com sucesso, por ordem do primeiro ao último.", + "machine_learning_url_description": "A URL do servidor de aprendizagem de máquina. Se for fornecido mais do que um URL, cada servidor será testado, um a um, até um deles responder com sucesso, por ordem do primeiro ao último. Servidores que não responderem serão temporariamente ignorados até voltarem a estar online.", "manage_concurrency": "Gerir simultaneidade", "manage_log_settings": "Gerir definições de registo", "map_dark_style": "Tema Escuro", @@ -147,6 +148,8 @@ "map_settings": "Mapa", "map_settings_description": "Gerir definições do mapa", "map_style_description": "URL para um tema de mapa style.json", + "memory_cleanup_job": "Limpeza de memórias", + "memory_generate_job": "Geração de memórias", "metadata_extraction_job": "Extrair metadados", "metadata_extraction_job_description": "Extrai informações de metadados de cada ficheiro, como GPS, rostos e resolução", "metadata_faces_import_setting": "Ativar a importação facial", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "Ativa a verificação de hash, não desative esta opção a menos que tenha a certeza das implicações", "storage_template_migration": "Migração de modelo de armazenamento", "storage_template_migration_description": "Aplica o {template} atual para ficheiros previamente carregados", - "storage_template_migration_info": "As mudanças do modelo apenas se aplicarão a novos ficheiros. Para aplicar o modelo retroativamente para os ficheiros carregados anteriormente, execute o {job}.", + "storage_template_migration_info": "O modelo de armazenamento irá converter todas as extensões para letra minúscula. As mudanças do modelo apenas se aplicarão a novos ficheiros. Para aplicar o modelo retroativamente para os ficheiros carregados anteriormente, execute o {job}.", "storage_template_migration_job": "Tarefa de Migração do Modelo de Armazenamento", "storage_template_more_details": "Para mais informações sobre esta funcionalidade, dirija-se a Modelo de Armazenamento e às suas implicações", "storage_template_onboarding_description": "Quando ativada, esta funcionalidade irá organizar os ficheiros automaticamente baseando-se num modelo definido pelo utilizador. Devido a problemas de estabilidade esta funcionalidade está desativada por padrão. Para mais informações, por favor leia a documentação.", @@ -391,6 +394,7 @@ "allow_edits": "Permitir edições", "allow_public_user_to_download": "Permitir que utilizadores públicos façam transferências", "allow_public_user_to_upload": "Permitir que utilizadores públicos façam carregamentos", + "alt_text_qr_code": "Imagem do código QR", "anti_clockwise": "Sentido anti-horário", "api_key": "Chave de API", "api_key_description": "Este valor será apresentado apenas uma única vez. Por favor, certifique-se que o copiou antes de fechar a janela.", @@ -481,6 +485,7 @@ "comments_are_disabled": "Comentários estão desativados", "confirm": "Confirmar", "confirm_admin_password": "Confirmar palavra-passe de administrador", + "confirm_delete_face": "Tem a certeza de que deseja remover o rosto de {name} deste ficheiro?", "confirm_delete_shared_link": "Tem a certeza de que deseja eliminar este link partilhado?", "confirm_keep_this_delete_others": "Todos os outros ficheiros na pilha serão eliminados, exceto este ficheiro. Tem a certeza de que deseja continuar?", "confirm_password": "Confirmar a palavra-passe", @@ -533,6 +538,7 @@ "delete_album": "Eliminar álbum", "delete_api_key_prompt": "Tem a certeza de que deseja eliminar esta chave de API?", "delete_duplicates_confirmation": "Tem a certeza de que deseja eliminar permanentemente estes itens duplicados?", + "delete_face": "Remover rosto", "delete_key": "Eliminar chave", "delete_library": "Eliminar Biblioteca", "delete_link": "Eliminar link", @@ -600,6 +606,7 @@ "enabled": "Ativado", "end_date": "Data final", "error": "Erro", + "error_delete_face": "Falha ao remover rosto do ficheiro", "error_loading_image": "Erro ao carregar a imagem", "error_title": "Erro - Algo correu mal", "errors": { @@ -884,6 +891,7 @@ "month": "Mês", "more": "Mais", "moved_to_trash": "Enviado para a reciclagem", + "mute_memories": "Silenciar Memórias", "my_albums": "Os meus álbuns", "name": "Nome", "name_or_nickname": "Nome ou alcunha", @@ -1076,6 +1084,8 @@ "removed_from_archive": "Removido do arquivo", "removed_from_favorites": "Removido dos favoritos", "removed_from_favorites_count": "{count, plural, other {Removidos #}} dos favoritos", + "removed_memory": "Memória removida", + "removed_photo_from_memory": "Foto removida da memória", "removed_tagged_assets": "Removida a etiqueta de {count, plural, one {# ficheiro} other {# ficheiros}}", "rename": "Mudar o nome", "repair": "Reparar", @@ -1084,6 +1094,7 @@ "repository": "Repositório", "require_password": "Proteger com palavra-passe", "require_user_to_change_password_on_first_login": "Obrigar utilizador a alterar a palavra-passe após o primeiro início de sessão", + "rescan": "Reescanear", "reset": "Redefinir", "reset_password": "Redefinir palavra-passe", "reset_people_visibility": "Redefinir pessoas ocultas", @@ -1127,6 +1138,7 @@ "search_options": "Opções de pesquisa", "search_people": "Pesquisar pessoas", "search_places": "Pesquisar lugares", + "search_rating": "Pesquisar por classificação...", "search_settings": "Definições de pesquisa", "search_state": "Pesquisar estado/distrito...", "search_tags": "Pesquisar etiquetas...", @@ -1250,6 +1262,7 @@ "tag_created": "Criada a etiqueta {tag}", "tag_feature_description": "A mostrar fotos e videos agrupados por tópicos lógicos de etiquetas", "tag_not_found_question": "Não consegue encontrar a etiqueta? Crie uma nova etiqueta.", + "tag_people": "Etiquetar Pessoas", "tag_updated": "Atualizada a etiqueta: {tag}", "tagged_assets": "Etiquetado {count, plural, one {# ficheiros} other {# ficheiros}}", "tags": "Etiquetas", @@ -1290,6 +1303,7 @@ "unlink_motion_video": "Remover relação com video animado", "unlink_oauth": "Desvincular OAuth", "unlinked_oauth_account": "Conta OAuth desvinculada", + "unmute_memories": "Ativar som das memórias", "unnamed_album": "Álbum sem nome", "unnamed_album_delete_confirmation": "Tem a certeza de que pretende eliminar este álbum?", "unnamed_share": "Partilha sem nome", @@ -1343,6 +1357,7 @@ "view_all": "Ver tudo", "view_all_users": "Ver todos os utilizadores", "view_in_timeline": "Ver na linha do tempo", + "view_link": "Ver link", "view_links": "Ver links", "view_name": "Ver", "view_next_asset": "Ver próximo ficheiro", diff --git a/i18n/pt_BR.json b/i18n/pt_BR.json index d826997f5e..f9cf84476f 100644 --- a/i18n/pt_BR.json +++ b/i18n/pt_BR.json @@ -41,6 +41,7 @@ "backup_settings": "Configurações de backup", "backup_settings_description": "Gerenciar configurações de backup do banco de dados", "check_all": "Selecionar Tudo", + "cleanup": "Limpeza", "cleared_jobs": "Tarefas removidas de: {job}", "config_set_by_file": "A configuração está atualmente definida por um arquivo de configuração", "confirm_delete_library": "Você tem certeza que deseja excluir a biblioteca {library} ?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Habilitar verificação periódica da biblioteca", "library_settings": "Biblioteca Externa", "library_settings_description": "Gerenciar configurações de biblioteca externa", - "library_tasks_description": "Execute tarefas de biblioteca", + "library_tasks_description": "Escanear bibliotecas externas para ativos novos ou modificados", "library_watching_enable_description": "Observe bibliotecas externas para alterações de arquivos", "library_watching_settings": "Observação de biblioteca (EXPERIMENTAL)", "library_watching_settings_description": "Observe automaticamente os arquivos alterados", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Buscar imagens semanticamente usando integrações CLIP", "machine_learning_smart_search_enabled": "Habilitar a Pesquisa Inteligente", "machine_learning_smart_search_enabled_description": "Se desativado, as imagens não serão codificadas para pesquisa inteligente.", - "machine_learning_url_description": "A URL do servidor de aprendizado de máquina. Se mais de uma URL for fornecida, elas serão tentadas, uma de cada vez e na ordem indicada, até que uma responda com sucesso.", + "machine_learning_url_description": "A URL do servidor de aprendizado de máquina. Se mais de uma URL for fornecida, elas serão tentadas, uma de cada vez e na ordem indicada, até que uma responda com sucesso. Servidores que não responderem serão ignorados temporariamente até voltarem a estar conectados.", "manage_concurrency": "Gerenciar simultaneidade", "manage_log_settings": "Gerenciar configurações de registro", "map_dark_style": "Tema Escuro", @@ -147,6 +148,8 @@ "map_settings": "Mapa", "map_settings_description": "Gerenciar configurações do mapa", "map_style_description": "URL para um tema de mapa style.json", + "memory_cleanup_job": "Limpeza de memórias", + "memory_generate_job": "Criação de memórias", "metadata_extraction_job": "Extrair metadados", "metadata_extraction_job_description": "Extraia informações dos metadados de cada arquivo, como GPS, rostos e resolução", "metadata_faces_import_setting": "Ativar a importação de rostos", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "Ativa a verificação de hash, não desative a menos que você tenha certeza das implicações", "storage_template_migration": "Migração de modelo de armazenamento", "storage_template_migration_description": "Aplique o {template} atual aos arquivos carregados anteriormente", - "storage_template_migration_info": "As mudanças no modelo serão aplicadas apenas aos novos arquivos. Para aplicar retroativamente o modelo aos arquivos carregados anteriormente, execute o {job}.", + "storage_template_migration_info": "O modelo altera todas extensões para minúsculo. As mudanças no modelo serão aplicadas apenas em novos arquivos. Para aplicar retroativamente o modelo aos arquivos carregados anteriormente, execute o {job}.", "storage_template_migration_job": "Tarefa de Migração de Modelo de Armazenamento", "storage_template_more_details": "Para mais detalhes sobre este recurso, consulte o Modelo de Armazenamento e suas implicações", "storage_template_onboarding_description": "Quando ativado, este recurso organizará automaticamente os arquivos com base em um modelo definido pelo usuário. Devido a problemas de estabilidade, o recurso está desativado por padrão. Para mais informações, consulte a documentação.", @@ -391,6 +394,7 @@ "allow_edits": "Permitir edições", "allow_public_user_to_download": "Permitir que usuários públicos baixem os arquivos", "allow_public_user_to_upload": "Permitir que usuários públicos enviem novos arquivos", + "alt_text_qr_code": "Imagem do código QR", "anti_clockwise": "Anti-horário", "api_key": "Chave de API", "api_key_description": "Este valor será mostrado apenas uma vez. Por favor, certifique-se de copiá-lo antes de fechar a janela.", @@ -481,6 +485,7 @@ "comments_are_disabled": "Comentários estão desativados", "confirm": "Confirmar", "confirm_admin_password": "Confirmar senha de administrador", + "confirm_delete_face": "Tem certeza que deseja remover a face de {name} deste arquivo?", "confirm_delete_shared_link": "Tem certeza de que deseja excluir este link compartilhado?", "confirm_keep_this_delete_others": "Todos os outros arquivos da pilha serão excluídos, exceto este arquivo. Tem certeza de que deseja continuar?", "confirm_password": "Confirme a senha", @@ -533,6 +538,7 @@ "delete_album": "Excluir álbum", "delete_api_key_prompt": "Tem certeza de que deseja excluir esta chave de API?", "delete_duplicates_confirmation": "Tem certeza de que deseja excluir permanentemente estas duplicidades?", + "delete_face": "Remover face", "delete_key": "Excluir chave", "delete_library": "Excluir biblioteca", "delete_link": "Excluir link", @@ -600,6 +606,7 @@ "enabled": "Habilitado", "end_date": "Data final", "error": "Erro", + "error_delete_face": "Erro ao remover face do arquivo", "error_loading_image": "Erro ao carregar a página", "error_title": "Erro - Algo deu errado", "errors": { @@ -884,6 +891,7 @@ "month": "Mês", "more": "Mais", "moved_to_trash": "Enviado para a lixeira", + "mute_memories": "Silenciar memórias", "my_albums": "Meus Álbuns", "name": "Nome", "name_or_nickname": "Nome ou apelido", @@ -1076,6 +1084,8 @@ "removed_from_archive": "Removido do arquivo", "removed_from_favorites": "Removido dos favoritos", "removed_from_favorites_count": "{count, plural, one {# Removido} other {# Removidos}} dos favoritos", + "removed_memory": "Memória removida", + "removed_photo_from_memory": "Foto removida da memória", "removed_tagged_assets": "Tag removida de {count, plural, one {# arquivo} other {# arquivos}}", "rename": "Renomear", "repair": "Reparar", @@ -1084,6 +1094,7 @@ "repository": "Repositório", "require_password": "Proteger com senha", "require_user_to_change_password_on_first_login": "Obrigar usuário a alterar a senha após primeiro login", + "rescan": "Reescanear", "reset": "Resetar", "reset_password": "Resetar senha", "reset_people_visibility": "Resetar pessoas ocultas", @@ -1127,6 +1138,7 @@ "search_options": "Opções de pesquisa", "search_people": "Pesquisar pessoas", "search_places": "Pesquisar lugares", + "search_rating": "Pesquisar por classificação...", "search_settings": "Configurações de pesquisa", "search_state": "Pesquisar estado...", "search_tags": "Procurar tags...", @@ -1250,6 +1262,7 @@ "tag_created": "Tag foi criada: {tag}", "tag_feature_description": "Visualizar fotos e videos agrupados pelo tópico da tag", "tag_not_found_question": "Não consegue encontrar a tag? Crie uma tag nova aqui.", + "tag_people": "Marcar pessoas", "tag_updated": "Tag foi atualizada: {tag}", "tagged_assets": "{count, plural, one {# arquivo marcado} other {# arquivos marcados}} com a tag", "tags": "Tags", @@ -1290,6 +1303,7 @@ "unlink_motion_video": "Remover relação com video animado", "unlink_oauth": "Desvincular OAuth", "unlinked_oauth_account": "Conta OAuth desvinculada", + "unmute_memories": "Ativar Memórias", "unnamed_album": "Álbum sem nome", "unnamed_album_delete_confirmation": "Tem certeza que deseja excluir este álbum?", "unnamed_share": "Compartilhamento sem nome", @@ -1343,6 +1357,7 @@ "view_all": "Ver tudo", "view_all_users": "Ver todos usuários", "view_in_timeline": "Ver na linha do tempo", + "view_link": "Ver link", "view_links": "Ver links", "view_name": "Ver", "view_next_asset": "Ver próximo arquivo", diff --git a/i18n/ro.json b/i18n/ro.json index 135d647b54..c88b01cd5c 100644 --- a/i18n/ro.json +++ b/i18n/ro.json @@ -299,7 +299,7 @@ "transcoding_max_b_frames": "Număr maxim de cadre B", "transcoding_max_b_frames_description": "Valorile mai mari îmbunătățesc eficiența compresiei, dar încetinesc codarea. Este posibil să nu fie compatibile cu accelerarea hardware pe dispozitivele mai vechi. 0 dezactivează cadrele B, în timp ce -1 setează această valoare automat.", "transcoding_max_bitrate": "Rata de biți maximă", - "transcoding_max_bitrate_description": "Setarea unei rate maxime de biți poate face dimensiunile fișierelor mai previzibile, cu un cost minor asupra calității. La 720p, valorile tipice sunt 2600k pentru VP9 sau HEVC, sau 4500k pentru H.264. Dezactivat dacă este setat la 0.", + "transcoding_max_bitrate_description": "Setarea unei rate maxime de biți poate face dimensiunile fișierelor mai previzibile, cu un cost minor asupra calității. La 720p, valorile tipice sunt 2600 kbit/s pentru VP9 sau HEVC, sau 4500 kbit/s pentru H.264. Dezactivat dacă este setat la 0.", "transcoding_max_keyframe_interval": "Interval maxim între cadre cheie", "transcoding_max_keyframe_interval_description": "Setează distanța maximă între cadrele cheie. Valorile mai mici reduc eficiența compresiei, dar îmbunătățesc timpii de căutare și pot îmbunătăți calitatea în scenele cu mișcare rapidă. 0 setează această valoare automat.", "transcoding_optimal_description": "Videoclipuri cu rezoluție mai mare decât cea țintă sau care nu sunt într-un format acceptat", @@ -1358,4 +1358,4 @@ "yes": "Da", "you_dont_have_any_shared_links": "Nu aveți linkuri partajate", "zoom_image": "Măriți Imaginea" -} +} \ No newline at end of file diff --git a/i18n/ru.json b/i18n/ru.json index f2c191b004..b4a2eadace 100644 --- a/i18n/ru.json +++ b/i18n/ru.json @@ -41,6 +41,7 @@ "backup_settings": "Настройки резервного копирования", "backup_settings_description": "Управление настройками резервного копирования базы данных", "check_all": "Проверить все", + "cleanup": "Очистка", "cleared_jobs": "Очищены задачи для: {job}", "config_set_by_file": "Настроено с помощью файла конфигурации", "confirm_delete_library": "Вы действительно хотите удалить библиотеку \"{library}\"?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Включить периодическое сканирование библиотеки", "library_settings": "Внешняя библиотека", "library_settings_description": "Управление внешними библиотеками", - "library_tasks_description": "Выполняет задания библиотеки", + "library_tasks_description": "Сканирование внешних библиотек на наличие новых и/или изменённых объектов", "library_watching_enable_description": "Отслеживать изменения файлов внешней библиотеки", "library_watching_settings": "Слежение за библиотекой (ЭКСПЕРИМЕНТАЛЬНОЕ)", "library_watching_settings_description": "Автоматически следить за изменениями файлов", @@ -147,6 +148,8 @@ "map_settings": "Настройки карты", "map_settings_description": "Управление настройками карты", "map_style_description": "URL-адрес темы карты style.json", + "memory_cleanup_job": "Очистка воспоминаний", + "memory_generate_job": "Создание воспоминаний", "metadata_extraction_job": "Извлечение метаданных", "metadata_extraction_job_description": "Извлекает метаданные из каждого файла, такие как местоположение, лица и разрешение", "metadata_faces_import_setting": "Включить импорт лиц", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "Включает проверку хэша, не отключайте ее, если вы не уверены в последствиях", "storage_template_migration": "Применение шаблона хранилища", "storage_template_migration_description": "Применяет текущий {template} к ранее загруженным ресурсам", - "storage_template_migration_info": "Изменения в шаблоне будут применяться только к новым ресурсам. Чтобы применить шаблон к ранее загруженным ресурсам, запустите {job}.", + "storage_template_migration_info": "Расширения файлов всегда будут сохраняться в нижнем регистре. Изменения в шаблоне будут применяться только к новым ресурсам. Чтобы применить шаблон к ранее загруженным ресурсам, запустите {job}.", "storage_template_migration_job": "Задание миграции шаблона хранилища", "storage_template_more_details": "Для получения дополнительной информации об этой функции обратитесь к Шаблону хранилища и месту его хранения", "storage_template_onboarding_description": "При включении этой функции файлы будут автоматически организованы в соответствии с пользовательским шаблоном. Из-за проблем со стабильностью функция по умолчанию отключена. Дополнительную информацию можно найти в документации.", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "Максимально промежуточных кадров", "transcoding_max_b_frames_description": "Более высокие значения повышают эффективность сжатия, но замедляют кодирование. Может быть несовместимо с аппаратным ускорением на старых устройствах. 0 отключает B-кадры, а -1 устанавливает это значение автоматически.", "transcoding_max_bitrate": "Максимальный битрейт", - "transcoding_max_bitrate_description": "Установка максимального битрейта может сделать размер файла более предсказуемым при незначительном снижении качества. При 720p типичными значениями являются 2600k для VP9 или HEVC или 4500k для H.264. Отключено, если установлено значение 0.", + "transcoding_max_bitrate_description": "Установка максимального битрейта может сделать размер файла более предсказуемым при незначительном снижении качества. При 720p типичными значениями являются 2600 kbit/s для VP9 или HEVC или 4500 kbit/s для H.264. Отключено, если установлено значение 0.", "transcoding_max_keyframe_interval": "Максимальный интервал ключевых кадров", "transcoding_max_keyframe_interval_description": "Устанавливает максимальное расстояние между ключевыми кадрами. Более низкие значения ухудшают эффективность сжатия, но сокращают время поиска и могут улучшить качество в сценах с быстрым движением. 0 устанавливает это значение автоматически.", "transcoding_optimal_description": "Видео с разрешением выше целевого или не в принятом формате", @@ -358,7 +361,7 @@ }, "admin_email": "Электронная почта администратора", "admin_password": "Пароль администратора", - "administration": "Управление", + "administration": "Управление сервером", "advanced": "Расширенные", "age_months": "Возраст {months, plural, one {# месяц} few {# месяца} many {# месяцев} other {# месяца}}", "age_year_months": "Возраст 1 год, {months, plural, one {# месяц} few {# месяца} many {# месяцев} other {# месяца}}", @@ -391,6 +394,7 @@ "allow_edits": "Разрешить редактирование", "allow_public_user_to_download": "Разрешить скачивание публичным пользователям", "allow_public_user_to_upload": "Разрешить публичным пользователям загружать файлы", + "alt_text_qr_code": "QR-код", "anti_clockwise": "Против часовой", "api_key": "API Ключ", "api_key_description": "Это значение будет показано только один раз. Пожалуйста, убедитесь, что скопировали его перед закрытием окна.", @@ -481,6 +485,7 @@ "comments_are_disabled": "Комментарии отключены", "confirm": "Подтвердить", "confirm_admin_password": "Подтвердите пароль Администратора", + "confirm_delete_face": "Вы точно хотите удалить лицо {name} из объекта?", "confirm_delete_shared_link": "Вы уверены, что хотите удалить эту публичную ссылку?", "confirm_keep_this_delete_others": "Все остальные объекты в группе будут удалены, кроме этого объекта. Вы уверены, что хотите продолжить?", "confirm_password": "Подтвердите пароль", @@ -533,6 +538,7 @@ "delete_album": "Удалить альбом", "delete_api_key_prompt": "Вы уверены, что хотите удалить этот ключ API?", "delete_duplicates_confirmation": "Вы уверены, что хотите навсегда удалить эти дубликаты?", + "delete_face": "Удалить лицо", "delete_key": "Удалить ключ", "delete_library": "Удалить библиотеку", "delete_link": "Удалить ссылку", @@ -600,6 +606,7 @@ "enabled": "Включено", "end_date": "Дата окончания", "error": "Ошибка", + "error_delete_face": "Ошибка при удалении лица из объекта", "error_loading_image": "Ошибка при загрузке изображения", "error_title": "Ошибка - Что-то пошло не так", "errors": { @@ -884,6 +891,7 @@ "month": "Месяц", "more": "Больше", "moved_to_trash": "Перенесено в корзину", + "mute_memories": "Отключить звук", "my_albums": "Мои альбомы", "name": "Имя", "name_or_nickname": "Имя или ник", @@ -979,6 +987,7 @@ "permanently_deleted_asset": "Удалить навсегда", "permanently_deleted_assets_count": "Безвозвратно удалено {count, plural, one {# файл} few {# файла} many {# файлов} other {# файлов}}", "person": "Человек", + "person_birthdate": "Дата рождения: {date}", "person_hidden": "{name}{hidden, select, true { (скрыт)} other {}}", "photo_shared_all_users": "Похоже, что вы поделились своими фотографиями со всеми пользователями или у вас нет пользователей, с которыми можно поделиться.", "photos": "Фото", @@ -1076,6 +1085,8 @@ "removed_from_archive": "Удален из архива", "removed_from_favorites": "Удалено из избранного", "removed_from_favorites_count": "{count, plural, other {Удалено #}} из избранного", + "removed_memory": "Удалить воспоминание", + "removed_photo_from_memory": "Удалить фото из воспоминания", "removed_tagged_assets": "Тег для {count, plural, one {# объекта} other {# объектов}} удален", "rename": "Переименовать", "repair": "Ремонт", @@ -1084,6 +1095,7 @@ "repository": "Репозиторий", "require_password": "Требуется пароль", "require_user_to_change_password_on_first_login": "Требовать у пользователя сменить пароль при первом входе", + "rescan": "Повторное сканирование", "reset": "Сброс", "reset_password": "Сброс пароля", "reset_people_visibility": "Восстановить видимость людей", @@ -1127,6 +1139,7 @@ "search_options": "Параметры поиска", "search_people": "Поиск людей", "search_places": "Поиск мест", + "search_rating": "Поиск по рейтингу...", "search_settings": "Настройки поиска", "search_state": "Поиск региона...", "search_tags": "Поиск по тегам...", @@ -1250,6 +1263,7 @@ "tag_created": "Тег {tag} создан", "tag_feature_description": "Просмотр фотографий и видео, сгруппированных по тегам", "tag_not_found_question": "Не удается найти тег? Создайте новый тег.", + "tag_people": "Тег людей", "tag_updated": "Тег {tag} изменен", "tagged_assets": "Помечено {count, plural, one {# объект} other {# объектов}}", "tags": "Теги", @@ -1290,6 +1304,7 @@ "unlink_motion_video": "Отсоединить движущееся видео", "unlink_oauth": "Отключить OAuth", "unlinked_oauth_account": "Отключить аккаунт OAuth", + "unmute_memories": "Включить звук", "unnamed_album": "Альбом без названия", "unnamed_album_delete_confirmation": "Вы уверены, что хотите удалить этот альбом?", "unnamed_share": "Общий доступ без названия", @@ -1343,6 +1358,7 @@ "view_all": "Посмотреть всё", "view_all_users": "Показать всех пользователей", "view_in_timeline": "Показать на временной шкале", + "view_link": "Показать ссылку", "view_links": "Показать ссылки", "view_name": "Посмотреть", "view_next_asset": "Показать следующий объект", @@ -1359,4 +1375,4 @@ "yes": "Да", "you_dont_have_any_shared_links": "У вас нет публичных ссылок", "zoom_image": "Приблизить" -} +} \ No newline at end of file diff --git a/i18n/sk.json b/i18n/sk.json index 5b958ab431..ab5c7d3f53 100644 --- a/i18n/sk.json +++ b/i18n/sk.json @@ -1,5 +1,5 @@ { - "about": "O Immich", + "about": "O aplikácii", "account": "Účet", "account_settings": "Nastavenia účtu", "acknowledge": "Rozumiem", @@ -20,7 +20,7 @@ "add_partner": "Pridať partnera", "add_path": "Pridať cestu", "add_photos": "Pridať fotografie", - "add_to": "Pridať do...", + "add_to": "Pridať do…", "add_to_album": "Pridať do albumu", "add_to_shared_album": "Pridať do zdieľaného albumu", "add_url": "Pridať URL", @@ -41,6 +41,7 @@ "backup_settings": "Nastavenia zálohovania", "backup_settings_description": "Spravovať nastavenia záloh", "check_all": "Skontrolovať všetko", + "cleanup": "Vyčistenie", "cleared_jobs": "Hotové úlohy pre: {job}", "config_set_by_file": "Konfigurácia je v súčasnosti nastavená konfiguračným súborom", "confirm_delete_library": "Naozaj chcete vymazať knižnicu {library}?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Zapnúť pravidelné skenovanie knižnice", "library_settings": "Externá knižnica", "library_settings_description": "Spravovať nastavenia externej knižnice", - "library_tasks_description": "Vykonať úlohy knižnice", + "library_tasks_description": "Vyhľadávanie nových alebo zmenených položiek v externých knižniciach", "library_watching_enable_description": "Sledovať externé knižnice pre zmeny v súboroch", "library_watching_settings": "Sledovanie knižnice (EXPERIMENTÁLNE)", "library_watching_settings_description": "Automaticky sledovať zmenené súbory", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Významové vyhľadávanie v obrázkoch pomocou CLIP vzorov", "machine_learning_smart_search_enabled": "Povoliť inteligentné vyhľadávanie", "machine_learning_smart_search_enabled_description": "Ak je vypnuté, obrázky nebudú spracované pre inteligentné vyhľadávanie.", - "machine_learning_url_description": "URL adresa machine-learning servera. Ak je poskytnutých viacero URL adries, budú servery postupne testované od prvého po posledný, až kým jeden z nich úspešne odpovie.", + "machine_learning_url_description": "URL adresa servera strojového učenia. Ak je zadaných viacero adries URL, každý server bude testovaný postupne, kým jeden z nich neodpovie úspešne, v poradí od prvého po posledný. Servery, ktoré neodpovedajú, budú dočasne ignorované, kým nebudú opäť online.", "manage_concurrency": "Správa súbežnosti", "manage_log_settings": "Spravovať nastavenia logovania", "map_dark_style": "Tmavý štýl", @@ -147,6 +148,8 @@ "map_settings": "Mapa", "map_settings_description": "Spravovať nastavenia mapy", "map_style_description": "URL na motív style.json", + "memory_cleanup_job": "Vymazávanie spomienok", + "memory_generate_job": "Vytváranie spomienok", "metadata_extraction_job": "Extrahovať metadáta", "metadata_extraction_job_description": "Vytiahne metadáta z každej položky, ako napríklad GPS, tváre a rozlíšenie", "metadata_faces_import_setting": "Povoliť import tváre", @@ -219,7 +222,7 @@ "reset_settings_to_default": "Obnoviť pôvodné nastavenia", "reset_settings_to_recent_saved": "Obnoviť naposledy uložené nastavenia", "scanning_library": "Knižnica sa skenuje", - "search_jobs": "Vyhľadať úlohy...", + "search_jobs": "Vyhľadať úlohy…", "send_welcome_email": "Odoslať uvítací e-mail", "server_external_domain_settings": "Externá doména", "server_external_domain_settings_description": "Verejná doména pre zdieľané odkazy, vrátane http(s)://", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "Maximálny počet B-snímkov", "transcoding_max_b_frames_description": "Vyššie hodnoty zvyšujú účinnosť kompresie, ale spomaľujú kódovanie. Nemusí byť kompatibilný s hardvérovou akceleráciou na starších zariadeniach. Hodnota 0 zakáže B-snímky, zatiaľ čo -1 nastaví túto hodnotu automaticky.", "transcoding_max_bitrate": "Maximálna bitová rýchlosť", - "transcoding_max_bitrate_description": "Nastavenie maximálneho dátového toku môže zvýšiť predvídateľnosť veľkosti súborov za cenu menšieho zníženia kvality. Pri rozlíšení 720p sú typické hodnoty 2600k pre VP9 alebo HEVC alebo 4500k pre H.264. Zakázané, ak je nastavená hodnota 0.", + "transcoding_max_bitrate_description": "Nastavenie maximálneho dátového toku môže zvýšiť predvídateľnosť veľkosti súborov za cenu menšieho zníženia kvality. Pri rozlíšení 720p sú typické hodnoty 2600 kbit/s pre VP9 alebo HEVC alebo 4500 kbit/s pre H.264. Zakázané, ak je nastavená hodnota 0.", "transcoding_max_keyframe_interval": "Maximálny interval medzi kľúčovými snímkami", "transcoding_max_keyframe_interval_description": "Nastavuje maximálnu vzdialenosť medzi kľúčovými snímkami. Nižšie hodnoty zhoršujú účinnosť kompresie, ale zlepšujú časy vyhľadávania a môžu zlepšiť kvalitu v scénach s rýchlym pohybom. Hodnota 0 nastavuje túto hodnotu automaticky.", "transcoding_optimal_description": "Videá s vyšším ako cieľovým rozlíšením alebo videá, ktoré nie sú v prijateľnom formáte", @@ -391,6 +394,7 @@ "allow_edits": "Povoliť úpravy", "allow_public_user_to_download": "Povoľte verejnému používateľovi sťahovať", "allow_public_user_to_upload": "Umožniť verejnému používateľovi nahrávať", + "alt_text_qr_code": "Obrázok QR kódu", "anti_clockwise": "Proti smeru hodinových ručičiek", "api_key": "API Klúč", "api_key_description": "Táto hodnota sa zobrazí iba raz. Pred zatvorením okna ju určite skopírujte.", @@ -406,17 +410,17 @@ "are_these_the_same_person": "Ide o tú istú osobu?", "are_you_sure_to_do_this": "Ste si istý, že to chcete urobiť?", "asset_added_to_album": "Pridané do albumu", - "asset_adding_to_album": "Pridáva sa do albumu...", + "asset_adding_to_album": "Pridáva sa do albumu…", "asset_description_updated": "Popis média bol aktualizovaný", "asset_filename_is_offline": "Médium {filename} je offline", "asset_has_unassigned_faces": "Položka má nepriradené tváre", - "asset_hashing": "Hašovanie...", + "asset_hashing": "Hašovanie…", "asset_offline": "Médium je offline", "asset_offline_description": "Toto externý obsah sa už nenachádza na disku. Požiadajte o pomoc svojho správcu Immich.", "asset_skipped": "Preskočené", "asset_skipped_in_trash": "V koši", "asset_uploaded": "Nahrané", - "asset_uploading": "Nahráva sa...", + "asset_uploading": "Nahráva sa…", "assets": "Položky", "assets_added_count": "{count, plural, one {Pridaná # položka} few {Pridané # položky} other {Pridaných # položek}}", "assets_added_to_album_count": "Do albumu {count, plural, one {bola pridaná # položka} few {boli pridané # položky} other {bolo pridaných # položiek}}", @@ -481,6 +485,7 @@ "comments_are_disabled": "Komentáre sú vypnuté", "confirm": "Potvrdiť", "confirm_admin_password": "Potvrdiť Administrátorské Heslo", + "confirm_delete_face": "Naozaj chcete z položky odstrániť tvár osoby {name}?", "confirm_delete_shared_link": "Ste si istý, že chcete odstrániť tento zdieľaný odkaz?", "confirm_keep_this_delete_others": "Všetky ostatné položky v zásobníku budú odstránené okrem tejto položky. Naozaj chcete pokračovať?", "confirm_password": "Potvrdiť heslo", @@ -533,6 +538,7 @@ "delete_album": "Odstrániť album", "delete_api_key_prompt": "Naozaj chcete odstrániť tento API kľúč?", "delete_duplicates_confirmation": "Naozaj chcete nenávratne odstrániť tieto duplikáty?", + "delete_face": "Odstrániť tvár", "delete_key": "Odstrániť kľúč", "delete_library": "Vymazať knižnicu", "delete_link": "Odstrániť odkaz", @@ -600,6 +606,7 @@ "enabled": "Aktivovaný", "end_date": "Koncový dátum", "error": "Chyba", + "error_delete_face": "Chyba pri odstraňovaní tváre z položky", "error_loading_image": "Nepodarilo sa načítať obrázok", "error_title": "Chyba - niečo sa pokazilo", "errors": { @@ -766,8 +773,10 @@ "go_to_folder": "Prejsť do priečinka", "go_to_search": "Prejsť na vyhľadávanie", "group_albums_by": "Zoskupiť albumy podľa...", + "group_country": "Zoskupenie podľa krajiny", "group_no": "Nezoskupovať", "group_owner": "Zoskupiť podľa vlastníka", + "group_places_by": "Zoskupte miesta podľa...", "group_year": "Zoskupiť podľa roku", "has_quota": "Má kvótu", "hi_user": "Ahoj {name} ({email})", @@ -800,6 +809,7 @@ "include_shared_albums": "Zahrnúť zdieľané albumy", "include_shared_partner_assets": "Vrátane zdieľaných položiek partnera", "individual_share": "Zdieľanie jednotlivých položiek", + "individual_shares": "Individuálne zdieľanie", "info": "Informácie", "interval": { "day_at_onepm": "Každý deň v 13:00", @@ -881,6 +891,7 @@ "month": "Mesiac", "more": "Viac", "moved_to_trash": "Presunuté do koša", + "mute_memories": "Vyblednutie spomienok", "my_albums": "Moje albumy", "name": "Meno", "name_or_nickname": "Meno alebo prezývka", @@ -985,6 +996,7 @@ "pick_a_location": "Vyberte miesto", "place": "Miesto", "places": "Miesta", + "places_count": "{count, plural, one {{count, number} miesto} few {{count, number} miesta} other {{count, number} miest}}", "play": "Prehrať", "play_memories": "Prehrať spomienky", "play_motion_photo": "Prehrať pohyblivú fotku", @@ -1072,6 +1084,8 @@ "removed_from_archive": "Odstránené z archívu", "removed_from_favorites": "Odstránené z obľúbených", "removed_from_favorites_count": "{count, plural, other {Odstránených #}} z obľúbených", + "removed_memory": "Odstránená pamäť", + "removed_photo_from_memory": "Fotografia odstránená z pamäte", "removed_tagged_assets": "Odstránená značka z {count, plural, one {# položky} other {# položiek}}", "rename": "Premenovať", "repair": "Opraviť", @@ -1080,6 +1094,7 @@ "repository": "Repozitár", "require_password": "Vyžadovať heslo", "require_user_to_change_password_on_first_login": "Vyžadovať zmenu hesla po prvom prihlásení", + "rescan": "Opätovné vyhľadávanie", "reset": "Resetovať", "reset_password": "Obnoviť heslo", "reset_people_visibility": "Resetovať viditeľnosť ľudí", @@ -1108,6 +1123,8 @@ "search": "Hľadať", "search_albums": "Hľadať albumy", "search_by_context": "Hľadať s kontextom", + "search_by_description": "Vyhľadávanie podľa popisu", + "search_by_description_example": "Pešia turistika v Sape", "search_by_filename": "Hľadať s názvom alebo príponou súboru", "search_by_filename_example": "napr. IMG_1234.JPG alebo PNG", "search_camera_make": "Hľadať značku fotoaparátu...", @@ -1121,6 +1138,7 @@ "search_options": "Možnosti hľadania", "search_people": "Hľadať osoby", "search_places": "Hľadať miesta", + "search_rating": "Vyhľadávanie podľa hodnotenia...", "search_settings": "Hľadať v nastaveniach", "search_state": "Hľadať štáty...", "search_tags": "Hľadať štítky...", @@ -1167,6 +1185,7 @@ "shared_from_partner": "Fotky od {partner}", "shared_link_options": "Možnosti zdieľaných odkazov", "shared_links": "Zdieľané odkazy", + "shared_links_description": "Zdieľanie fotografií a videí pomocou odkazu", "shared_photos_and_videos_count": "{assetCount, plural, other {# zdieľané fotky a videá.}}", "shared_with_partner": "Zdieľané s {partner}", "sharing": "Zdieľanie", @@ -1189,6 +1208,7 @@ "show_person_options": "Zobrazí možnosti osoby", "show_progress_bar": "Zobrazí ukazovateľ priebehu", "show_search_options": "Zobraziť možnosti vyhľadávania", + "show_shared_links": "Zobraziť zdieľané odkazy", "show_slideshow_transition": "Zobrazí prechody v prezentácii", "show_supporter_badge": "Odznak podporovateľa", "show_supporter_badge_description": "Zobraziť odznak podporovateľa", @@ -1220,7 +1240,7 @@ "stacktrace": "Výpis zásobníku", "start": "Štart", "start_date": "Začiatočný dátum", - "state": "Stav", + "state": "Štát", "status": "Stav", "stop_motion_photo": "Stopmotion fotka", "stop_photo_sharing": "Zastaviť zdieľanie vašich fotiek?", @@ -1242,6 +1262,7 @@ "tag_created": "Vytvorená značka: {tag}", "tag_feature_description": "Prehliadanie fotiek a videá zoskupených podľa tematických značiek", "tag_not_found_question": "Neviete nájsť značku? Vytvorte novú značku.", + "tag_people": "Označiť ľudí", "tag_updated": "Upravená značka: {tag}", "tagged_assets": "Značka priradená {count, plural, one {# položke} other {# položkám}}", "tags": "Štítky", @@ -1276,11 +1297,13 @@ "unfavorite": "Odznačiť ako obľúbené", "unhide_person": "Odkryť osobu", "unknown": "Neznáme", + "unknown_country": "Neznámy štát", "unknown_year": "Neznámy rok", "unlimited": "Neobmedzené", "unlink_motion_video": "Odpojiť pohyblivé video", "unlink_oauth": "Odpojiť OAuth", "unlinked_oauth_account": "Odpojiť OAuth účet", + "unmute_memories": "Zrušenie stlmenia spomienok", "unnamed_album": "Nepomenovaný album", "unnamed_album_delete_confirmation": "Ste si istý, že chcete zmazať tento album?", "unnamed_share": "Nepomenované zdieľanie", @@ -1334,6 +1357,7 @@ "view_all": "Zobraziť všetky", "view_all_users": "Zobraziť všetkých používateľov", "view_in_timeline": "Zobraziť v časovej osi", + "view_link": "Zobraziť odkaz", "view_links": "Zobraziť odkazy", "view_name": "Zobraziť", "view_next_asset": "Zobraziť nasledujúci súbor", @@ -1350,4 +1374,4 @@ "yes": "Áno", "you_dont_have_any_shared_links": "Nemáte žiadne zdielané linky", "zoom_image": "Priblížiť obrázok" -} +} \ No newline at end of file diff --git a/i18n/sl.json b/i18n/sl.json index 2e576dc5ec..c14c3ca3c9 100644 --- a/i18n/sl.json +++ b/i18n/sl.json @@ -41,6 +41,7 @@ "backup_settings": "Nastavitve varnostnega kopiranja", "backup_settings_description": "Upravljanje nastavitev varnostnih kopij", "check_all": "Označi vse", + "cleanup": "Čiščenje", "cleared_jobs": "Razčiščeno opravilo za: {job}", "config_set_by_file": "Konfiguracija je trenutno nastavljena s konfiguracijsko datoteko", "confirm_delete_library": "Ali ste prepričani, da želite izbrisati knjižnico {library}?", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Semantično poiščite slike z uporabo vdelav CLIP", "machine_learning_smart_search_enabled": "Omogoči pametno iskanje", "machine_learning_smart_search_enabled_description": "Če je onemogočeno, slike ne bodo kodirane za pametno iskanje.", - "machine_learning_url_description": "URL strežnika za strojno učenje. Če je na voljo več kot en URL, bo vsak strežnik poskusen posamično, dokler se eden ne odzove uspešno, v vrstnem redu od prvega do zadnjega.", + "machine_learning_url_description": "URL strežnika za strojno učenje. Če je na voljo več kot en URL, bo vsak strežnik poskusen posamično, dokler se eden ne odzove uspešno, v vrstnem redu od prvega do zadnjega. Strežniki, ki se ne odzovejo, bodo začasno prezrti, dokler se spet ne vzpostavijo.", "manage_concurrency": "Upravljanje sočasnosti", "manage_log_settings": "Upravljanje nastavitev dnevnika", "map_dark_style": "Temni način", @@ -147,6 +148,8 @@ "map_settings": "Zemljevid", "map_settings_description": "Upravljanje nastavitev zemljevida", "map_style_description": "URL do teme zemljevida style.json", + "memory_cleanup_job": "Čiščenje pomnilnika", + "memory_generate_job": "Generiranje spomina", "metadata_extraction_job": "Izvleči metapodatke", "metadata_extraction_job_description": "Izvleči informacije iz metapodatkov iz vseh virov, kot so GPS, obrazi in resolucija", "metadata_faces_import_setting": "Omogoči uvoz obraza", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "Največji B-okvirji", "transcoding_max_b_frames_description": "Višje vrednosti izboljšajo učinkovitost stiskanja, vendar upočasnijo kodiranje. Morda ni združljivo s strojnim pospeševanjem na starejših napravah. 0 onemogoči okvirje B, medtem ko -1 samodejno nastavi to vrednost.", "transcoding_max_bitrate": "Največja bitna hitrost", - "transcoding_max_bitrate_description": "Z nastavitvijo največje bitne hitrosti so lahko velikosti datotek bolj predvidljive ob manjši ceni kakovosti. Pri 720p so tipične vrednosti 2600k za VP9 ali HEVC ali 4500k za H.264. Onemogočeno, če je nastavljeno na 0.", + "transcoding_max_bitrate_description": "Z nastavitvijo največje bitne hitrosti so lahko velikosti datotek bolj predvidljive ob manjši ceni kakovosti. Pri 720p so tipične vrednosti 2600 kbit/s za VP9 ali HEVC ali 4500 kbit/s za H.264. Onemogočeno, če je nastavljeno na 0.", "transcoding_max_keyframe_interval": "Največji interval ključnih sličic", "transcoding_max_keyframe_interval_description": "Nastavi največjo razdaljo med ključnimi slikami. Nižje vrednosti poslabšajo učinkovitost stiskanja, vendar izboljšajo čas iskanja in lahko izboljšajo kakovost prizorov s hitrim gibanjem. 0 samodejno nastavi to vrednost.", "transcoding_optimal_description": "Videoposnetki, ki so višji od ciljne ločljivosti ali niso v sprejemljivem formatu", @@ -391,6 +394,7 @@ "allow_edits": "Dovoli urejanja", "allow_public_user_to_download": "Dovoli javnemu uporabniku prenos", "allow_public_user_to_upload": "Dovolite javnemu uporabniku nalaganje", + "alt_text_qr_code": "Slika QR kode", "anti_clockwise": "V nasprotni smeri urnega kazalca", "api_key": "API ključ", "api_key_description": "Ta vrednost bo prikazana samo enkrat. Ne pozabite jo kopirati, preden zaprete okno.", @@ -481,6 +485,7 @@ "comments_are_disabled": "Komentarji so onemogočeni", "confirm": "Potrdi", "confirm_admin_password": "Potrdite skrbniško geslo", + "confirm_delete_face": "Ali ste prepričani, da želite izbrisati obraz osebe {name} iz sredstva?", "confirm_delete_shared_link": "Ali ste prepričani, da želite izbrisati to skupno povezavo?", "confirm_keep_this_delete_others": "Vsa druga sredstva v skladu bodo izbrisana, razen tega sredstva. Ste prepričani, da želite nadaljevati?", "confirm_password": "Potrdi geslo", @@ -533,6 +538,7 @@ "delete_album": "Izbriši album", "delete_api_key_prompt": "Ali ste prepričani, da želite izbrisati ta API ključ?", "delete_duplicates_confirmation": "Ali ste prepričani, da želite trajno izbrisati te dvojnike?", + "delete_face": "Izbriši obraz", "delete_key": "Izbriši ključ", "delete_library": "Izbriši knjižnico", "delete_link": "Izbriši povezavo", @@ -600,6 +606,7 @@ "enabled": "Omogočeno", "end_date": "Končni datum", "error": "Napaka", + "error_delete_face": "Napaka pri brisanju obraza iz sredstva", "error_loading_image": "Napaka pri nalaganju slike", "error_title": "Napaka - nekaj je šlo narobe", "errors": { @@ -884,6 +891,7 @@ "month": "Mesec", "more": "Več", "moved_to_trash": "Premaknjeno v smetnjak", + "mute_memories": "Utišaj spomine", "my_albums": "Moji albumi", "name": "Ime", "name_or_nickname": "Ime ali vzdevek", @@ -979,6 +987,7 @@ "permanently_deleted_asset": "Trajno izbrisano sredstvo", "permanently_deleted_assets_count": "Trajno izbrisano {count, plural, one {# sredstvo} two {# sredstvi} few {# sredstva} other {# sredstev}}", "person": "Oseba", + "person_birthdate": "Rojen dne {date}", "person_hidden": "{name}{hidden, select, true { (skrita)} other {}}", "photo_shared_all_users": "Videti je, da ste svoje fotografije delili z vsemi uporabniki ali pa nimate nobenega uporabnika, s katerim bi jih delili.", "photos": "Slike", @@ -1076,6 +1085,8 @@ "removed_from_archive": "Odstranjeno iz arhiva", "removed_from_favorites": "Odstranjeno iz priljubljenih", "removed_from_favorites_count": "{count, plural, other {odstranen/ih #}} iz priljubljenih", + "removed_memory": "Odstranjen spomin", + "removed_photo_from_memory": "Odstranjena fotografija iz spomina", "removed_tagged_assets": "Odstranjena oznaka iz {count, plural, one {# sredstva} other {# sredstev}}", "rename": "Preimenuj", "repair": "Popravi", @@ -1084,6 +1095,7 @@ "repository": "Repozitorij", "require_password": "Zahtevaj geslo", "require_user_to_change_password_on_first_login": "Od uporabnika zahtevajte spremembo gesla ob prvi prijavi", + "rescan": "Ponovno skeniraj", "reset": "Ponastavi", "reset_password": "Ponastavi geslo", "reset_people_visibility": "Ponastavi vidnost ljudi", @@ -1127,6 +1139,7 @@ "search_options": "Možnosti iskanja", "search_people": "Iskanje oseb", "search_places": "Iskanje krajev", + "search_rating": "Išči po oceni ...", "search_settings": "Nastavitve iskanja", "search_state": "Iskanje dežele...", "search_tags": "Iskanje oznak...", @@ -1250,6 +1263,7 @@ "tag_created": "Ustvarjena oznaka: {tag}", "tag_feature_description": "Brskanje po fotografijah in videoposnetkih, razvrščenih po temah logičnih oznak", "tag_not_found_question": "Ne najdete oznake? Ustvarite novo oznako.", + "tag_people": "Označi osebe", "tag_updated": "Posodobljena oznaka: {tag}", "tagged_assets": "Označeno {count, plural, one {# sredstvo} two {# sredstvi} few {# sredstva} other {# sredstev}}", "tags": "Oznake", @@ -1290,6 +1304,7 @@ "unlink_motion_video": "Prekini povezavo videoposnetka gibanja", "unlink_oauth": "Prekini povezavo OAuth", "unlinked_oauth_account": "Nepovezan račun OAuth", + "unmute_memories": "Vklopi zvok spominov", "unnamed_album": "Neimenovan album", "unnamed_album_delete_confirmation": "Ali ste prepričani, da želite izbrisati ta album?", "unnamed_share": "Neimenovana skupna raba", @@ -1343,6 +1358,7 @@ "view_all": "Poglej vse", "view_all_users": "Ogled vseh uporabnikov", "view_in_timeline": "Ogled na časovnici", + "view_link": "Odpri povezavo", "view_links": "Ogled povezav", "view_name": "Pogled", "view_next_asset": "Ogled naslednjega sredstva", @@ -1359,4 +1375,4 @@ "yes": "Da", "you_dont_have_any_shared_links": "Nimate nobenih skupnih povezav", "zoom_image": "Povečava slike" -} +} \ No newline at end of file diff --git a/i18n/sr_Cyrl.json b/i18n/sr_Cyrl.json index 6254b53c9a..1771f9c4aa 100644 --- a/i18n/sr_Cyrl.json +++ b/i18n/sr_Cyrl.json @@ -41,6 +41,7 @@ "backup_settings": "Подешавања резервне копије", "backup_settings_description": "Управљајте поставкама резервне копије базе података", "check_all": "Провери све", + "cleanup": "Чишћење", "cleared_jobs": "Очишћени послови за {job}", "config_set_by_file": "Конфигурацију тренутно поставља конфигурациони фајл", "confirm_delete_library": "Да ли стварно желите да избришете библиотеку {library} ?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Омогућите периодично скенирање библиотеке", "library_settings": "Спољна библиотека", "library_settings_description": "Управљајте подешавањима спољне библиотеке", - "library_tasks_description": "Обављај задатке библиотеке", + "library_tasks_description": "Скенирајте спољне библиотеке у потрази за новим и/или промењеним средствима", "library_watching_enable_description": "Пратите спољне библиотеке за промене датотека", "library_watching_settings": "Надгледање библиотеке (ЕКСПЕРИМЕНТАЛНО)", "library_watching_settings_description": "Аутоматски пратите промењене датотеке", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Потражите слике семантички користећи уграђени ЦЛИП", "machine_learning_smart_search_enabled": "Омогућите паметну претрагу", "machine_learning_smart_search_enabled_description": "Ако је oneмогућено, слике неће бити кодиране за паметну претрагу.", - "machine_learning_url_description": "URL сервера за машинско учење. Ако је наведено више од једне URL адресе, сваки сервер ће се покушавати један по један док један не одговори успешно, редом од првог до последњег.", + "machine_learning_url_description": "URL сервера за машинско учење. Ако је наведено више од једне URL адресе, сваки сервер ће се покушавати један по један док један не одговори успешно, редом од првог до последњег. Сервери који не реагују биће привремено занемарени док се не врате на мрежу.", "manage_concurrency": "Управљање паралелношћу", "manage_log_settings": "Управљајте подешавањима евиденције", "map_dark_style": "Тамни стил", @@ -147,6 +148,8 @@ "map_settings": "Подешавање мапе", "map_settings_description": "Управљајте подешавањима мапе", "map_style_description": "УРЛ до style.json мапе тема изгледа", + "memory_cleanup_job": "Чишћење меморије", + "memory_generate_job": "Генерација меморије", "metadata_extraction_job": "Извод метаподатака", "metadata_extraction_job_description": "Извуците информације о метаподацима из сваке датотеке, као што су GPS, лица и резолуција", "metadata_faces_import_setting": "Омогући (enable) увоз лица", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "Омогућава хеш верификацију, не oneмогућавајте ово осим ако нисте сигурни у последице", "storage_template_migration": "Миграција шаблона за складиштење", "storage_template_migration_description": "Примените тренутни {template} на претходно отпремљене елементе", - "storage_template_migration_info": "Промене шаблона ће се применити само на нове датотеке. Да бисте ретроактивно применили шаблон на претходно отпремљене датотеке, покрените {job}.", + "storage_template_migration_info": "Шаблон за складиштење ће претворити све екстензије у мала слова. Промене шаблона ће се применити само на нове датотеке. Да бисте ретроактивно применили шаблон на претходно отпремљене датотеке, покрените {job}.", "storage_template_migration_job": "Посао миграције складишта", "storage_template_more_details": "За више детаља о овој функцији погледајте Шаблон за складиште и његове импликације", "storage_template_onboarding_description": "Када је омогућена, ова функција ће аутоматски организовати датотеке на основу шаблона који дефинише корисник. Због проблема са стабилношћу ова функција је подразумевано искључена. За више информација погледајте документацију.", @@ -391,6 +394,7 @@ "allow_edits": "Дозволи уређење", "allow_public_user_to_download": "Дозволите јавном кориснику да преузме (download-uje)", "allow_public_user_to_upload": "Дозволи јавном кориснику да отпреми (уплоад-ује)", + "alt_text_qr_code": "Слика QR кода", "anti_clockwise": "У смеру супротном од казаљке на сату", "api_key": "АПИ кључ (key)", "api_key_description": "Ова вредност ће бити приказана само једном. Обавезно копирајте пре него што затворите прозор.", @@ -481,6 +485,7 @@ "comments_are_disabled": "Коментари су oneмогућени", "confirm": "Потврдите", "confirm_admin_password": "Потврди Административну Лозинку", + "confirm_delete_face": "Да ли сте сигурни да желите да избришете особу {name} из дела?", "confirm_delete_shared_link": "Да ли сте сигурни да желите да избришете овај дељени link?", "confirm_keep_this_delete_others": "Свe осталe датотекe у групи ће бити избрисанe осим овe датотекe. Да ли сте сигурни да желите да наставите?", "confirm_password": "Поново унеси шифру", @@ -533,6 +538,7 @@ "delete_album": "Обриши албум", "delete_api_key_prompt": "Да ли сте сигурни да желите да избришете овај АПИ кључ (key)?", "delete_duplicates_confirmation": "Да ли сте сигурни да желите да трајно избришете ове дупликате?", + "delete_face": "Избриши особу", "delete_key": "Избриши кључ", "delete_library": "Обриши библиотеку", "delete_link": "Обриши везу", @@ -600,6 +606,7 @@ "enabled": "Омогућено (enabled)", "end_date": "Крајњи датум", "error": "Грешка", + "error_delete_face": "Грешка при брисању особе из дела", "error_loading_image": "Грешка при учитавању слике", "error_title": "Грешка – Нешто је пошло наопако", "errors": { @@ -884,6 +891,7 @@ "month": "Месец", "more": "Више", "moved_to_trash": "Премештено у смеће", + "mute_memories": "Пригуши сећања", "my_albums": "Моји албуми", "name": "Име", "name_or_nickname": "Име или надимак", @@ -1076,6 +1084,8 @@ "removed_from_archive": "Уклоњено из архиве", "removed_from_favorites": "Уклоњено из омиљених (фаворитес)", "removed_from_favorites_count": "{count, plural, other {Уклоњено #}} из омиљених", + "removed_memory": "Уклоњена меморија", + "removed_photo_from_memory": "Слика је уклоњена из меморије", "removed_tagged_assets": "Уклоњена ознака (tag) из {count, plural, one {# датотеке} other {# датотека}}", "rename": "Преименуј", "repair": "Поправи", @@ -1084,6 +1094,7 @@ "repository": "Репозиторијум (Repository)", "require_password": "Потребна лозинка", "require_user_to_change_password_on_first_login": "Захтевати од корисника да промени лозинку при првом пријављивању", + "rescan": "Поново скенирај", "reset": "Ресетовати", "reset_password": "Ресетовати лозинку", "reset_people_visibility": "Ресетујте видљивост особа", @@ -1127,6 +1138,7 @@ "search_options": "Опције претраге", "search_people": "Претражи особе", "search_places": "Претражи места", + "search_rating": "Претрага по оцени...", "search_settings": "Претрага подешавања", "search_state": "Тражи регион...", "search_tags": "Претражи ознаке (tags)...", @@ -1250,6 +1262,7 @@ "tag_created": "Направљена ознака (tag): {tag}", "tag_feature_description": "Прегледавање фотографија и видео снимака груписаних по логичним темама ознака", "tag_not_found_question": "Не можете да пронађете ознаку (tag)? Направите нову ознаку", + "tag_people": "Означите људе", "tag_updated": "Ажурирана ознака (tag): {tag}", "tagged_assets": "Означено (tagged) {count, plural, one {# датотека} other {# датотеке}}", "tags": "Ознаке (tags)", @@ -1290,6 +1303,7 @@ "unlink_motion_video": "Прекините везу са видео снимком", "unlink_oauth": "Прекини везу са Oauth-om", "unlinked_oauth_account": "Опозвана веза OAuth налога", + "unmute_memories": "Укључи успомене", "unnamed_album": "Неименовани албум", "unnamed_album_delete_confirmation": "Да ли сте сигурни да желите да избришете овај албум?", "unnamed_share": "Неименовано делење", @@ -1343,6 +1357,7 @@ "view_all": "Прикажи Све", "view_all_users": "Прикажи све кориснике", "view_in_timeline": "Прикажи у временској линији", + "view_link": "Погледај везу", "view_links": "Прикажи везе", "view_name": "Погледати", "view_next_asset": "Погледајте следећу датотеку", diff --git a/i18n/sr_Latn.json b/i18n/sr_Latn.json index 6efa67c9a4..f6743c012b 100644 --- a/i18n/sr_Latn.json +++ b/i18n/sr_Latn.json @@ -41,6 +41,7 @@ "backup_settings": "Podešavanja rezervne kopije", "backup_settings_description": "Upravljajte postavkama rezervne kopije baze podataka", "check_all": "Proveri sve", + "cleanup": "Čišćenje", "cleared_jobs": "Očišćeni poslovi za: {job}", "config_set_by_file": "Konfiguraciju trenutno postavlja konfiguracioni fajl", "confirm_delete_library": "Da li stvarno želite da izbrišete biblioteku {library} ?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Omogućite periodično skeniranje biblioteke", "library_settings": "Spoljna biblioteka", "library_settings_description": "Upravljajte podešavanjima spoljne biblioteke", - "library_tasks_description": "Obavljaj zadatke biblioteke", + "library_tasks_description": "Skenirajte spoljne biblioteke u potrazi za novim i/ili promenjenim sredstvima", "library_watching_enable_description": "Pratite spoljne biblioteke za promene datoteka", "library_watching_settings": "Nadgledanje biblioteke (EKSPERIMENTALNO)", "library_watching_settings_description": "Automatski pratite promenjene datoteke", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Potražite slike semantički koristeći ugrađeni CLIP", "machine_learning_smart_search_enabled": "Omogućite pametnu pretragu", "machine_learning_smart_search_enabled_description": "Ako je onemogućeno, slike neće biti kodirane za pametnu pretragu.", - "machine_learning_url_description": "URL servera za mašinsko učenje. Ako je obezbeđeno više URL-ova, svaki server će biti pokušan redom, jedan po jedan, dok jedan ne odgovori uspešno, po redosledu od prvog do poslednjeg.", + "machine_learning_url_description": "URL servera za mašinsko učenje. Ako je obezbeđeno više URL-ova, svaki server će biti pokušan redom, jedan po jedan, dok jedan ne odgovori uspešno, po redosledu od prvog do poslednjeg. Serveri koji ne reaguju biće privremeno zanemareni dok se ne vrate na mrežu.", "manage_concurrency": "Upravljanje paralelnošću", "manage_log_settings": "Upravljajte podešavanjima evidencije", "map_dark_style": "Tamni stil", @@ -147,6 +148,8 @@ "map_settings": "Podešavanje mape", "map_settings_description": "Upravljajte podešavanjima mape", "map_style_description": "URL do style.json mape tema izgleda", + "memory_cleanup_job": "Čišćenje memorije", + "memory_generate_job": "Generacija memorije", "metadata_extraction_job": "Izvod metapodataka", "metadata_extraction_job_description": "Izvucite informacije o metapodacima iz svake datoteke, kao što su GPS, lica i rezolucija", "metadata_faces_import_setting": "Omogućite (enable) dodavanje lica", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "Omogućava heš verifikaciju, ne onemogućavajte ovo osim ako niste sigurni u posledice", "storage_template_migration": "Migracija šablona za skladištenje", "storage_template_migration_description": "Primenite trenutni {template} na prethodno otpremljene elemente", - "storage_template_migration_info": "Promene šablona će se primeniti samo na nove datoteke. Da biste retroaktivno primenili šablon na prethodno otpremljene datoteke, pokrenite {job}.", + "storage_template_migration_info": "Šablon za skladištenje će pretvoriti sve ekstenzije u mala slova. Promene šablona će se primeniti samo na nove datoteke. Da biste retroaktivno primenili šablon na prethodno otpremljene datoteke, pokrenite {job}.", "storage_template_migration_job": "Posao migracije skladišta", "storage_template_more_details": "Za više detalja o ovoj funkciji pogledajte Šablon za skladište i njegove implikacije", "storage_template_onboarding_description": "Kada je omogućena, ova funkcija će automatski organizovati datoteke na osnovu šablona koji definiše korisnik. Zbog problema sa stabilnošću ova funkcija je podrazumevano isključena. Za više informacija pogledajte dokumentaciju.", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "Maksimalni B-kadri", "transcoding_max_b_frames_description": "Više vrednosti poboljšavaju efikasnost kompresije, ali usporavaju kodiranje. Možda nije kompatibilno sa hardverskim ubrzanjem na starijim uređajima. 0 onemogućava B-kadre, dok -1 automatski postavlja ovu vrednost.", "transcoding_max_bitrate": "Maksimalni bitrate", - "transcoding_max_bitrate_description": "Podešavanje maksimalnog bitrate-a može učiniti veličine datoteka predvidljivijim uz manju cenu kvaliteta. Pri 720p, tipične vrednosti su 2600k za VP9 ili HEVC, ili 4500k za H.264. Onemogućeno ako je postavljeno na 0.", + "transcoding_max_bitrate_description": "Podešavanje maksimalnog bitrate-a može učiniti veličine datoteka predvidljivijim uz manju cenu kvaliteta. Pri 720p, tipične vrednosti su 2600 kbit/s za VP9 ili HEVC, ili 4500 kbit/s za H.264. Onemogućeno ako je postavljeno na 0.", "transcoding_max_keyframe_interval": "Maksimalni interval keyframe-a", "transcoding_max_keyframe_interval_description": "Postavlja maksimalnu udaljenost kadrova između ključnih kadrova. Niže vrednosti pogoršavaju efikasnost kompresije, ali poboljšavaju vreme traženja i mogu poboljšati kvalitet scena sa brzim kretanjem. 0 automatski postavlja ovu vrednost.", "transcoding_optimal_description": "Video snimci veći od ciljne rezolucije ili nisu u prihvaćenom formatu", @@ -391,6 +394,7 @@ "allow_edits": "Dozvoli uređenje", "allow_public_user_to_download": "Dozvolite javnom korisniku da preuzme (download-uje)", "allow_public_user_to_upload": "Dozvoli javnom korisniku da otpremi (upload-uje)", + "alt_text_qr_code": "Slika QR koda", "anti_clockwise": "U smeru suprotnom od kazaljke na satu", "api_key": "API ključ (key)", "api_key_description": "Ova vrednost će biti prikazana samo jednom. Obavezno kopirajte pre nego što zatvorite prozor.", @@ -481,6 +485,7 @@ "comments_are_disabled": "Komentari su onemogućeni", "confirm": "Potvrdi", "confirm_admin_password": "Potvrdi Administrativnu Lozinku", + "confirm_delete_face": "Da li ste sigurni da želite da izbrišete osobu {name} iz dela?", "confirm_delete_shared_link": "Da li ste sigurni da želite da izbrišete ovaj deljeni link?", "confirm_keep_this_delete_others": "Sve ostale datoteke u grupi će biti izbrisane osim ove datoteke. Da li ste sigurni da želite da nastavite?", "confirm_password": "Ponovo unesi šifru", @@ -533,6 +538,7 @@ "delete_album": "Obriši album", "delete_api_key_prompt": "Da li ste sigurni da želite da izbrišete ovaj API ključ (key)?", "delete_duplicates_confirmation": "Da li ste sigurni da želite da trajno izbrišete ove duplikate?", + "delete_face": "Izbriši osobu", "delete_key": "Izbriši ključ", "delete_library": "Obriši biblioteku", "delete_link": "Obriši vezu", @@ -600,6 +606,7 @@ "enabled": "Omogućeno (Enabled)", "end_date": "Krajnji datum", "error": "Greška", + "error_delete_face": "Greška pri brisanju osobe iz dela", "error_loading_image": "Greška pri učitavanju slike", "error_title": "Greška – Nešto je pošlo naopako", "errors": { @@ -884,6 +891,7 @@ "month": "Mesec", "more": "Više", "moved_to_trash": "Premešteno u smeće", + "mute_memories": "Priguši sećanja", "my_albums": "Moji albumi", "name": "Ime", "name_or_nickname": "Ime ili nadimak", @@ -1076,6 +1084,8 @@ "removed_from_archive": "Uklonjeno iz arhive", "removed_from_favorites": "Uklonjeno iz omiljenih (favorites)", "removed_from_favorites_count": "{count, plural, other {Uklonjeno #}} iz omiljenih", + "removed_memory": "Uklonjena memorija", + "removed_photo_from_memory": "Slika je uklonjena iz memorije", "removed_tagged_assets": "Uklonjena oznaka iz {count, plural, one {# datoteke} other {# datoteka}}", "rename": "Preimenuj", "repair": "Popravi", @@ -1084,6 +1094,7 @@ "repository": "Repozitorijum (Repository)", "require_password": "Potrebna lozinka", "require_user_to_change_password_on_first_login": "Zahtevati od korisnika da promeni lozinku pri prvom prijavljivanju", + "rescan": "Ponovo skeniraj", "reset": "Resetovati", "reset_password": "Resetovati lozinku", "reset_people_visibility": "Resetujte vidljivost osoba", @@ -1127,6 +1138,7 @@ "search_options": "Opcije pretrage", "search_people": "Pretraži osobe", "search_places": "Pretraži mesta", + "search_rating": "Pretraga po oceni...", "search_settings": "Pretraga podešavanja", "search_state": "Traži region...", "search_tags": "Pretraži oznake (tags)...", @@ -1250,6 +1262,7 @@ "tag_created": "Napravljena oznaka (tag): {tag}", "tag_feature_description": "Pregledavanje fotografija i video snimaka grupisanih po logičnim temama oznaka", "tag_not_found_question": "Ne možete da pronađete oznaku (tag)? Napravite novu oznaku", + "tag_people": "Označite ljude", "tag_updated": "Ažurirana oznaka (tag): {tag}", "tagged_assets": "Označeno (tagged) {count, plural, one {# datoteka} other {# datoteke}}", "tags": "Oznake (tags)", @@ -1290,6 +1303,7 @@ "unlink_motion_video": "Odveži video od slike", "unlink_oauth": "Prekini vezu sa Oauth-om", "unlinked_oauth_account": "Opozvana veza OAuth naloga", + "unmute_memories": "Uključi uspomene", "unnamed_album": "Neimenovani album", "unnamed_album_delete_confirmation": "Da li ste sigurni da želite da izbrišete ovaj album?", "unnamed_share": "Neimenovano delenje", @@ -1343,6 +1357,7 @@ "view_all": "Prikaži Sve", "view_all_users": "Prikaži sve korisnike", "view_in_timeline": "Prikaži u vremenskoj liniji", + "view_link": "Pogledaj vezu", "view_links": "Prikaži veze", "view_name": "Pogledati", "view_next_asset": "Pogledajte sledeću datoteku", @@ -1359,4 +1374,4 @@ "yes": "Da", "you_dont_have_any_shared_links": "Nemate nijedno deljenje veze", "zoom_image": "Zumiraj sliku" -} +} \ No newline at end of file diff --git a/i18n/sv.json b/i18n/sv.json index 8cb756bef3..f57d112c34 100644 --- a/i18n/sv.json +++ b/i18n/sv.json @@ -20,7 +20,7 @@ "add_partner": "Lägg till partner", "add_path": "Lägg till sökväg", "add_photos": "Lägg till foton", - "add_to": "Lägg till i...…", + "add_to": "Lägg till i…", "add_to_album": "Lägg till i album", "add_to_shared_album": "Lägg till i delat album", "add_url": "Lägg till URL", @@ -41,6 +41,7 @@ "backup_settings": "Säkerhetskopieringsinställningar", "backup_settings_description": "Hantera inställningar för säkerhetskopiering av databas", "check_all": "Välj alla", + "cleanup": "Uppstädning", "cleared_jobs": "Rensade jobben för:{job}", "config_set_by_file": "Konfigurationen är satt av en konfigurationsfil", "confirm_delete_library": "Är du säker på att du vill radera {library} album?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Aktivera periodisk biblioteksskanning", "library_settings": "Externa bibliotek", "library_settings_description": "Hantera inställningar för externa bibliotek", - "library_tasks_description": "Kör biblioteksjobb", + "library_tasks_description": "Sök igenom externa bibliotek efter nya och/eller ändrade objekt", "library_watching_enable_description": "Titta på externa bibliotek för filändringar", "library_watching_settings": "Titta på bibliotek (EXPERIMENTELLT)", "library_watching_settings_description": "Titta automatiskt efter ändrade filer", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Sök semantiskt efter bilder med hjälp av CLIP-inbäddningar", "machine_learning_smart_search_enabled": "Aktivera smart sökning", "machine_learning_smart_search_enabled_description": "Om inaktiverat kommer bilder inte att kodas för smart sökning.", - "machine_learning_url_description": "Maskininlärningsserverns URL. Om det är mer än en URL tillagd så kommer ett försök per URL att utföras tills någon av dom svarar, försöken görs i kronologisk ordning.", + "machine_learning_url_description": "Maskininlärningsserverns URL. Om det är mer än en URL tillagd så kommer ett försök per URL att utföras tills någon av dom svarar, försöken görs i kronologisk ordning. Servrar som inte svarar kommer tillfälligt ignoreras tills de är nåbara igen.", "manage_concurrency": "Hantera samtidighet", "manage_log_settings": "Hantera logginställningar", "map_dark_style": "Mörk stil", @@ -147,6 +148,8 @@ "map_settings": "Karta", "map_settings_description": "Hantera kartinställningar", "map_style_description": "URL till en style.json-karto tema", + "memory_cleanup_job": "Rensa minnen", + "memory_generate_job": "Generera minnen", "metadata_extraction_job": "Extrahera metadata", "metadata_extraction_job_description": "Läs in metadata (t.ex. GPS, ansikten och upplösning) för varje resurs", "metadata_faces_import_setting": "Aktivera import av ansikten", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "Aktiverar hash-verifiering, deaktiviera inte om du inte är säker på implikationerna", "storage_template_migration": "Migrering av Lagringsmallar", "storage_template_migration_description": "Applicera aktiv {template} till tidigare uppladdade resurser", - "storage_template_migration_info": "Ändringar i mall gäller endast nya resurser. För att retoaktivt tillämpa mallen på tidigare uppladdade resurser kör {job}.", + "storage_template_migration_info": "Lagringsmallen kommer konvertera alla filändelser till gemena bokstäver. Ändringar gäller endast för nya resurser, för att retoaktivt tillämpa mallen på befintliga resurser kör {job}.", "storage_template_migration_job": "Lagringsmall migreringsjobb", "storage_template_more_details": "För mer information om den här funktionen se Lagringsmall och dess konsekvenser", "storage_template_onboarding_description": "Vid aktivering organiserar denna funktion automatiskt filer baserat på en användardefinierad mall. På grunda av stabilitetsproblem är denna funktion avstängd som standard, för mer information se dokumentation.", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "Max B-ramar", "transcoding_max_b_frames_description": "Högre värden förbättrar kompressionseffektiviteten, men saktar ner kodningen. Kan vara inkompatibel med hårdvaruacceleration på äldre enheter. 0 avaktiverar B-frames, medan -1 anger detta värde automatiskt.", "transcoding_max_bitrate": "Max bithastighet", - "transcoding_max_bitrate_description": "En maximal bitrate kan göra filstorlekar mer förutsägbara till en liten kostnad på kvalitet. Vid 720p är typiska värden 2600k för VP9 eller HEVC, eller 4500k för H.264. Inaktiverad om satt till 0.", + "transcoding_max_bitrate_description": "En maximal bitrate kan göra filstorlekar mer förutsägbara till en liten kostnad på kvalitet. Vid 720p är typiska värden 2600 kbit/s för VP9 eller HEVC, eller 4500 kbit/s för H.264. Inaktiverad om satt till 0.", "transcoding_max_keyframe_interval": "Max nyckelbildruteintervall", "transcoding_max_keyframe_interval_description": "Sätter det maximala bildruteavståndet mellan nyckelbildrutor. Lägre värden försämrar kompressionseffektiviteten, men förbättrar söktiderna och kan förbättra kvaliteten i scener med snabb rörelse. 0 ställer in detta värde automatiskt.", "transcoding_optimal_description": "Videor som är högre än mållösning eller inte i ett accepterat format", @@ -391,6 +394,7 @@ "allow_edits": "Tillåt redigeringar", "allow_public_user_to_download": "Tillåt offentlig användare att ladda ner", "allow_public_user_to_upload": "Tillåt en offentlig användare att ladda upp", + "alt_text_qr_code": "QR-kod", "anti_clockwise": "Moturs", "api_key": "API Nyckel", "api_key_description": "Detta värde kommer bara att visas en gång. Se till att kopiera det innan du stänger fönstret.", @@ -420,7 +424,7 @@ "assets": "Objekt", "assets_added_count": "La till {count, plural, one {# asset} other {# assets}}", "assets_added_to_album_count": "Lade till {count, plural, one {# asset} other {# assets}} i albumet", - "assets_added_to_name_count": "Lade till {count, plural, one {# asset} other {# assets}} till {hasName, select, true {{name}} other {new album}}", + "assets_added_to_name_count": "Lade till {count, plural, one {# objekt} other {# objekt}} till {hasName, select, true {{name}} other {nytt album}}", "assets_count": "{count, plural, one {# objekt} other {# objekt}}", "assets_moved_to_trash_count": "Flyttade {count, plural, one {# asset} other {# assets}} till papperskorgen", "assets_permanently_deleted_count": "Raderad permanent {count, plural, one {# asset} other {# assets}}", @@ -481,6 +485,7 @@ "comments_are_disabled": "Kommentarer är avstängda", "confirm": "Bekräfta", "confirm_admin_password": "Bekräfta administratörslösenord", + "confirm_delete_face": "Är du säker på att du vill ta bort {name}'s ansikte från objektet?", "confirm_delete_shared_link": "Är du säker på att du vill ta bort den här delade länken?", "confirm_keep_this_delete_others": "Alla tillgångar förutom den här tas bort från stacken. Är du säker på att du vill fortsätta?", "confirm_password": "Bekräfta lösenord", @@ -533,6 +538,7 @@ "delete_album": "Ta bort album", "delete_api_key_prompt": "Är du säker på att du vill ta bort denna API-nyckel?", "delete_duplicates_confirmation": "Är du säker på att du vill ta bort dessa dubbletter permanent?", + "delete_face": "Ta bort ansikte", "delete_key": "Ta bort nyckel", "delete_library": "Ta bort bibliotek", "delete_link": "Ta bort länk", @@ -600,13 +606,14 @@ "enabled": "Aktiverad", "end_date": "Slutdatum", "error": "Fel", + "error_delete_face": "Fel uppstod när ansikte skulle tas bort från objektet", "error_loading_image": "Fel vid bildladdning", "error_title": "Fel – något gick fel", "errors": { "cannot_navigate_next_asset": "Det går inte att navigera till nästa objekt", "cannot_navigate_previous_asset": "Det går inte att navigera till föregående objekt", "cant_apply_changes": "Det går inte att tillämpa ändringar", - "cant_change_activity": "Kan inte {enabled, select, true {disable} other {enable}} aktivitet", + "cant_change_activity": "Kan inte {enabled, select, true {avaktivera} other {aktivera}} aktivitet", "cant_change_asset_favorite": "Det går inte att byta favorit mot objekt", "cant_change_metadata_assets_count": "Det går inte att ändra metadata för {count, plural, one {# asset} other {# assets}}", "cant_get_faces": "Kan inte få ansikten", @@ -646,7 +653,7 @@ "unable_to_add_exclusion_pattern": "Det gick inte att lägga till uteslutningsmönster", "unable_to_add_import_path": "Det gick inte att lägga till importsökväg", "unable_to_add_partners": "Kunde inte lägga till partners", - "unable_to_add_remove_archive": "Det går inte att {archived, select, true {remove asset from} other {add asset to}} arkiv", + "unable_to_add_remove_archive": "Det går inte att {archived, select, true {ta bort objekt från} other {lägga till objekt till}} arkiv", "unable_to_add_remove_favorites": "Det går inte att {favorite, select, true {add asset to} other {remove asset from}} favoriter", "unable_to_archive_unarchive": "Det går inte att {archived, select, true {archive} other {archive}}", "unable_to_change_album_user_role": "Kunde inte ändra albumanvändarens roll", @@ -782,7 +789,7 @@ "host": "Värd", "hour": "Timme", "image": "Bild", - "image_alt_text_date": "{isVideo, select, true {Video} other {Image}} tagen {date}", + "image_alt_text_date": "{isVideo, select, true {Video} other {Bild}} tagen {date}", "image_alt_text_date_1_person": "{isVideo, select, true {Video} other {Image}} tagen med {person1} den {date}", "image_alt_text_date_2_people": "{isVideo, select, true {Video} other {Image}} tagen med {person1} och {person2} den {date}", "image_alt_text_date_3_people": "{isVideo, select, true {Video} other {Image}} tagen med {person1}, {person2}, och {person3} den {date}", @@ -812,7 +819,7 @@ }, "invite_people": "Bjud in personer", "invite_to_album": "Bjuder in till album", - "items_count": "{count, plural, one {# item} other {# items}}", + "items_count": "{count, plural, one {# objekt} other {# objekt}}", "jobs": "Jobb", "keep": "Behåll", "keep_all": "Behåll alla", @@ -884,6 +891,7 @@ "month": "Månad", "more": "Mer", "moved_to_trash": "Flyttad till papperskorgen", + "mute_memories": "Tysta minnen", "my_albums": "Mina album", "name": "Namn", "name_or_nickname": "Namn eller smeknamn", @@ -979,6 +987,7 @@ "permanently_deleted_asset": "Permanent raderad tillgång", "permanently_deleted_assets_count": "Permanent borttagning av {count, plural, one {# asset} other {# assets}}", "person": "Person", + "person_birthdate": "Född {date}", "person_hidden": "{name}{hidden, select, true { (dold)} other {}}", "photo_shared_all_users": "Du har antingen delat dina foton med alla användare eller så har du inga användare att dela dem med.", "photos": "Foton", @@ -1041,7 +1050,7 @@ "rating_clear": "Ta bort betyg", "rating_count": "{count, plural, one {# stjärna} other {# stjärnor}}", "rating_description": "Visa EXIF betyget i informationspanelen", - "reaction_options": "Hovringstext för knappen som visar åtgärder man kan utföra på en reaktion.", + "reaction_options": "Alternativ för reaktion", "read_changelog": "Läs ändringslogg", "reassign": "Omfördela", "reassigned_assets_to_existing_person": "Tilldelade om {count, plural, one {# objekt} other {# objekt}} till {name, select, null {an existing person} other {{name}}}", @@ -1076,6 +1085,8 @@ "removed_from_archive": "Borttagen från arkivet", "removed_from_favorites": "Borttagen från favoriter", "removed_from_favorites_count": "{count, plural, other {Tog bort #}} från favoriter", + "removed_memory": "Tog bort minne", + "removed_photo_from_memory": "Tog bort foto från minnet", "removed_tagged_assets": "Tog bort tagg från {count, plural, one {# objekt} other {# objekt}}", "rename": "Döp om", "repair": "Reparera", @@ -1084,6 +1095,7 @@ "repository": "Förvar", "require_password": "Kräver lösenord", "require_user_to_change_password_on_first_login": "Kräv att användaren ändrar lösenord vid första inloggning", + "rescan": "Skanna igen", "reset": "Återställ", "reset_password": "Nollställ lösenord", "reset_people_visibility": "Återställ personers synlighet", @@ -1127,6 +1139,7 @@ "search_options": "Sökinställningar", "search_people": "Sök personer", "search_places": "Sök platser", + "search_rating": "Sök efter betyg...", "search_settings": "Sök inställningar", "search_state": "Sök stat...", "search_tags": "Sök taggar...", @@ -1149,7 +1162,7 @@ "select_photos": "Välj foton", "select_trash_all": "Släng alla", "selected": "Valda", - "selected_count": "{count, plural, other {# selected}}", + "selected_count": "{count, plural, other {# valda}}", "send_message": "Skicka meddelande", "send_welcome_email": "Skicka välkomstmejl", "server_offline": "Servern offline", @@ -1250,6 +1263,7 @@ "tag_created": "Skapade tagg: {tag}", "tag_feature_description": "Bläddra bland foton och videor grupperade efter logiska taggar", "tag_not_found_question": "Kan du inte hitta en tagg? Skapa en ny tagg.", + "tag_people": "Tagga Personer", "tag_updated": "Uppdaterade tagg: {tag}", "tagged_assets": "Taggade {count, plural, one {# objekt} other {# objekt}}", "tags": "Taggar", @@ -1290,6 +1304,7 @@ "unlink_motion_video": "Ta bort länken till rörlig video", "unlink_oauth": "Ta bort länken till OAuth", "unlinked_oauth_account": "Olänkat OAuth-konto", + "unmute_memories": "Slå på ljud för minnen", "unnamed_album": "Namnlöst Album", "unnamed_album_delete_confirmation": "Är du säker på att du vill ta bort detta album?", "unnamed_share": "Namnlös delning", @@ -1343,6 +1358,7 @@ "view_all": "Visa alla", "view_all_users": "Visa alla användare", "view_in_timeline": "Visa i tidslinjen", + "view_link": "Visa länk", "view_links": "Visa länkar", "view_name": "Visa", "view_next_asset": "Visa nästa objekt", @@ -1359,4 +1375,4 @@ "yes": "Ja", "you_dont_have_any_shared_links": "Du har inga delade länkar", "zoom_image": "Zooma bild" -} +} \ No newline at end of file diff --git a/i18n/ta.json b/i18n/ta.json index c3d13dbdf0..2c58867226 100644 --- a/i18n/ta.json +++ b/i18n/ta.json @@ -297,7 +297,7 @@ "transcoding_max_b_frames": "அதிகபட்ச பி-பிரேம்கள்", "transcoding_max_b_frames_description": "அதிக மதிப்புகள் சுருக்க செயல்திறனை மேம்படுத்துகின்றன, ஆனால் குறியாக்கத்தை மெதுவாக்குகின்றன. பழைய சாதனங்களில் வன்பொருள் முடுக்கம் உடன் பொருந்தாது. 0 பி -பிரேம்களை முடக்குகிறது, அதே நேரத்தில் -1 இந்த மதிப்பை தானாக அமைக்கிறது.", "transcoding_max_bitrate": "அதிகபட்ச பிட்ரேட்", - "transcoding_max_bitrate_description": "அதிகபட்ச பிட்ரேட்டை அமைப்பது கோப்பு அளவுகளை ஒரு சிறிய செலவில் தரத்திற்கு கணிக்கக்கூடியதாக மாற்றும். 720p இல், வழக்கமான மதிப்புகள் VP9 அல்லது HEVC க்கு 2600K அல்லது H.264 க்கு 4500K ஆகும். 0 என அமைக்கப்பட்டால் முடக்கப்பட்டது.", + "transcoding_max_bitrate_description": "அதிகபட்ச பிட்ரேட்டை அமைப்பது கோப்பு அளவுகளை ஒரு சிறிய செலவில் தரத்திற்கு கணிக்கக்கூடியதாக மாற்றும். 720p இல், வழக்கமான மதிப்புகள் VP9 அல்லது HEVC க்கு 2600 kbit/s அல்லது H.264 க்கு 4500 kbit/s ஆகும். 0 என அமைக்கப்பட்டால் முடக்கப்பட்டது.", "transcoding_max_keyframe_interval": "அதிகபட்ச கீஃப்ரேம் இடைவெளி", "transcoding_max_keyframe_interval_description": "கீஃப்ரேம்களுக்கு இடையில் அதிகபட்ச பிரேம் தூரத்தை அமைக்கிறது. குறைந்த மதிப்புகள் சுருக்க செயல்திறனை மோசமாக்குகின்றன, ஆனால் தேடல் நேரங்களை மேம்படுத்துகின்றன, மேலும் வேகமான இயக்கத்துடன் காட்சிகளில் தரத்தை மேம்படுத்தலாம். 0 இந்த மதிப்பை தானாக அமைக்கிறது.", "transcoding_optimal_description": "இலக்கு தீர்மானத்தை விட உயர்ந்த வீடியோக்கள் அல்லது ஏற்றுக்கொள்ளப்பட்ட வடிவத்தில் இல்லை", @@ -1339,4 +1339,4 @@ "yes": "ஆம்", "you_dont_have_any_shared_links": "உங்களிடம் பகிரப்பட்ட இணைப்புகள் எதுவும் இல்லை", "zoom_image": "பெரிதாக்க படம்" -} +} \ No newline at end of file diff --git a/i18n/th.json b/i18n/th.json index 3e0523c886..f86ea9cd55 100644 --- a/i18n/th.json +++ b/i18n/th.json @@ -299,7 +299,7 @@ "transcoding_max_b_frames": "B-frames สูงสุด", "transcoding_max_b_frames_description": "ค่าที่สูงขึ้นจะช่วยเพิ่มประสิทธิภาพในการบีบอัด แต่จะทำให้การเข้ารหัสช้าลง อาจไม่สามารถใช้งานร่วมกับการเร่งความเร็วฮาร์ดแวร์บนอุปกรณ์เก่าได้ ค่าที่เป็น 0 จะปิดการใช้งาน B-frame ในขณะที่ค่า -1 จะตั้งค่าค่านี้โดยอัตโนมัติ", "transcoding_max_bitrate": "bitrate สูงสุด", - "transcoding_max_bitrate_description": "การตั้งค่า bitrate สูงสุดจะสามารถคาดเดาขนาดไฟล์ได้มากขึ้นโดยไม่กระทบคุณภาพ สำหรับความคมชัด 720p ค่าทั่วไปคือ 2600k สําหรับ VP9 หรือ HEVC, 4500k สําหรับ H.264 ปิดการตั้งค่าเมี่อตั้งค่าเป็น 0", + "transcoding_max_bitrate_description": "การตั้งค่า bitrate สูงสุดจะสามารถคาดเดาขนาดไฟล์ได้มากขึ้นโดยไม่กระทบคุณภาพ สำหรับความคมชัด 720p ค่าทั่วไปคือ 2600 kbit/s สําหรับ VP9 หรือ HEVC, 4500 kbit/s สําหรับ H.264 ปิดการตั้งค่าเมี่อตั้งค่าเป็น 0", "transcoding_max_keyframe_interval": "ช่วงเวลาสูงสุดระหว่างกราฟฟ์เคลื่อนไหว", "transcoding_max_keyframe_interval_description": "ตั้งค่าระยะห่างสูงสุดระหว่างคีย์เฟรม (keyframes) ค่าที่ต่ำลงจะทำให้ประสิทธิภาพการบีบอัดแย่ลง แต่จะช่วยปรับปรุงเวลาในการค้นหาภาพ (seek times) และอาจช่วยปรับปรุงคุณภาพในฉากที่มีการเคลื่อนไหวเร็ว ค่า 0 จะตั้งค่านี้โดยอัตโนมัติ", "transcoding_optimal_description": "วีดิโอมีความคมชัดสูงกว่าเป้าหมายหรืออยู่ในรูปแบบที่รับไม่ได้", @@ -342,7 +342,7 @@ "user_delete_immediately": "บัญชีและสื่อของ {user} จะอยู่ในคิวสำหรับการลบถาวร โดยทันที", "user_delete_immediately_checkbox": "คิวผู้ใช้และสื่อสำหรับการลบทันที", "user_management": "การจัดการผู้ใช้", - "user_password_has_been_reset": "รหัสผ่านของผู้ใช้ {user} ถูกตั้งค่าใหม่แล้ว", + "user_password_has_been_reset": "รหัสผ่านของผู้ใช้ถูกตั้งค่าใหม่แล้ว:", "user_password_reset_description": "รหัสผ่านของผู้ใช้จะถูกตั้งค่าใหม่และส่งไปยังอีเมลที่ลงทะเบียน", "user_restore_description": "บัญชีของ {user} จะได้รับการคืนค่า", "user_restore_scheduled_removal": "กู้คืนผู้ใช้ - กำหนดการลบในวันที่ {date, date,long}", @@ -404,7 +404,7 @@ "are_these_the_same_person": "เป็นคนเดียวกันหรือไม่?", "are_you_sure_to_do_this": "คุณแน่ใจว่าต้องการทำสิ่งนี้หรือไม่?", "asset_added_to_album": "เพิ่มไปยังอัลบั้มแล้ว", - "asset_adding_to_album": "กำลังเพิ่มไปยังอัลบั้ม...", + "asset_adding_to_album": "กำลังเพิ่มไปยังอัลบั้ม…", "asset_description_updated": "อัปเดตรายละเอียดสำเร็จ", "asset_filename_is_offline": "สื่อ {filename} ออฟไลน์อยู่", "asset_has_unassigned_faces": "สื่อไม่ได้ระบุใบหน้า", @@ -413,7 +413,7 @@ "asset_skipped": "ข้ามแล้ว", "asset_skipped_in_trash": "ในถังขยะ", "asset_uploaded": "อัปโหลดแล้ว", - "asset_uploading": "กำลังอัปโหลด...", + "asset_uploading": "กำลังอัปโหลด…", "assets": "สื่อ", "assets_added_to_album_count": "เพิ่ม {count, plural, one {# asset} other {# assets}} ไปยังอัลบั้ม", "assets_added_to_name_count": "เพิ่ม {count, plural, one {# asset} other {# assets}} ไปยัง {hasName, select, true {{name}} other {new album}}", @@ -1311,4 +1311,4 @@ "yes": "ใช่", "you_dont_have_any_shared_links": "คุณไม่ได้มีลิงก์ที่แชร์", "zoom_image": "ซูมรูปภาพ" -} +} \ No newline at end of file diff --git a/i18n/tr.json b/i18n/tr.json index 3f766362b2..4727be7fde 100644 --- a/i18n/tr.json +++ b/i18n/tr.json @@ -41,6 +41,7 @@ "backup_settings": "Yedekleme Ayarları", "backup_settings_description": "Veritabanı Yedekleme Ayarlarını Yönet", "check_all": "Hepsini Kontrol Et", + "cleanup": "Temizle", "cleared_jobs": "{job} için işler temizlendi", "config_set_by_file": "Ayarlar şuanda config dosyası tarafından ayarlanmıştır", "confirm_delete_library": "{library} kütüphanesini silmek istediğinize emin misiniz?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Periyodik kütüphane taramasını etkinleştir", "library_settings": "Harici kütüphane", "library_settings_description": "Harici kütüphane ayarlarını yönet", - "library_tasks_description": "Kütüphane görevleri gerçekleştir", + "library_tasks_description": "Yeni yada değiştirilmiş varlıklar için dış kütüphaneleri tara", "library_watching_enable_description": "Harici kütüphanelerdeki dosya değişikliklerini izle", "library_watching_settings": "Kütüphane izleme (DENEYSEL)", "library_watching_settings_description": "Değişen dosyalar için otomatik olarak izle", @@ -114,7 +115,7 @@ "machine_learning_facial_recognition": "Yüz Tanıma", "machine_learning_facial_recognition_description": "Fotoğraflardaki yüzleri tara, tanı ve gruplandır", "machine_learning_facial_recognition_model": "Yüz Tanıma Modeli", - "machine_learning_facial_recognition_model_description": "Modeller boyutlarına göre sıralanmıştır. Büyük modeller daha yavaş çalışır ve boyutu daha yüksektir fakat daha iyi sonuçlar üretir. Modeli değiştirdikten sonra Yüz Tarama işini tüm fotoğraflar için tekrar çalıştırmalısınız.", + "machine_learning_facial_recognition_model_description": "Modeller, azalan boyut sırasına göre listelenmiştir. Daha büyük modeller daha yavaştır ve daha fazla bellek kullanır, ancak daha iyi sonuçlar üretir. Bir modeli değiştirdikten sonra tüm görüntüler için yüz algılama işini yeniden çalıştırmanız gerektiğini unutmayın.", "machine_learning_facial_recognition_setting": "Yüz Tanımayı etkinleştir", "machine_learning_facial_recognition_setting_description": "Devre dışı bırakıldığında fotoğraflar yüz tanıma için işlenmeyecek ve Keşfet sayfasındaki Kişiler sekmesini doldurmayacak.", "machine_learning_max_detection_distance": "Maksimum tespit uzaklığı", @@ -147,6 +148,8 @@ "map_settings": "Harita", "map_settings_description": "Harita ayarlarını yönet", "map_style_description": "style.json Harita ayarlarının URL'si", + "memory_cleanup_job": "Anı temizliği", + "memory_generate_job": "Anı oluşturma", "metadata_extraction_job": "Meta verilerinden Ayıkla", "metadata_extraction_job_description": "GPS ve çözünürlük gibi ger bir varlığın meta veri bilgilerini ayıklayın", "metadata_faces_import_setting": "Yüz içe aktarmayı etkinleştir", @@ -391,6 +394,7 @@ "allow_edits": "Düzenlemeye izin ver", "allow_public_user_to_download": "Genel kullanıcının indirmesine aç", "allow_public_user_to_upload": "Genel kullanıcının yüklemesine aç", + "alt_text_qr_code": "QR kodu görseli", "anti_clockwise": "Saat yönünün tersine", "api_key": "API Anahtarı", "api_key_description": "Bu değer sadece bir kere gösterilecek. Lütfen bu pencereyi kapatmadan önce kopyaladığınıza emin olun.", @@ -481,6 +485,7 @@ "comments_are_disabled": "Yorumlar devre dışı", "confirm": "Onayla", "confirm_admin_password": "Yönetici Şifresini Onayla", + "confirm_delete_face": "Varlıktan {name} yüzünü silmek istediğinizden emin misiniz?", "confirm_delete_shared_link": "Bu paylaşılan bağlantıyı silmek istediğinizden emin misiniz?", "confirm_keep_this_delete_others": "Yığındaki diğer tüm öğeler bu varlık haricinde silinecektir. Devam etmek istediğinizden emin misiniz?", "confirm_password": "Şifreyi onayla", @@ -533,6 +538,7 @@ "delete_album": "Albümü sil", "delete_api_key_prompt": "Bu API anahtarını silmek istediğinizden emin misiniz?", "delete_duplicates_confirmation": "Bu kopyaları kalıcı olarak silmek istediğinizden emin misiniz?", + "delete_face": "Yüzü sil", "delete_key": "Anahtarı sil", "delete_library": "Kütüphaneyi sil", "delete_link": "Bağlantıyı sil", @@ -600,6 +606,7 @@ "enabled": "Etkinleştirildi", "end_date": "Bitiş tarihi", "error": "Hata", + "error_delete_face": "Yüzü varlıktan silme hatası", "error_loading_image": "Resim yüklenirken hata oluştu", "error_title": "Bir Hata Oluştu - Bir şeyler ters gitti", "errors": { @@ -884,6 +891,7 @@ "month": "Ay", "more": "Daha fazla", "moved_to_trash": "Çöp kutusuna taşındı", + "mute_memories": "Anıları sessize al", "my_albums": "Albümlerim", "name": "İsim", "name_or_nickname": "İsim veya takma isim", @@ -1076,6 +1084,8 @@ "removed_from_archive": "Arşivden çıkarıldı", "removed_from_favorites": "Favorilerden kaldırıldı", "removed_from_favorites_count": "{count, plural, other {#}} favorilerden çıkarıldı", + "removed_memory": "Anı kaldırıldı", + "removed_photo_from_memory": "Fotoğraf anıdan kaldırıldı", "removed_tagged_assets": "{count, plural, one {# dosya} other {# dosya}} etiketleri kaldırıldı", "rename": "Yeniden adlandır", "repair": "Onar", @@ -1084,6 +1094,7 @@ "repository": "Depo", "require_password": "Şifre gerekli", "require_user_to_change_password_on_first_login": "Kullanıcı ilk girişte şifreyi değiştirmeli", + "rescan": "Yeniden tara", "reset": "Sıfırla", "reset_password": "Şifreyi sıfırla", "reset_people_visibility": "Kişilerin görünürlüğünü sıfırla", @@ -1127,6 +1138,7 @@ "search_options": "Arama seçenekleri", "search_people": "Kişilere göre ara", "search_places": "Yerleri ara", + "search_rating": "Derecelendirerek arayın...", "search_settings": "Ayarları ara", "search_state": "Eyalet/İl ara...", "search_tags": "Etiketleri ara...", @@ -1250,6 +1262,7 @@ "tag_created": "Etiket oluşturuldu: {tag}", "tag_feature_description": "Etiket temalarına göre gruplandırılmış fotoğraf ve videoları keşfedin", "tag_not_found_question": "Etiket bulunamadı mı? Yeni bir etiket oluşturun.", + "tag_people": "İnsanları etiketle", "tag_updated": "Etiket güncellendi: {tag}", "tagged_assets": "{count, plural, one {# dosya} other {# dosya}} etiketlendi", "tags": "Etiketler", @@ -1290,6 +1303,7 @@ "unlink_motion_video": "Hareketli video bağlantısını kaldır", "unlink_oauth": "OAuth bağlantısını kaldır", "unlinked_oauth_account": "Bağlantısı kaldırılmış OAuth hesabı", + "unmute_memories": "Anıların sesini aç", "unnamed_album": "İsimsiz Albüm", "unnamed_album_delete_confirmation": "Bu albümü silmek istediğinizden emin misiniz?", "unnamed_share": "İsimsiz paylaşım", @@ -1343,6 +1357,7 @@ "view_all": "Tümünü gör", "view_all_users": "Tüm kullanıcıları görüntüle", "view_in_timeline": "Zaman çizelgesinde görüntüle", + "view_link": "Bağlantıyı göster", "view_links": "Bağlantıları göster", "view_name": "Göster", "view_next_asset": "Sonraki dosyayı görüntüle", diff --git a/i18n/uk.json b/i18n/uk.json index 1cb6b0e5a6..2815b4dac6 100644 --- a/i18n/uk.json +++ b/i18n/uk.json @@ -41,6 +41,7 @@ "backup_settings": "Налаштування резервного копіювання", "backup_settings_description": "Керування налаштуваннями резервного копіювання бази даних", "check_all": "Перевірити все", + "cleanup": "Очищення", "cleared_jobs": "Очищені завдання для: {job}", "config_set_by_file": "Налаштовано за допомогою конфіг-файлу", "confirm_delete_library": "Ви дійсно бажаєте видалити бібліотеку \"{library}\"?", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "Увімкнути періодичне сканування бібліотеки", "library_settings": "Зовнішня бібліотека", "library_settings_description": "Керування налаштуваннями зовнішніх бібліотек", - "library_tasks_description": "Виконуйте завдання бібліотеки", + "library_tasks_description": "Сканувати зовнішні бібліотеки на наявність нових і/або змінених ресурсів", "library_watching_enable_description": "Слідкуйте за змінами файлів у зовнішніх бібліотеках", "library_watching_settings": "Спостереження за бібліотекою (ЕКСПЕРИМЕНТАЛЬНЕ)", "library_watching_settings_description": "Автоматичне спостереження за зміненими файлами", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "Пошук зображень за допомогою семантичних вбудовувань CLIP", "machine_learning_smart_search_enabled": "Увімкнути розумний пошук", "machine_learning_smart_search_enabled_description": "Якщо ця функція вимкнена, зображення не будуть кодуватися для розумного пошуку.", - "machine_learning_url_description": "URL сервера машинного навчання. Якщо надано більше одного URL, сервери будуть опитуватися по черзі, поки один з них не відповість успішно, у порядку від першого до останнього.", + "machine_learning_url_description": "URL сервера машинного навчання. Якщо надано більше одного URL, сервери будуть опитуватися по черзі, поки один з них не відповість успішно, у порядку від першого до останнього. Сервери, які не відповідають, будуть тимчасово ігноруватися, поки не з'являться онлайн.", "manage_concurrency": "Керування паралельністю завдань", "manage_log_settings": "Керування налаштуваннями журналу", "map_dark_style": "Темний стиль", @@ -147,6 +148,8 @@ "map_settings": "Мапа", "map_settings_description": "Управління налаштуваннями мапи", "map_style_description": "URL до теми мапи у форматі style.json", + "memory_cleanup_job": "Очищення пам'яті", + "memory_generate_job": "Покоління пам'яті", "metadata_extraction_job": "Витягнути метадані", "metadata_extraction_job_description": "Витягни метадані з кожного об'єкта, таку як GPS, обличчя та роздільна здатність", "metadata_faces_import_setting": "Увімкни імпорт облич", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "Увімкнути перевірку хеша. Не вимикайте це, якщо ви не впевнені в наслідках", "storage_template_migration": "Міграція шаблонів сховища", "storage_template_migration_description": "Застосувати поточний {template} до раніше завантажених ресурсів", - "storage_template_migration_info": "Зміни шаблону будуть застосовуватися тільки до нових ресурсів. Для ретроспективного застосування шаблону до ресурсів, завантажених раніше, запустіть {job}.", + "storage_template_migration_info": "Шаблон зберігання конвертуватиме всі розширення у нижній регістр. Зміни шаблону застосовуватимуться лише до нових ресурсів. Щоб застосувати шаблон до раніше завантажених ресурсів, запустіть {job}.", "storage_template_migration_job": "Завдання міграції шаблону зберігання", "storage_template_more_details": "Для отримання детальнішої інформації про цю функцію, звертайтесь до Шаблону зберігання та його наслідків", "storage_template_onboarding_description": "Після увімкнення ця функція автоматично організовуватиме файли за користувацьким шаблоном. З міркувань стабільності функцію за замовчуванням вимкнено. Докладніша інформація доступна в документації.", @@ -391,6 +394,7 @@ "allow_edits": "Дозволити редагування", "allow_public_user_to_download": "Дозволити публічному користувачеві завантажувати файли", "allow_public_user_to_upload": "Дозволити публічним користувачам завантажувати", + "alt_text_qr_code": "Зображення QR-коду", "anti_clockwise": "Проти годинникової стрілки", "api_key": "Ключ API", "api_key_description": "Це значення буде показане лише один раз. Будь ласка, обов'язково скопіюйте його перед закриттям вікна.", @@ -481,6 +485,7 @@ "comments_are_disabled": "Коментарі вимкнено", "confirm": "Підтвердіть", "confirm_admin_password": "Підтвердити пароль адміністратора", + "confirm_delete_face": "Ви впевнені, що хочете видалити обличчя {name} з активу?", "confirm_delete_shared_link": "Ви впевнені, що хочете видалити це спільне посилання?", "confirm_keep_this_delete_others": "Усі інші ресурси в стеку буде видалено, окрім цього ресурсу. Ви впевнені, що хочете продовжити?", "confirm_password": "Підтвердити пароль", @@ -533,6 +538,7 @@ "delete_album": "Видалити альбом", "delete_api_key_prompt": "Ви впевнені, що хочете видалити цей ключ API?", "delete_duplicates_confirmation": "Ви впевнені, що хочете назавжди видалити ці дублікати?", + "delete_face": "Видалити обличчя", "delete_key": "Видалити ключ", "delete_library": "Видалити бібліотеку", "delete_link": "Видалити посилання", @@ -600,6 +606,7 @@ "enabled": "Увімкнено", "end_date": "Дата завершення", "error": "Помилка", + "error_delete_face": "Помилка при видаленні обличчя з активу", "error_loading_image": "Помилка завантаження зображення", "error_title": "Помилка: щось пішло не так", "errors": { @@ -884,6 +891,7 @@ "month": "Місяць", "more": "Більше", "moved_to_trash": "Перенесено до смітника", + "mute_memories": "Приглушити спогади", "my_albums": "Мої альбоми", "name": "Ім'я", "name_or_nickname": "Ім'я або псевдонім", @@ -979,6 +987,7 @@ "permanently_deleted_asset": "Видалити назавжди", "permanently_deleted_assets_count": "Видалено остаточно {count, plural, one {# ресурс} few {# ресурси} many {# ресурсів} other {# ресурсів}}", "person": "Людина", + "person_birthdate": "Народився {date}", "person_hidden": "{name}{hidden, select, true { (приховано)} other {}}", "photo_shared_all_users": "Виглядає так, що ви поділилися своїми фотографіями з усіма користувачами або у вас немає жодного користувача, з яким можна поділитися.", "photos": "Знімки", @@ -1076,6 +1085,8 @@ "removed_from_archive": "Видалено з архіву", "removed_from_favorites": "Видалено з обраного", "removed_from_favorites_count": "{count, plural, other {Видалено #}} з обраних", + "removed_memory": "Видалена пам'ять", + "removed_photo_from_memory": "Фото видалене з пам'яті", "removed_tagged_assets": "Видалено тег із {count, plural, one {# активу} other {# активів}}", "rename": "Перейменувати", "repair": "Ремонт", @@ -1084,6 +1095,7 @@ "repository": "Репозиторій", "require_password": "Вимагати пароль", "require_user_to_change_password_on_first_login": "Вимагати від користувача змінювати пароль при першому вході", + "rescan": "Пересканування", "reset": "Скидання", "reset_password": "Скинути пароль", "reset_people_visibility": "Відновити видимість людей", @@ -1127,6 +1139,7 @@ "search_options": "Опції пошуку", "search_people": "Шукати людей", "search_places": "Пошук місць", + "search_rating": "Пошук за рейтингом...", "search_settings": "Налаштування пошуку", "search_state": "Пошук регіону...", "search_tags": "Пошук тегів...", @@ -1250,6 +1263,7 @@ "tag_created": "Створено тег: {tag}", "tag_feature_description": "Перегляд фотографій та відео, згрупованих за логічними темами тегів", "tag_not_found_question": "Не вдається знайти тег? Створити новий тег.", + "tag_people": "Тег людей", "tag_updated": "Оновлено тег: {tag}", "tagged_assets": "Позначено тегом {count, plural, one {# актив} other {# активи}}", "tags": "Теги", @@ -1290,6 +1304,7 @@ "unlink_motion_video": "Від'єднати рухоме відео", "unlink_oauth": "Від'єднайте OAuth", "unlinked_oauth_account": "Відключити акаунт OAuth", + "unmute_memories": "Увімкнути звук спогадів", "unnamed_album": "Альбом без назви", "unnamed_album_delete_confirmation": "Ви впевнені, що бажаєте видалити цей альбом?", "unnamed_share": "Спільний доступ без назви", @@ -1343,6 +1358,7 @@ "view_all": "Переглянути усі", "view_all_users": "Переглянути всіх користувачів", "view_in_timeline": "Переглянути в хронології", + "view_link": "Переглянути посилання", "view_links": "Переглянути посилання", "view_name": "Переглянути", "view_next_asset": "Переглянути наступний ресурс", diff --git a/i18n/ur.json b/i18n/ur.json index 0967ef424b..296a8eec25 100644 --- a/i18n/ur.json +++ b/i18n/ur.json @@ -1 +1,3 @@ -{} +{ + "about": "متعلق" +} diff --git a/i18n/vi.json b/i18n/vi.json index 9983f5a057..d84a588614 100644 --- a/i18n/vi.json +++ b/i18n/vi.json @@ -284,7 +284,7 @@ "transcoding_max_b_frames": "Số B-frame tối đa", "transcoding_max_b_frames_description": "Giá trị cao hơn cải thiện hiệu quả nén, nhưng làm chậm mã hóa. Có thể không tương thích với tăng tốc phần cứng trên các thiết bị cũ. Giá trị 0 để tắt B-frames, trong khi giá trị -1 để tự động thiết lập giá trị này.", "transcoding_max_bitrate": "Bitrate tối đa", - "transcoding_max_bitrate_description": "Cài đặt giới hạn bitrate tối đa có thể giúp kích thước video dễ dự đoán hơn, với một chút hy sinh về chất lượng. Ở độ phân giải 720p, giá trị điển hình là 2600k cho VP9 hoặc HEVC, hoặc 4500k cho H.264. Nếu đặt thành 0, chức năng này sẽ bị vô hiệu hóa.", + "transcoding_max_bitrate_description": "Cài đặt giới hạn bitrate tối đa có thể giúp kích thước video dễ dự đoán hơn, với một chút hy sinh về chất lượng. Ở độ phân giải 720p, giá trị điển hình là 2600 kbit/s cho VP9 hoặc HEVC, hoặc 4500 kbit/s cho H.264. Nếu đặt thành 0, chức năng này sẽ bị vô hiệu hóa.", "transcoding_max_keyframe_interval": "Khoảng cách tối đa giữa các khung hình chính", "transcoding_max_keyframe_interval_description": "Thiết lập khoảng thời gian tối đa giữa các khung hình chính. Giá trị thấp hơn làm giảm hiệu suất nén, nhưng cải thiện thời gian tìm kiếm và có thể cải thiện chất lượng trong các cảnh có chuyển động nhanh. Giá trị 0 để tự động thiết lập giá trị này.", "transcoding_optimal_description": "Video có độ phân giải cao hơn mục tiêu hoặc không ở định dạng được chấp nhận", @@ -1317,4 +1317,4 @@ "yes": "Có", "you_dont_have_any_shared_links": "Bạn không có liên kết chia sẻ nào", "zoom_image": "Thu phóng ảnh" -} +} \ No newline at end of file diff --git a/i18n/zh_Hant.json b/i18n/zh_Hant.json index 443fa2cd71..bcd543c78a 100644 --- a/i18n/zh_Hant.json +++ b/i18n/zh_Hant.json @@ -41,6 +41,7 @@ "backup_settings": "備份設定", "backup_settings_description": "管理資料庫備份設定", "check_all": "全選", + "cleanup": "清理", "cleared_jobs": "已刪除「{job}」任務", "config_set_by_file": "已透過設定檔更新設定", "confirm_delete_library": "確定要刪除 {library} 相簿嗎？", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "啟用圖庫定期掃描", "library_settings": "外部圖庫", "library_settings_description": "管理外部圖庫設定", - "library_tasks_description": "執行圖庫任務", + "library_tasks_description": "掃描外部資料庫以尋找新增或更改的資源", "library_watching_enable_description": "監控外部圖庫的檔案變化", "library_watching_settings": "圖庫監控（實驗中）", "library_watching_settings_description": "自動監控檔案的變化", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "使用 CLIP 嵌入進行語義圖像搜尋", "machine_learning_smart_search_enabled": "啟用智慧搜尋", "machine_learning_smart_search_enabled_description": "如果停用，圖片將不會被編碼以進行智能搜尋。", - "machine_learning_url_description": "機器學習伺服器的網址，如果提供多個 URL，則將按依序嘗試連接每個伺服器，直到有一個伺服器成功回應為止。", + "machine_learning_url_description": "機器學習伺服器的 URL。如果提供多個 URL，將依序嘗試每個伺服器，直到有一個成功回應，從第一個到最後一個。未回應的伺服器將暫時被忽略，直到它們恢復線上。", "manage_concurrency": "管理並行", "manage_log_settings": "管理日誌設定", "map_dark_style": "深色樣式", @@ -147,6 +148,8 @@ "map_settings": "地圖", "map_settings_description": "管理地圖設定", "map_style_description": "地圖主題（style.json）的網址", + "memory_cleanup_job": "記憶體清理", + "memory_generate_job": "記憶體生成", "metadata_extraction_job": "擷取詮釋資料", "metadata_extraction_job_description": "擷取所有檔案的 GPS、臉孔、解析度等原始詳細資料", "metadata_faces_import_setting": "啟用臉孔匯入", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "最大 B 幀數", "transcoding_max_b_frames_description": "較高的數值可提升壓縮效率，但會降低編碼速度。可能與較舊設備的硬體加速不相容。設定為 0 時會停用 B-frames，而 -1 則會自動設定此數值。", "transcoding_max_bitrate": "最大位元速率", - "transcoding_max_bitrate_description": "設定最大位元速率可以使檔案大小更具可預測性，但會稍微降低品質。在 720p 解析度下，典型值為 VP9 或 HEVC 的 2600k，或 H.264 的 4500k。設置為 0 停用此功能。", + "transcoding_max_bitrate_description": "設定最大位元速率可以使檔案大小更具可預測性，但會稍微降低品質。在 720p 解析度下，典型值為 VP9 或 HEVC 的 2600 kbit/s，或 H.264 的 4500 kbit/s。設置為 0 停用此功能。", "transcoding_max_keyframe_interval": "最大關鍵幀間隔", "transcoding_max_keyframe_interval_description": "設置關鍵幀之間的最大幀距。較低的值會降低壓縮效率，但可以改善搜尋時間，並有可能會改善快速變動場景的品質。0 會自動設置此值。", "transcoding_optimal_description": "高於目標解析度或格式不被支援的影片", @@ -391,6 +394,7 @@ "allow_edits": "允許編輯", "allow_public_user_to_download": "開放給使用者下載", "allow_public_user_to_upload": "開放讓使用者上傳", + "alt_text_qr_code": "QR 碼圖片", "anti_clockwise": "逆時針", "api_key": "API 金鑰", "api_key_description": "此值僅顯示一次。請確保在關閉窗口之前複製它。", @@ -481,6 +485,7 @@ "comments_are_disabled": "留言已停用", "confirm": "確認", "confirm_admin_password": "確認管理者密碼", + "confirm_delete_face": "您確定要從資產中刪除 {name} 的臉部嗎？", "confirm_delete_shared_link": "確定刪除連結嗎？", "confirm_keep_this_delete_others": "所有的其他堆疊項目將被刪除。確定繼續嗎？", "confirm_password": "確認密碼", @@ -533,6 +538,7 @@ "delete_album": "刪除相簿", "delete_api_key_prompt": "您確定要刪除這個 API Key嗎？", "delete_duplicates_confirmation": "您確定要永久刪除這些重複項嗎？", + "delete_face": "刪除臉部", "delete_key": "刪除密鑰", "delete_library": "刪除圖庫", "delete_link": "刪除鏈結", @@ -600,6 +606,7 @@ "enabled": "己啟用", "end_date": "結束日期", "error": "錯誤", + "error_delete_face": "從資產中刪除臉部時發生錯誤", "error_loading_image": "載入圖片時出錯", "error_title": "錯誤 - 出問題了", "errors": { @@ -884,6 +891,7 @@ "month": "月", "more": "更多", "moved_to_trash": "已丟進垃圾桶", + "mute_memories": "靜音回憶", "my_albums": "我的相簿", "name": "名稱", "name_or_nickname": "名稱或暱稱", @@ -1076,6 +1084,8 @@ "removed_from_archive": "從封存中移除", "removed_from_favorites": "已從收藏中移除", "removed_from_favorites_count": "已移除收藏的 {count, plural, other {# 個項目}}", + "removed_memory": "已移除記憶", + "removed_photo_from_memory": "已從記憶中移除照片", "removed_tagged_assets": "已移除 {count, plural, other {# 個檔案}}的標記", "rename": "改名", "repair": "糾正", @@ -1084,6 +1094,7 @@ "repository": "儲存庫", "require_password": "需要密碼", "require_user_to_change_password_on_first_login": "要求使用者在首次登入時更改密碼", + "rescan": "重新掃描", "reset": "重設", "reset_password": "重設密碼", "reset_people_visibility": "重設人物可見性", @@ -1127,6 +1138,7 @@ "search_options": "搜尋選項", "search_people": "搜尋人物", "search_places": "搜尋地點", + "search_rating": "按評分搜尋...", "search_settings": "搜尋設定", "search_state": "搜尋地區…", "search_tags": "搜尋標籤...", @@ -1250,6 +1262,7 @@ "tag_created": "已建立標記：{tag}", "tag_feature_description": "以邏輯標記要旨分組瀏覽照片和影片", "tag_not_found_question": "找不到標記？建立新標記吧。", + "tag_people": "標記人物", "tag_updated": "已更新標記：{tag}", "tagged_assets": "已標記 {count, plural, other {# 個檔案}}", "tags": "標籤", @@ -1290,6 +1303,7 @@ "unlink_motion_video": "取消鏈結動態影片", "unlink_oauth": "取消連接 OAuth", "unlinked_oauth_account": "已解除連接 OAuth 帳號", + "unmute_memories": "取消靜音回憶", "unnamed_album": "未命名相簿", "unnamed_album_delete_confirmation": "確定要刪除這本相簿嗎？", "unnamed_share": "未命名分享", @@ -1343,6 +1357,7 @@ "view_all": "瀏覽全部", "view_all_users": "查看所有使用者", "view_in_timeline": "在時間軸中查看", + "view_link": "查看連結", "view_links": "檢視鏈結", "view_name": "檢視分類", "view_next_asset": "查看下一項", @@ -1359,4 +1374,4 @@ "yes": "是", "you_dont_have_any_shared_links": "您沒有任何共享連結", "zoom_image": "縮放圖片" -} +} \ No newline at end of file diff --git a/i18n/zh_SIMPLIFIED.json b/i18n/zh_SIMPLIFIED.json index 332386067a..f6ef01e353 100644 --- a/i18n/zh_SIMPLIFIED.json +++ b/i18n/zh_SIMPLIFIED.json @@ -41,6 +41,7 @@ "backup_settings": "备份设置", "backup_settings_description": "管理数据库备份设置", "check_all": "检查全部", + "cleanup": "清理", "cleared_jobs": "已清理任务：{job}", "config_set_by_file": "当前配置已通过配置文件设置", "confirm_delete_library": "确定要删除图库“{library}”吗？", @@ -96,7 +97,7 @@ "library_scanning_enable_description": "启用定期扫描图库", "library_settings": "外部图库", "library_settings_description": "管理外部图库设置", - "library_tasks_description": "执行图库任务", + "library_tasks_description": "扫描外部库，查找新增或修改的项目", "library_watching_enable_description": "监控外部图库文件变化", "library_watching_settings": "监控图库（实验性）", "library_watching_settings_description": "自动监控文件变化", @@ -131,7 +132,7 @@ "machine_learning_smart_search_description": "使用 CLIP 以文搜图、智能搜图", "machine_learning_smart_search_enabled": "启用智能搜索", "machine_learning_smart_search_enabled_description": "如果禁用，则不会对图像编码以用于智能搜索。", - "machine_learning_url_description": "机器学习服务器的 URL。如果提供多个 URL，则将按依次尝试连接每个服务器，直到有一个服务器成功响应为止。", + "machine_learning_url_description": "机器学习服务器的 URL。如果提供多个 URL，则将按依次尝试连接每个服务器，直到有一个服务器成功响应为止。不响应的服务器将被暂时忽略，直到它们重新联机。", "manage_concurrency": "管理任务并发", "manage_log_settings": "管理日志设置", "map_dark_style": "深色模式", @@ -147,6 +148,8 @@ "map_settings": "地图", "map_settings_description": "管理地图设置", "map_style_description": "地图主题 style.json 的 URL", + "memory_cleanup_job": "清空回忆", + "memory_generate_job": "生成回忆", "metadata_extraction_job": "提取元数据", "metadata_extraction_job_description": "从每个项目中提取元数据信息，如 GPS、人脸和分辨率", "metadata_faces_import_setting": "启用人脸导入", @@ -240,7 +243,7 @@ "storage_template_hash_verification_enabled_description": "启用哈希校验，如果您不知道此项的作用请不要禁用此功能", "storage_template_migration": "存储模板转换", "storage_template_migration_description": "应用当前的{template}到之前上传的项目", - "storage_template_migration_info": "模板修改将只作用于新的项目。如也需应用此模板到之前上传的项目，请运行{job}。", + "storage_template_migration_info": "存储模板会将所有扩展名转换为小写。模板修改只会作用于新的项目，如需应用此模板到之前上传的项目，请运行{job}。", "storage_template_migration_job": "存储模板转换任务", "storage_template_more_details": "关于本功能的更多细节，请参见存储模板及其实现方式", "storage_template_onboarding_description": "启用后，本功能将根据用户定义的模板自动整理文件。出于稳定性考虑，本功能默认是禁用的。更多详细信息请参见 文档。", @@ -299,7 +302,7 @@ "transcoding_max_b_frames": "最大B帧数", "transcoding_max_b_frames_description": "较高的值可以提高压缩效率，但会减慢编码速度。可能与旧设备上的硬件加速不兼容。0表示将禁用B帧，-1表示将自动设置此参数。", "transcoding_max_bitrate": "最高码率", - "transcoding_max_bitrate_description": "设置最大比特率可在对输出质量影响较小的情况下，使文件体积更为可控。720p 下，VP9 或 HEVC 普遍将其设为 2600K，H.264 则为 4500K。如果此项设置为 0，则不限制最大比特率。", + "transcoding_max_bitrate_description": "设置最大比特率可在对输出质量影响较小的情况下，使文件体积更为可控。720p 下，VP9 或 HEVC 普遍将其设为 2600 kbit/s，H.264 则为 4500 kbit/s。如果此项设置为 0，则不限制最大比特率。", "transcoding_max_keyframe_interval": "最大关键帧间隔", "transcoding_max_keyframe_interval_description": "设置关键帧之间的最大帧距离。较低的值会降低压缩效率，但可以提高搜索速度，并且可能在快速运动的场景中提高画质。0 表示将自动设置此参数。", "transcoding_optimal_description": "视频超过目标分辨率或格式不支持", @@ -391,6 +394,7 @@ "allow_edits": "允许编辑", "allow_public_user_to_download": "允许所有用户下载", "allow_public_user_to_upload": "允许所有用户上传", + "alt_text_qr_code": "二维码图片", "anti_clockwise": "逆时针", "api_key": "API 密钥", "api_key_description": "该应用密钥只会显示一次。请确保在关闭窗口前复制下来。", @@ -481,6 +485,7 @@ "comments_are_disabled": "评论已禁用", "confirm": "确认", "confirm_admin_password": "确认管理员密码", + "confirm_delete_face": "您确定要从资产中删除 {name} 的脸吗？", "confirm_delete_shared_link": "你确定要删除此共享链接吗？", "confirm_keep_this_delete_others": "除此项目外，堆叠中的所有其它项目都将被删除。你确定要继续吗？", "confirm_password": "确认密码", @@ -533,6 +538,7 @@ "delete_album": "删除相册", "delete_api_key_prompt": "确定删除此API key吗？", "delete_duplicates_confirmation": "你要永久删除这些重复项吗？", + "delete_face": "删除人脸", "delete_key": "删除密钥", "delete_library": "删除图库", "delete_link": "删除链接", @@ -600,6 +606,7 @@ "enabled": "已启用", "end_date": "结束日期", "error": "错误", + "error_delete_face": "删除人脸失败", "error_loading_image": "加载图片时出错", "error_title": "错误 - 好像出了问题", "errors": { @@ -884,6 +891,7 @@ "month": "月", "more": "更多", "moved_to_trash": "已放入回收站", + "mute_memories": "静音回忆", "my_albums": "我的相册", "name": "姓名", "name_or_nickname": "名称或昵称", @@ -1076,6 +1084,8 @@ "removed_from_archive": "从归档中移除", "removed_from_favorites": "从收藏中移除", "removed_from_favorites_count": "从收藏中移除{count, plural, other {#项}}", + "removed_memory": "已删除的回忆", + "removed_photo_from_memory": "从回忆中删除的照片", "removed_tagged_assets": "从 {count, plural, one {# 个项目} other {# 个项目}}中删除标签", "rename": "重命名", "repair": "修复", @@ -1084,6 +1094,7 @@ "repository": "库", "require_password": "需要密码", "require_user_to_change_password_on_first_login": "要求用户在首次登录时更改密码", + "rescan": "重新扫描", "reset": "重置", "reset_password": "重置密码", "reset_people_visibility": "重置人物可见性", @@ -1111,10 +1122,10 @@ "scanning_for_album": "扫描相册中...", "search": "搜索", "search_albums": "搜索相册", - "search_by_context": "搜索内容", - "search_by_description": "通过描述搜索", + "search_by_context": "按照片情景搜索", + "search_by_description": "按描述搜索", "search_by_description_example": "在沙巴徒步的日子", - "search_by_filename": "通过文件名搜索", + "search_by_filename": "按文件名搜索", "search_by_filename_example": "如 IMG_1234.JPG 或 PNG", "search_camera_make": "搜索相机品牌...", "search_camera_model": "搜索相机型号...", @@ -1127,6 +1138,7 @@ "search_options": "搜索选项", "search_people": "搜索人物", "search_places": "搜索地点", + "search_rating": "按星级搜索...", "search_settings": "搜索设置", "search_state": "搜索省份...", "search_tags": "搜索标签…", @@ -1250,6 +1262,7 @@ "tag_created": "已创建标签：{tag}", "tag_feature_description": "按逻辑标签分组并浏览照片和视频", "tag_not_found_question": "找不到标签吗？创建新标签", + "tag_people": "命名人物", "tag_updated": "已更新标签：{tag}", "tagged_assets": "{count, plural, one {# 个项目} other {# 个项目}}被加上标签", "tags": "标签", @@ -1290,6 +1303,7 @@ "unlink_motion_video": "取消链接动态视频", "unlink_oauth": "解绑 OAuth", "unlinked_oauth_account": "解绑 OAuth 账户", + "unmute_memories": "取消静音回忆", "unnamed_album": "未命名相册", "unnamed_album_delete_confirmation": "您确定要删除该相册吗？", "unnamed_share": "未命名共享", @@ -1343,6 +1357,7 @@ "view_all": "查看全部", "view_all_users": "查看全部用户", "view_in_timeline": "在时间轴中查看", + "view_link": "查看链接", "view_links": "查看链接", "view_name": "查看", "view_next_asset": "查看下一项", @@ -1359,4 +1374,4 @@ "yes": "是", "you_dont_have_any_shared_links": "您没有任何共享链接", "zoom_image": "缩放图像" -} +} \ No newline at end of file diff --git a/machine-learning/Dockerfile b/machine-learning/Dockerfile index f53b4fbf79..800a5ae9e6 100644 --- a/machine-learning/Dockerfile +++ b/machine-learning/Dockerfile @@ -19,16 +19,17 @@ FROM builder-${DEVICE} AS builder ARG DEVICE ENV PYTHONDONTWRITEBYTECODE=1 \ - PYTHONUNBUFFERED=1 + PYTHONUNBUFFERED=1 \ + VIRTUAL_ENV=/opt/venv WORKDIR /usr/src/app RUN apt-get update && apt-get install -y --no-install-recommends g++ -COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ +COPY --from=ghcr.io/astral-sh/uv:latest@sha256:562193a4a9d398f8aedddcb223e583da394ee735de36b5815f8f1d22cb49be15 /uv /uvx /bin/ RUN --mount=type=cache,target=/root/.cache/uv \ --mount=type=bind,source=uv.lock,target=uv.lock \ --mount=type=bind,source=pyproject.toml,target=pyproject.toml \ - uv sync --frozen --extra ${DEVICE} --no-dev --no-editable --no-install-project --compile-bytecode --no-progress + uv sync --frozen --extra ${DEVICE} --no-dev --no-editable --no-install-project --compile-bytecode --no-progress --active --link-mode copy FROM python:3.11-slim-bookworm@sha256:614c8691ab74150465ec9123378cd4dde7a6e57be9e558c3108df40664667a4c AS prod-cpu @@ -89,16 +90,17 @@ WORKDIR /usr/src/app ENV TRANSFORMERS_CACHE=/cache \ PYTHONDONTWRITEBYTECODE=1 \ PYTHONUNBUFFERED=1 \ - PATH="/usr/src/app/.venv/bin:$PATH" \ + PATH="/opt/venv/bin:$PATH" \ PYTHONPATH=/usr/src \ - DEVICE=${DEVICE} + DEVICE=${DEVICE} \ + VIRTUAL_ENV=/opt/venv # prevent core dumps RUN echo "hard core 0" >> /etc/security/limits.conf && \ echo "fs.suid_dumpable 0" >> /etc/sysctl.conf && \ echo 'ulimit -S -c 0 > /dev/null 2>&1' >> /etc/profile -COPY --from=builder /usr/src/app/.venv /usr/src/app/.venv +COPY --from=builder /opt/venv /opt/venv COPY ann/ann.py /usr/src/ann/ann.py COPY start.sh log_conf.json gunicorn_conf.py ./ COPY app . diff --git a/mobile/.fvmrc b/mobile/.fvmrc index 691c22dd17..b94131913e 100644 --- a/mobile/.fvmrc +++ b/mobile/.fvmrc @@ -1,3 +1,3 @@ { - "flutter": "3.24.5" + "flutter": "3.29.1" } diff --git a/mobile/.gitignore b/mobile/.gitignore index 0db731f953..5f6e15354f 100644 --- a/mobile/.gitignore +++ b/mobile/.gitignore @@ -45,6 +45,7 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release +android/app/.cxx # Fastlane ios/fastlane/report.xml @@ -55,4 +56,4 @@ default.isar.lock libisar.so # FVM Version -.fvm/ +.fvm/ \ No newline at end of file diff --git a/mobile/analysis_options.yaml b/mobile/analysis_options.yaml index 4e20acb72a..085449756d 100644 --- a/mobile/analysis_options.yaml +++ b/mobile/analysis_options.yaml @@ -67,7 +67,7 @@ custom_lint: - lib/entities/*.entity.dart - lib/repositories/{album,asset,backup,database,etag,exif_info,user,timeline,partner}.repository.dart - lib/infrastructure/entities/*.entity.dart - - lib/infrastructure/repositories/{store,db,log,exif}.repository.dart + - lib/infrastructure/repositories/*.repository.dart - lib/providers/infrastructure/db.provider.dart # acceptable exceptions for the time being (until Isar is fully replaced) - lib/providers/app_life_cycle.provider.dart @@ -93,6 +93,7 @@ custom_lint: - lib/infrastructure/utils/*.converter.dart # acceptable exceptions for the time being - lib/entities/{album,asset,exif_info,user}.entity.dart # to convert DTOs to entities + - lib/infrastructure/utils/*.converter.dart - lib/utils/{image_url_builder,openapi_patching}.dart # utils are fine - test/modules/utils/openapi_patching_test.dart # filename is self-explanatory... - lib/domain/services/sync_stream.service.dart # Making sure to comply with the type from database diff --git a/mobile/immich_lint/lib/immich_mobile_immich_lint.dart b/mobile/immich_lint/lib/immich_mobile_immich_lint.dart index ae757d4fa4..e2622fadd1 100644 --- a/mobile/immich_lint/lib/immich_mobile_immich_lint.dart +++ b/mobile/immich_lint/lib/immich_mobile_immich_lint.dart @@ -71,7 +71,9 @@ class ImportRule extends DartLintRule { final path = resolver.path.substring(_rootOffset); if ((_allowed != null && _allowed!.matches(path)) && - (_forbidden == null || !_forbidden!.matches(path))) return; + (_forbidden == null || !_forbidden!.matches(path))) { + return; + } context.registry.addImportDirective((node) { final uri = node.uri.stringValue; diff --git a/mobile/immich_lint/pubspec.lock b/mobile/immich_lint/pubspec.lock index e81bad7da2..6d4630f1fb 100644 --- a/mobile/immich_lint/pubspec.lock +++ b/mobile/immich_lint/pubspec.lock @@ -5,23 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77" + sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" url: "https://pub.dev" source: hosted - version: "73.0.0" + version: "76.0.0" _macros: dependency: transitive description: dart source: sdk - version: "0.3.2" + version: "0.3.3" analyzer: dependency: "direct main" description: name: analyzer - sha256: "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a" + sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" url: "https://pub.dev" source: hosted - version: "6.8.0" + version: "6.11.0" analyzer_plugin: dependency: "direct main" description: @@ -34,26 +34,26 @@ packages: dependency: transitive description: name: args - sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.6.0" async: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.13.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" checked_yaml: dependency: transitive description: @@ -74,82 +74,82 @@ packages: dependency: transitive description: name: cli_util - sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 + sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.4.2" collection: dependency: transitive description: name: collection - sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.19.0" + version: "1.19.1" convert: dependency: transitive description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" crypto: dependency: transitive description: name: crypto - sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.6" custom_lint: dependency: transitive description: name: custom_lint - sha256: "6e1ec47427ca968f22bce734d00028ae7084361999b41673291138945c5baca0" + sha256: "4500e88854e7581ee43586abeaf4443cb22375d6d289241a87b1aadf678d5545" url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "0.6.10" custom_lint_builder: dependency: "direct main" description: name: custom_lint_builder - sha256: ba2f90fff4eff71d202d097eb14b14f87087eaaef742e956208c0eb9d3a40a21 + sha256: "5a95eff100da256fbf086b329c17c8b49058c261cdf56d3a4157d3c31c511d78" url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "0.6.10" custom_lint_core: dependency: transitive description: name: custom_lint_core - sha256: "4ddbbdaa774265de44c97054dcec058a83d9081d071785ece601e348c18c267d" + sha256: "76a4046cc71d976222a078a8fd4a65e198b70545a8d690a75196dd14f08510f6" url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.10" dart_style: dependency: transitive description: name: dart_style - sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" + sha256: "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820" url: "https://pub.dev" source: hosted - version: "2.3.7" + version: "2.3.8" file: dependency: transitive description: name: file - sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" fixnum: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" freezed_annotation: dependency: transitive description: @@ -162,18 +162,18 @@ packages: dependency: "direct main" description: name: glob - sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" hotreloader: dependency: transitive description: name: hotreloader - sha256: ed56fdc1f3a8ac924e717257621d09e9ec20e308ab6352a73a50a1d7a4d9158e + sha256: bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "4.3.0" json_annotation: dependency: transitive description: @@ -186,74 +186,74 @@ packages: dependency: "direct dev" description: name: lints - sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413" + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "5.1.1" logging: dependency: transitive description: name: logging - sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" macros: dependency: transitive description: name: macros - sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" url: "https://pub.dev" source: hosted - version: "0.1.2-main.4" + version: "0.1.3-main.0" matcher: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" meta: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" package_config: dependency: transitive description: name: package_config - sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" path: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" pub_semver: dependency: transitive description: name: pub_semver - sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" pubspec_parse: dependency: transitive description: name: pubspec_parse - sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 + sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.5.0" rxdart: dependency: transitive description: @@ -266,10 +266,10 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" sprintf: dependency: transitive description: @@ -282,89 +282,89 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" stream_transform: dependency: transitive description: name: stream_transform - sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "0.7.4" typed_data: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" uuid: dependency: transitive description: name: uuid - sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77 + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.5.1" vm_service: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "15.0.0" watcher: dependency: transitive description: name: watcher - sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" yaml: dependency: transitive description: name: yaml - sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.3" sdks: - dart: ">=3.5.0 <4.0.0" + dart: ">=3.6.0 <4.0.0" diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock index c2a1056c14..4f030b0495 100644 --- a/mobile/ios/Podfile.lock +++ b/mobile/ios/Podfile.lock @@ -3,7 +3,6 @@ PODS: - Flutter - connectivity_plus (0.0.1): - Flutter - - FlutterMacOS - device_info_plus (0.0.1): - Flutter - DKImagePickerController/Core (4.3.9): @@ -43,7 +42,7 @@ PODS: - Flutter (1.0.0) - flutter_local_notifications (0.0.1): - Flutter - - flutter_native_splash (0.0.1): + - flutter_native_splash (2.4.3): - Flutter - flutter_udid (0.0.1): - Flutter @@ -52,7 +51,6 @@ PODS: - Flutter - fluttertoast (0.0.2): - Flutter - - Toast - geolocator_apple (1.2.0): - Flutter - image_picker_ios (0.0.1): @@ -61,10 +59,10 @@ PODS: - Flutter - isar_flutter_libs (1.0.0): - Flutter - - MapLibre (5.14.0-pre3) + - MapLibre (6.5.0) - maplibre_gl (0.0.1): - Flutter - - MapLibre (= 5.14.0-pre3) + - MapLibre (= 6.5.0) - native_video_player (1.0.0): - Flutter - network_info_plus (0.0.1): @@ -74,17 +72,15 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - path_provider_ios (0.0.1): - - Flutter - permission_handler_apple (9.3.0): - Flutter - photo_manager (2.0.0): - Flutter - FlutterMacOS - SAMKeychain (1.5.3) - - SDWebImage (5.20.0): - - SDWebImage/Core (= 5.20.0) - - SDWebImage/Core (5.20.0) + - SDWebImage (5.21.0): + - SDWebImage/Core (= 5.21.0) + - SDWebImage/Core (5.21.0) - share_handler_ios (0.0.14): - Flutter - share_handler_ios/share_handler_ios_models (= 0.0.14) @@ -98,11 +94,10 @@ PODS: - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - sqflite (0.0.3): + - sqflite_darwin (0.0.4): - Flutter - FlutterMacOS - SwiftyGif (5.4.5) - - Toast (4.1.1) - url_launcher_ios (0.0.1): - Flutter - wakelock_plus (0.0.1): @@ -110,7 +105,7 @@ PODS: DEPENDENCIES: - background_downloader (from `.symlinks/plugins/background_downloader/ios`) - - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`) + - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - file_picker (from `.symlinks/plugins/file_picker/ios`) - Flutter (from `Flutter`) @@ -128,14 +123,13 @@ DEPENDENCIES: - network_info_plus (from `.symlinks/plugins/network_info_plus/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - photo_manager (from `.symlinks/plugins/photo_manager/ios`) - share_handler_ios (from `.symlinks/plugins/share_handler_ios/ios`) - share_handler_ios_models (from `.symlinks/plugins/share_handler_ios/ios/Models`) - share_plus (from `.symlinks/plugins/share_plus/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - - sqflite (from `.symlinks/plugins/sqflite/darwin`) + - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`) @@ -147,13 +141,12 @@ SPEC REPOS: - SAMKeychain - SDWebImage - SwiftyGif - - Toast EXTERNAL SOURCES: background_downloader: :path: ".symlinks/plugins/background_downloader/ios" connectivity_plus: - :path: ".symlinks/plugins/connectivity_plus/darwin" + :path: ".symlinks/plugins/connectivity_plus/ios" device_info_plus: :path: ".symlinks/plugins/device_info_plus/ios" file_picker: @@ -188,8 +181,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/package_info_plus/ios" path_provider_foundation: :path: ".symlinks/plugins/path_provider_foundation/darwin" - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" photo_manager: @@ -202,50 +193,48 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/share_plus/ios" shared_preferences_foundation: :path: ".symlinks/plugins/shared_preferences_foundation/darwin" - sqflite: - :path: ".symlinks/plugins/sqflite/darwin" + sqflite_darwin: + :path: ".symlinks/plugins/sqflite_darwin/darwin" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" wakelock_plus: :path: ".symlinks/plugins/wakelock_plus/ios" SPEC CHECKSUMS: - background_downloader: 9f788ffc5de45acf87d6380e91ca0841066c18cf - connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db + background_downloader: 3ca0e156ad83a9fc1c8300f5f7c38e94e2d0bf51 + connectivity_plus: 2a701ffec2c0ae28a48cf7540e279787e77c447d device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342 DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 - file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655 + file_picker: b159e0c068aef54932bb15dc9fd1571818edaf49 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086 - flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778 - flutter_udid: a2482c67a61b9c806ef59dd82ed8d007f1b7ac04 + flutter_native_splash: df59bb2e1421aa0282cb2e95618af4dcb0c56c29 + flutter_udid: b2417673f287ee62817a1de3d1643f47b9f508ab flutter_web_auth_2: 06d500582775790a0d4c323222fcb6d7990f9603 - fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c - geolocator_apple: 6cbaf322953988e009e5ecb481f07efece75c450 + fluttertoast: 21eecd6935e7064cc1fcb733a4c5a428f3f24f0f + geolocator_apple: 9bcea1918ff7f0062d98345d238ae12718acfbc1 image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1 integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573 isar_flutter_libs: fdf730ca925d05687f36d7f1d355e482529ed097 - MapLibre: 620fc933c1d6029b33738c905c1490d024e5d4ef - maplibre_gl: a2efec727dd340e4c65e26d2b03b584f14881fd9 + MapLibre: 0ebfa9329d313cec8bf0a5ba5a336a1dc903785e + maplibre_gl: be7b98f1c3ed75bf77f321eec04df359d0ff6f62 native_video_player: d12af78a1a4a8cf09775a5177d5b392def6fd23c network_info_plus: 6613d9d7cdeb0e6f366ed4dbe4b3c51c52d567a9 package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4 path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 - path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 photo_manager: ff695c7a1dd5bc379974953a2b5c0a293f7c4c8a SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c - SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8 + SDWebImage: f84b0feeb08d2d11e6a9b843cb06d75ebf5b8868 share_handler_ios: 6dd3a4ac5ca0d955274aec712ba0ecdcaf583e7c share_handler_ios_models: fc638c9b4330dc7f082586c92aee9dfa0b87b871 share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 - sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec + sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 - Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe - wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1 + wakelock_plus: 373cfe59b235a6dd5837d0fb88791d2f13a90d56 PODFILE CHECKSUM: 03b7eead4ee77b9e778179eeb0f3b5513617451c diff --git a/mobile/ios/Runner/AppDelegate.swift b/mobile/ios/Runner/AppDelegate.swift index 6c749cdb9f..fd62618205 100644 --- a/mobile/ios/Runner/AppDelegate.swift +++ b/mobile/ios/Runner/AppDelegate.swift @@ -1,7 +1,7 @@ import BackgroundTasks import Flutter import network_info_plus -import path_provider_ios +import path_provider_foundation import permission_handler_apple import photo_manager import shared_preferences_foundation @@ -24,8 +24,8 @@ import UIKit BackgroundServicePlugin.register(with: self.registrar(forPlugin: "BackgroundServicePlugin")!) BackgroundServicePlugin.setPluginRegistrantCallback { registry in - if !registry.hasPlugin("org.cocoapods.path-provider-ios") { - FLTPathProviderPlugin.register(with: registry.registrar(forPlugin: "org.cocoapods.path-provider-ios")!) + if !registry.hasPlugin("org.cocoapods.path-provider-foundation") { + PathProviderPlugin.register(with: registry.registrar(forPlugin: "org.cocoapods.path-provider-foundation")!) } if !registry.hasPlugin("org.cocoapods.photo-manager") { diff --git a/mobile/lib/domain/interfaces/user.interface.dart b/mobile/lib/domain/interfaces/user.interface.dart new file mode 100644 index 0000000000..03f3ebb63e --- /dev/null +++ b/mobile/lib/domain/interfaces/user.interface.dart @@ -0,0 +1,24 @@ +import 'package:immich_mobile/domain/interfaces/db.interface.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; + +abstract interface class IUserRepository implements IDatabaseRepository { + Future insert(UserDto user); + + Future get(int id); + + Future getByUserId(String id); + + Future> getByUserIds(List ids); + + Future> getAll({SortUserBy? sortBy}); + + Future updateAll(List users); + + Future update(UserDto user); + + Future delete(List ids); + + Future deleteAll(); +} + +enum SortUserBy { id } diff --git a/mobile/lib/domain/interfaces/user_api.repository.dart b/mobile/lib/domain/interfaces/user_api.repository.dart new file mode 100644 index 0000000000..9889654a52 --- /dev/null +++ b/mobile/lib/domain/interfaces/user_api.repository.dart @@ -0,0 +1,15 @@ +import 'dart:typed_data'; + +import 'package:immich_mobile/domain/models/user.model.dart'; + +abstract interface class IUserApiRepository { + Future getMyUser(); + + Future> getAll(); + + /// Saves the [data] in the server and uses it as the current users profile image + Future createProfileImage({ + required String name, + required Uint8List data, + }); +} diff --git a/mobile/lib/domain/models/store.model.dart b/mobile/lib/domain/models/store.model.dart index 06b946b3f6..8a99d68b8f 100644 --- a/mobile/lib/domain/models/store.model.dart +++ b/mobile/lib/domain/models/store.model.dart @@ -1,11 +1,11 @@ -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; /// Key for each possible value in the `Store`. /// Defines the data type for each value enum StoreKey { version._(0), assetETag._(1), - currentUser._(2), + currentUser._(2), deviceIdHash._(3), deviceId._(4), backupFailedSince._(5), diff --git a/mobile/lib/domain/models/user.model.dart b/mobile/lib/domain/models/user.model.dart new file mode 100644 index 0000000000..ceb65f313a --- /dev/null +++ b/mobile/lib/domain/models/user.model.dart @@ -0,0 +1,157 @@ +import 'dart:ui'; + +import 'package:immich_mobile/utils/hash.dart'; + +enum AvatarColor { + // do not change this order or reuse indices for other purposes, adding is OK + primary, + pink, + red, + yellow, + blue, + green, + purple, + orange, + gray, + amber; + + Color toColor({bool isDarkTheme = false}) => switch (this) { + AvatarColor.primary => + isDarkTheme ? const Color(0xFFABCBFA) : const Color(0xFF4250AF), + AvatarColor.pink => const Color.fromARGB(255, 244, 114, 182), + AvatarColor.red => const Color.fromARGB(255, 239, 68, 68), + AvatarColor.yellow => const Color.fromARGB(255, 234, 179, 8), + AvatarColor.blue => const Color.fromARGB(255, 59, 130, 246), + AvatarColor.green => const Color.fromARGB(255, 22, 163, 74), + AvatarColor.purple => const Color.fromARGB(255, 147, 51, 234), + AvatarColor.orange => const Color.fromARGB(255, 234, 88, 12), + AvatarColor.gray => const Color.fromARGB(255, 75, 85, 99), + AvatarColor.amber => const Color.fromARGB(255, 217, 119, 6), + }; +} + +// TODO: Rename to User once Isar is removed +class UserDto { + final String uid; + final String email; + final String name; + final bool isAdmin; + final DateTime updatedAt; + + final String? profileImagePath; + final AvatarColor avatarColor; + + final bool memoryEnabled; + final bool inTimeline; + + final bool isPartnerSharedBy; + final bool isPartnerSharedWith; + + final int quotaUsageInBytes; + final int quotaSizeInBytes; + + int get id => fastHash(uid); + bool get hasQuota => quotaSizeInBytes > 0; + + const UserDto({ + required this.uid, + required this.email, + required this.name, + required this.isAdmin, + required this.updatedAt, + this.profileImagePath, + this.avatarColor = AvatarColor.primary, + this.memoryEnabled = true, + this.inTimeline = false, + this.isPartnerSharedBy = false, + this.isPartnerSharedWith = false, + this.quotaUsageInBytes = 0, + this.quotaSizeInBytes = 0, + }); + + @override + String toString() { + return '''User: { +id: $id, +uid: $uid, +email: $email, +name: $name, +isAdmin: $isAdmin, +updatedAt: $updatedAt, +profileImagePath: ${profileImagePath ?? ''}, +avatarColor: $avatarColor, +memoryEnabled: $memoryEnabled, +inTimeline: $inTimeline, +isPartnerSharedBy: $isPartnerSharedBy, +isPartnerSharedWith: $isPartnerSharedWith, +quotaUsageInBytes: $quotaUsageInBytes, +quotaSizeInBytes: $quotaSizeInBytes, +}'''; + } + + UserDto copyWith({ + String? uid, + String? email, + String? name, + bool? isAdmin, + DateTime? updatedAt, + String? profileImagePath, + AvatarColor? avatarColor, + bool? memoryEnabled, + bool? inTimeline, + bool? isPartnerSharedBy, + bool? isPartnerSharedWith, + int? quotaUsageInBytes, + int? quotaSizeInBytes, + }) => + UserDto( + uid: uid ?? this.uid, + email: email ?? this.email, + name: name ?? this.name, + isAdmin: isAdmin ?? this.isAdmin, + updatedAt: updatedAt ?? this.updatedAt, + profileImagePath: profileImagePath ?? this.profileImagePath, + avatarColor: avatarColor ?? this.avatarColor, + memoryEnabled: memoryEnabled ?? this.memoryEnabled, + inTimeline: inTimeline ?? this.inTimeline, + isPartnerSharedBy: isPartnerSharedBy ?? this.isPartnerSharedBy, + isPartnerSharedWith: isPartnerSharedWith ?? this.isPartnerSharedWith, + quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes, + quotaSizeInBytes: quotaSizeInBytes ?? this.quotaSizeInBytes, + ); + + @override + bool operator ==(covariant UserDto other) { + if (identical(this, other)) return true; + + return other.uid == uid && + other.updatedAt.isAtSameMomentAs(updatedAt) && + other.avatarColor == avatarColor && + other.email == email && + other.name == name && + other.isPartnerSharedBy == isPartnerSharedBy && + other.isPartnerSharedWith == isPartnerSharedWith && + other.profileImagePath == profileImagePath && + other.isAdmin == isAdmin && + other.memoryEnabled == memoryEnabled && + other.inTimeline == inTimeline && + other.quotaUsageInBytes == quotaUsageInBytes && + other.quotaSizeInBytes == quotaSizeInBytes; + } + + @override + int get hashCode => + uid.hashCode ^ + name.hashCode ^ + email.hashCode ^ + updatedAt.hashCode ^ + isAdmin.hashCode ^ + profileImagePath.hashCode ^ + avatarColor.hashCode ^ + memoryEnabled.hashCode ^ + inTimeline.hashCode ^ + isPartnerSharedBy.hashCode ^ + isPartnerSharedWith.hashCode ^ + quotaUsageInBytes.hashCode ^ + quotaSizeInBytes.hashCode; +} diff --git a/mobile/lib/domain/services/store.service.dart b/mobile/lib/domain/services/store.service.dart index 70b9f31c00..73426cbf4e 100644 --- a/mobile/lib/domain/services/store.service.dart +++ b/mobile/lib/domain/services/store.service.dart @@ -74,7 +74,7 @@ class StoreService { return value; } - /// Asynchronously stores the value in the DB and synchronously in the cache + /// Asynchronously stores the value in the Store Future put, T>(U key, T value) async { if (_cache[key.id] == value) return; await _storeRepository.insert(key, value); @@ -84,7 +84,7 @@ class StoreService { /// Watches a specific key for changes Stream watch(StoreKey key) => _storeRepository.watch(key); - /// Removes the value asynchronously from the DB and synchronously from the cache + /// Removes the value asynchronously from the Store Future delete(StoreKey key) async { await _storeRepository.delete(key); _cache.remove(key.id); diff --git a/mobile/lib/domain/services/user.service.dart b/mobile/lib/domain/services/user.service.dart new file mode 100644 index 0000000000..48a6f5777d --- /dev/null +++ b/mobile/lib/domain/services/user.service.dart @@ -0,0 +1,64 @@ +import 'dart:async'; +import 'dart:typed_data'; + +import 'package:immich_mobile/domain/interfaces/user.interface.dart'; +import 'package:immich_mobile/domain/interfaces/user_api.repository.dart'; +import 'package:immich_mobile/domain/models/store.model.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; +import 'package:immich_mobile/domain/services/store.service.dart'; +import 'package:logging/logging.dart'; + +class UserService { + final Logger _log = Logger("UserService"); + final IUserRepository _userRepository; + final IUserApiRepository _userApiRepository; + final StoreService _storeService; + + UserService({ + required IUserRepository userRepository, + required IUserApiRepository userApiRepository, + required StoreService storeService, + }) : _userRepository = userRepository, + _userApiRepository = userApiRepository, + _storeService = storeService; + + UserDto getMyUser() { + return _storeService.get(StoreKey.currentUser); + } + + UserDto? tryGetMyUser() { + return _storeService.tryGet(StoreKey.currentUser); + } + + Stream watchMyUser() { + return _storeService.watch(StoreKey.currentUser); + } + + Future refreshMyUser() async { + final user = await _userApiRepository.getMyUser(); + if (user == null) return null; + await _storeService.put(StoreKey.currentUser, user); + await _userRepository.update(user); + return user; + } + + Future createProfileImage(String name, Uint8List image) async { + try { + return await _userApiRepository.createProfileImage( + name: name, + data: image, + ); + } catch (e) { + _log.warning("Failed to upload profile image", e); + return null; + } + } + + Future> getAll() async { + return await _userRepository.getAll(); + } + + Future deleteAll() { + return _userRepository.deleteAll(); + } +} diff --git a/mobile/lib/entities/album.entity.dart b/mobile/lib/entities/album.entity.dart index 8caff2255f..8b466da1db 100644 --- a/mobile/lib/entities/album.entity.dart +++ b/mobile/lib/entities/album.entity.dart @@ -1,7 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:immich_mobile/constants/enums.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart'; import 'package:immich_mobile/utils/datetime_comparison.dart'; import 'package:isar/isar.dart'; // ignore: implementation_imports diff --git a/mobile/lib/entities/user.entity.dart b/mobile/lib/entities/user.entity.dart deleted file mode 100644 index 8fa6e83874..0000000000 --- a/mobile/lib/entities/user.entity.dart +++ /dev/null @@ -1,181 +0,0 @@ -import 'dart:ui'; - -import 'package:immich_mobile/entities/album.entity.dart'; -import 'package:immich_mobile/utils/hash.dart'; -import 'package:isar/isar.dart'; -import 'package:openapi/api.dart'; - -part 'user.entity.g.dart'; - -@Collection(inheritance: false) -class User { - User({ - required this.id, - required this.updatedAt, - required this.email, - required this.name, - required this.isAdmin, - this.isPartnerSharedBy = false, - this.isPartnerSharedWith = false, - this.profileImagePath = '', - this.avatarColor = AvatarColorEnum.primary, - this.memoryEnabled = true, - this.inTimeline = false, - this.quotaUsageInBytes = 0, - this.quotaSizeInBytes = 0, - }); - - Id get isarId => fastHash(id); - - User.fromUserDto( - UserAdminResponseDto dto, - UserPreferencesResponseDto? preferences, - ) : id = dto.id, - updatedAt = dto.updatedAt, - email = dto.email, - name = dto.name, - isPartnerSharedBy = false, - isPartnerSharedWith = false, - profileImagePath = dto.profileImagePath, - isAdmin = dto.isAdmin, - memoryEnabled = preferences?.memories.enabled ?? false, - avatarColor = dto.avatarColor.toAvatarColor(), - inTimeline = false, - quotaUsageInBytes = dto.quotaUsageInBytes ?? 0, - quotaSizeInBytes = dto.quotaSizeInBytes ?? 0; - - User.fromPartnerDto(PartnerResponseDto dto) - : id = dto.id, - updatedAt = DateTime.now(), - email = dto.email, - name = dto.name, - isPartnerSharedBy = false, - isPartnerSharedWith = false, - profileImagePath = dto.profileImagePath, - isAdmin = false, - memoryEnabled = false, - avatarColor = dto.avatarColor.toAvatarColor(), - inTimeline = dto.inTimeline ?? false, - quotaUsageInBytes = 0, - quotaSizeInBytes = 0; - - /// Base user dto used where the complete user object is not required - User.fromSimpleUserDto(UserResponseDto dto) - : id = dto.id, - email = dto.email, - name = dto.name, - profileImagePath = dto.profileImagePath, - avatarColor = dto.avatarColor.toAvatarColor(), - // Fill the remaining fields with placeholders - isAdmin = false, - inTimeline = false, - memoryEnabled = false, - isPartnerSharedBy = false, - isPartnerSharedWith = false, - updatedAt = DateTime.now(), - quotaUsageInBytes = 0, - quotaSizeInBytes = 0; - - @Index(unique: true, replace: false, type: IndexType.hash) - String id; - DateTime updatedAt; - String email; - String name; - bool isPartnerSharedBy; - bool isPartnerSharedWith; - bool isAdmin; - String profileImagePath; - @Enumerated(EnumType.ordinal) - AvatarColorEnum avatarColor; - bool memoryEnabled; - bool inTimeline; - int quotaUsageInBytes; - int quotaSizeInBytes; - - bool get hasQuota => quotaSizeInBytes > 0; - @Backlink(to: 'owner') - final IsarLinks albums = IsarLinks(); - @Backlink(to: 'sharedUsers') - final IsarLinks sharedAlbums = IsarLinks(); - - @override - bool operator ==(other) { - if (other is! User) return false; - return id == other.id && - updatedAt.isAtSameMomentAs(other.updatedAt) && - avatarColor == other.avatarColor && - email == other.email && - name == other.name && - isPartnerSharedBy == other.isPartnerSharedBy && - isPartnerSharedWith == other.isPartnerSharedWith && - profileImagePath == other.profileImagePath && - isAdmin == other.isAdmin && - memoryEnabled == other.memoryEnabled && - inTimeline == other.inTimeline && - quotaUsageInBytes == other.quotaUsageInBytes && - quotaSizeInBytes == other.quotaSizeInBytes; - } - - @override - @ignore - int get hashCode => - id.hashCode ^ - updatedAt.hashCode ^ - email.hashCode ^ - name.hashCode ^ - isPartnerSharedBy.hashCode ^ - isPartnerSharedWith.hashCode ^ - profileImagePath.hashCode ^ - avatarColor.hashCode ^ - isAdmin.hashCode ^ - memoryEnabled.hashCode ^ - inTimeline.hashCode ^ - quotaUsageInBytes.hashCode ^ - quotaSizeInBytes.hashCode; -} - -enum AvatarColorEnum { - // do not change this order or reuse indices for other purposes, adding is OK - primary, - pink, - red, - yellow, - blue, - green, - purple, - orange, - gray, - amber, -} - -extension AvatarColorEnumHelper on UserAvatarColor { - AvatarColorEnum toAvatarColor() => switch (this) { - UserAvatarColor.primary => AvatarColorEnum.primary, - UserAvatarColor.pink => AvatarColorEnum.pink, - UserAvatarColor.red => AvatarColorEnum.red, - UserAvatarColor.yellow => AvatarColorEnum.yellow, - UserAvatarColor.blue => AvatarColorEnum.blue, - UserAvatarColor.green => AvatarColorEnum.green, - UserAvatarColor.purple => AvatarColorEnum.purple, - UserAvatarColor.orange => AvatarColorEnum.orange, - UserAvatarColor.gray => AvatarColorEnum.gray, - UserAvatarColor.amber => AvatarColorEnum.amber, - _ => AvatarColorEnum.primary, - }; -} - -extension AvatarColorToColorHelper on AvatarColorEnum { - Color toColor([bool isDarkTheme = false]) => switch (this) { - AvatarColorEnum.primary => - isDarkTheme ? const Color(0xFFABCBFA) : const Color(0xFF4250AF), - AvatarColorEnum.pink => const Color.fromARGB(255, 244, 114, 182), - AvatarColorEnum.red => const Color.fromARGB(255, 239, 68, 68), - AvatarColorEnum.yellow => const Color.fromARGB(255, 234, 179, 8), - AvatarColorEnum.blue => const Color.fromARGB(255, 59, 130, 246), - AvatarColorEnum.green => const Color.fromARGB(255, 22, 163, 74), - AvatarColorEnum.purple => const Color.fromARGB(255, 147, 51, 234), - AvatarColorEnum.orange => const Color.fromARGB(255, 234, 88, 12), - AvatarColorEnum.gray => const Color.fromARGB(255, 75, 85, 99), - AvatarColorEnum.amber => const Color.fromARGB(255, 217, 119, 6), - }; -} diff --git a/mobile/lib/extensions/collection_extensions.dart b/mobile/lib/extensions/collection_extensions.dart index d27c9e9500..e02582588b 100644 --- a/mobile/lib/extensions/collection_extensions.dart +++ b/mobile/lib/extensions/collection_extensions.dart @@ -1,8 +1,8 @@ import 'dart:typed_data'; import 'package:collection/collection.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; extension ListExtension on List { List uniqueConsecutive({ @@ -58,11 +58,11 @@ extension AssetListExtension on Iterable { /// Returns the assets that are owned by the user passed to the [owner] param /// If [owner] is null, an empty list is returned Iterable ownedOnly( - User? owner, { + UserDto? owner, { void Function()? errorCallback, }) { if (owner == null) return []; - final userId = owner.isarId; + final userId = owner.id; final bool onlyOwned = every((e) => e.ownerId == userId); if (!onlyOwned) { if (errorCallback != null) errorCallback(); diff --git a/mobile/lib/extensions/maplibrecontroller_extensions.dart b/mobile/lib/extensions/maplibrecontroller_extensions.dart index b2d21164b5..42d5e2c1d0 100644 --- a/mobile/lib/extensions/maplibrecontroller_extensions.dart +++ b/mobile/lib/extensions/maplibrecontroller_extensions.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:io'; import 'dart:math'; import 'package:flutter/services.dart'; @@ -40,25 +41,29 @@ extension MapMarkers on MapLibreMapController { await addGeoJSONSourceForMarkers(markers); - await addCircleLayer( - MapUtils.defaultSourceId, - MapUtils.defaultHeatMapLayerId, - const CircleLayerProperties( - circleRadius: 10, - circleColor: "rgba(150,86,34,0.7)", - circleBlur: 1.0, - circleOpacity: 0.7, - circleStrokeWidth: 0.1, - circleStrokeColor: "rgba(203,46,19,0.5)", - circleStrokeOpacity: 0.7, - ), - ); + if (Platform.isAndroid) { + await addCircleLayer( + MapUtils.defaultSourceId, + MapUtils.defaultHeatMapLayerId, + const CircleLayerProperties( + circleRadius: 10, + circleColor: "rgba(150,86,34,0.7)", + circleBlur: 1.0, + circleOpacity: 0.7, + circleStrokeWidth: 0.1, + circleStrokeColor: "rgba(203,46,19,0.5)", + circleStrokeOpacity: 0.7, + ), + ); + } - // await addHeatmapLayer( - // MapUtils.defaultSourceId, - // MapUtils.defaultHeatMapLayerId, - // MapUtils.defaultHeatMapLayerProperties, - // ); + if (Platform.isIOS) { + await addHeatmapLayer( + MapUtils.defaultSourceId, + MapUtils.defaultHeatMapLayerId, + MapUtils.defaultHeatMapLayerProperties, + ); + } _completer.complete(); } diff --git a/mobile/lib/extensions/theme_extensions.dart b/mobile/lib/extensions/theme_extensions.dart index 3e17e2b991..b81e4476e0 100644 --- a/mobile/lib/extensions/theme_extensions.dart +++ b/mobile/lib/extensions/theme_extensions.dart @@ -10,14 +10,14 @@ extension ImmichColorSchemeExtensions on ColorScheme { extension ColorExtensions on Color { Color lighten({double amount = 0.1}) { return Color.alphaBlend( - Colors.white.withOpacity(amount), + Colors.white.withValues(alpha: amount), this, ); } Color darken({double amount = 0.1}) { return Color.alphaBlend( - Colors.black.withOpacity(amount), + Colors.black.withValues(alpha: amount), this, ); } diff --git a/mobile/lib/infrastructure/entities/exif.entity.dart b/mobile/lib/infrastructure/entities/exif.entity.dart index 42ec00a2f5..5a93bc9768 100644 --- a/mobile/lib/infrastructure/entities/exif.entity.dart +++ b/mobile/lib/infrastructure/entities/exif.entity.dart @@ -1,4 +1,5 @@ import 'package:immich_mobile/domain/models/exif.model.dart' as domain; +import 'package:immich_mobile/infrastructure/utils/exif.converter.dart'; import 'package:isar/isar.dart'; part 'exif.entity.g.dart'; @@ -74,6 +75,7 @@ class ExifInfo { orientation: orientation, timeZone: timeZone, dateTimeOriginal: dateTimeOriginal, + isFlipped: ExifDtoConverter.isOrientationFlipped(orientation), latitude: lat, longitude: long, city: city, diff --git a/mobile/lib/infrastructure/entities/user.entity.dart b/mobile/lib/infrastructure/entities/user.entity.dart new file mode 100644 index 0000000000..834559b936 --- /dev/null +++ b/mobile/lib/infrastructure/entities/user.entity.dart @@ -0,0 +1,73 @@ +import 'package:immich_mobile/domain/models/user.model.dart'; +import 'package:immich_mobile/utils/hash.dart'; +import 'package:isar/isar.dart'; + +part 'user.entity.g.dart'; + +@Collection(inheritance: false) +class User { + Id get isarId => fastHash(id); + @Index(unique: true, replace: false, type: IndexType.hash) + final String id; + final DateTime updatedAt; + final String email; + final String name; + final bool isPartnerSharedBy; + final bool isPartnerSharedWith; + final bool isAdmin; + final String profileImagePath; + @Enumerated(EnumType.ordinal) + final AvatarColor avatarColor; + final bool memoryEnabled; + final bool inTimeline; + final int quotaUsageInBytes; + final int quotaSizeInBytes; + + const User({ + required this.id, + required this.updatedAt, + required this.email, + required this.name, + required this.isAdmin, + this.isPartnerSharedBy = false, + this.isPartnerSharedWith = false, + this.profileImagePath = '', + this.avatarColor = AvatarColor.primary, + this.memoryEnabled = true, + this.inTimeline = false, + this.quotaUsageInBytes = 0, + this.quotaSizeInBytes = 0, + }); + + static User fromDto(UserDto dto) => User( + id: dto.uid, + updatedAt: dto.updatedAt, + email: dto.email, + name: dto.name, + isAdmin: dto.isAdmin, + isPartnerSharedBy: dto.isPartnerSharedBy, + isPartnerSharedWith: dto.isPartnerSharedWith, + profileImagePath: dto.profileImagePath ?? "", + avatarColor: dto.avatarColor, + memoryEnabled: dto.memoryEnabled, + inTimeline: dto.inTimeline, + quotaUsageInBytes: dto.quotaUsageInBytes, + quotaSizeInBytes: dto.quotaSizeInBytes, + ); + + UserDto toDto() => UserDto( + uid: id, + email: email, + name: name, + isAdmin: isAdmin, + updatedAt: updatedAt, + profileImagePath: profileImagePath.isEmpty ? null : profileImagePath, + avatarColor: avatarColor, + memoryEnabled: memoryEnabled, + inTimeline: inTimeline, + isPartnerSharedBy: isPartnerSharedBy, + isPartnerSharedWith: isPartnerSharedWith, + quotaUsageInBytes: quotaUsageInBytes, + quotaSizeInBytes: quotaSizeInBytes, + ); +} diff --git a/mobile/lib/entities/user.entity.g.dart b/mobile/lib/infrastructure/entities/user.entity.g.dart similarity index 86% rename from mobile/lib/entities/user.entity.g.dart rename to mobile/lib/infrastructure/entities/user.entity.g.dart index a7aaee44bf..37a793b2c3 100644 --- a/mobile/lib/entities/user.entity.g.dart +++ b/mobile/lib/infrastructure/entities/user.entity.g.dart @@ -28,63 +28,58 @@ const UserSchema = CollectionSchema( name: r'email', type: IsarType.string, ), - r'hasQuota': PropertySchema( - id: 2, - name: r'hasQuota', - type: IsarType.bool, - ), r'id': PropertySchema( - id: 3, + id: 2, name: r'id', type: IsarType.string, ), r'inTimeline': PropertySchema( - id: 4, + id: 3, name: r'inTimeline', type: IsarType.bool, ), r'isAdmin': PropertySchema( - id: 5, + id: 4, name: r'isAdmin', type: IsarType.bool, ), r'isPartnerSharedBy': PropertySchema( - id: 6, + id: 5, name: r'isPartnerSharedBy', type: IsarType.bool, ), r'isPartnerSharedWith': PropertySchema( - id: 7, + id: 6, name: r'isPartnerSharedWith', type: IsarType.bool, ), r'memoryEnabled': PropertySchema( - id: 8, + id: 7, name: r'memoryEnabled', type: IsarType.bool, ), r'name': PropertySchema( - id: 9, + id: 8, name: r'name', type: IsarType.string, ), r'profileImagePath': PropertySchema( - id: 10, + id: 9, name: r'profileImagePath', type: IsarType.string, ), r'quotaSizeInBytes': PropertySchema( - id: 11, + id: 10, name: r'quotaSizeInBytes', type: IsarType.long, ), r'quotaUsageInBytes': PropertySchema( - id: 12, + id: 11, name: r'quotaUsageInBytes', type: IsarType.long, ), r'updatedAt': PropertySchema( - id: 13, + id: 12, name: r'updatedAt', type: IsarType.dateTime, ) @@ -109,22 +104,7 @@ const UserSchema = CollectionSchema( ], ) }, - links: { - r'albums': LinkSchema( - id: -8764917375410137318, - name: r'albums', - target: r'Album', - single: false, - linkName: r'owner', - ), - r'sharedAlbums': LinkSchema( - id: -7037628715076287024, - name: r'sharedAlbums', - target: r'Album', - single: false, - linkName: r'sharedUsers', - ) - }, + links: {}, embeddedSchemas: {}, getId: _userGetId, getLinks: _userGetLinks, @@ -153,18 +133,17 @@ void _userSerialize( ) { writer.writeByte(offsets[0], object.avatarColor.index); writer.writeString(offsets[1], object.email); - writer.writeBool(offsets[2], object.hasQuota); - writer.writeString(offsets[3], object.id); - writer.writeBool(offsets[4], object.inTimeline); - writer.writeBool(offsets[5], object.isAdmin); - writer.writeBool(offsets[6], object.isPartnerSharedBy); - writer.writeBool(offsets[7], object.isPartnerSharedWith); - writer.writeBool(offsets[8], object.memoryEnabled); - writer.writeString(offsets[9], object.name); - writer.writeString(offsets[10], object.profileImagePath); - writer.writeLong(offsets[11], object.quotaSizeInBytes); - writer.writeLong(offsets[12], object.quotaUsageInBytes); - writer.writeDateTime(offsets[13], object.updatedAt); + writer.writeString(offsets[2], object.id); + writer.writeBool(offsets[3], object.inTimeline); + writer.writeBool(offsets[4], object.isAdmin); + writer.writeBool(offsets[5], object.isPartnerSharedBy); + writer.writeBool(offsets[6], object.isPartnerSharedWith); + writer.writeBool(offsets[7], object.memoryEnabled); + writer.writeString(offsets[8], object.name); + writer.writeString(offsets[9], object.profileImagePath); + writer.writeLong(offsets[10], object.quotaSizeInBytes); + writer.writeLong(offsets[11], object.quotaUsageInBytes); + writer.writeDateTime(offsets[12], object.updatedAt); } User _userDeserialize( @@ -176,19 +155,19 @@ User _userDeserialize( final object = User( avatarColor: _UseravatarColorValueEnumMap[reader.readByteOrNull(offsets[0])] ?? - AvatarColorEnum.primary, + AvatarColor.primary, email: reader.readString(offsets[1]), - id: reader.readString(offsets[3]), - inTimeline: reader.readBoolOrNull(offsets[4]) ?? false, - isAdmin: reader.readBool(offsets[5]), - isPartnerSharedBy: reader.readBoolOrNull(offsets[6]) ?? false, - isPartnerSharedWith: reader.readBoolOrNull(offsets[7]) ?? false, - memoryEnabled: reader.readBoolOrNull(offsets[8]) ?? true, - name: reader.readString(offsets[9]), - profileImagePath: reader.readStringOrNull(offsets[10]) ?? '', - quotaSizeInBytes: reader.readLongOrNull(offsets[11]) ?? 0, - quotaUsageInBytes: reader.readLongOrNull(offsets[12]) ?? 0, - updatedAt: reader.readDateTime(offsets[13]), + id: reader.readString(offsets[2]), + inTimeline: reader.readBoolOrNull(offsets[3]) ?? false, + isAdmin: reader.readBool(offsets[4]), + isPartnerSharedBy: reader.readBoolOrNull(offsets[5]) ?? false, + isPartnerSharedWith: reader.readBoolOrNull(offsets[6]) ?? false, + memoryEnabled: reader.readBoolOrNull(offsets[7]) ?? true, + name: reader.readString(offsets[8]), + profileImagePath: reader.readStringOrNull(offsets[9]) ?? '', + quotaSizeInBytes: reader.readLongOrNull(offsets[10]) ?? 0, + quotaUsageInBytes: reader.readLongOrNull(offsets[11]) ?? 0, + updatedAt: reader.readDateTime(offsets[12]), ); return object; } @@ -202,32 +181,30 @@ P _userDeserializeProp

( switch (propertyId) { case 0: return (_UseravatarColorValueEnumMap[reader.readByteOrNull(offset)] ?? - AvatarColorEnum.primary) as P; + AvatarColor.primary) as P; case 1: return (reader.readString(offset)) as P; case 2: - return (reader.readBool(offset)) as P; - case 3: return (reader.readString(offset)) as P; - case 4: + case 3: return (reader.readBoolOrNull(offset) ?? false) as P; - case 5: + case 4: return (reader.readBool(offset)) as P; + case 5: + return (reader.readBoolOrNull(offset) ?? false) as P; case 6: return (reader.readBoolOrNull(offset) ?? false) as P; case 7: - return (reader.readBoolOrNull(offset) ?? false) as P; - case 8: return (reader.readBoolOrNull(offset) ?? true) as P; - case 9: + case 8: return (reader.readString(offset)) as P; - case 10: + case 9: return (reader.readStringOrNull(offset) ?? '') as P; + case 10: + return (reader.readLongOrNull(offset) ?? 0) as P; case 11: return (reader.readLongOrNull(offset) ?? 0) as P; case 12: - return (reader.readLongOrNull(offset) ?? 0) as P; - case 13: return (reader.readDateTime(offset)) as P; default: throw IsarError('Unknown property with id $propertyId'); @@ -247,16 +224,16 @@ const _UseravatarColorEnumValueMap = { 'amber': 9, }; const _UseravatarColorValueEnumMap = { - 0: AvatarColorEnum.primary, - 1: AvatarColorEnum.pink, - 2: AvatarColorEnum.red, - 3: AvatarColorEnum.yellow, - 4: AvatarColorEnum.blue, - 5: AvatarColorEnum.green, - 6: AvatarColorEnum.purple, - 7: AvatarColorEnum.orange, - 8: AvatarColorEnum.gray, - 9: AvatarColorEnum.amber, + 0: AvatarColor.primary, + 1: AvatarColor.pink, + 2: AvatarColor.red, + 3: AvatarColor.yellow, + 4: AvatarColor.blue, + 5: AvatarColor.green, + 6: AvatarColor.purple, + 7: AvatarColor.orange, + 8: AvatarColor.gray, + 9: AvatarColor.amber, }; Id _userGetId(User object) { @@ -264,14 +241,10 @@ Id _userGetId(User object) { } List> _userGetLinks(User object) { - return [object.albums, object.sharedAlbums]; + return []; } -void _userAttach(IsarCollection col, Id id, User object) { - object.albums.attach(col, col.isar.collection(), r'albums', id); - object.sharedAlbums - .attach(col, col.isar.collection(), r'sharedAlbums', id); -} +void _userAttach(IsarCollection col, Id id, User object) {} extension UserByIndex on IsarCollection { Future getById(String id) { @@ -447,7 +420,7 @@ extension UserQueryWhere on QueryBuilder { extension UserQueryFilter on QueryBuilder { QueryBuilder avatarColorEqualTo( - AvatarColorEnum value) { + AvatarColor value) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'avatarColor', @@ -457,7 +430,7 @@ extension UserQueryFilter on QueryBuilder { } QueryBuilder avatarColorGreaterThan( - AvatarColorEnum value, { + AvatarColor value, { bool include = false, }) { return QueryBuilder.apply(this, (query) { @@ -470,7 +443,7 @@ extension UserQueryFilter on QueryBuilder { } QueryBuilder avatarColorLessThan( - AvatarColorEnum value, { + AvatarColor value, { bool include = false, }) { return QueryBuilder.apply(this, (query) { @@ -483,8 +456,8 @@ extension UserQueryFilter on QueryBuilder { } QueryBuilder avatarColorBetween( - AvatarColorEnum lower, - AvatarColorEnum upper, { + AvatarColor lower, + AvatarColor upper, { bool includeLower = true, bool includeUpper = true, }) { @@ -627,15 +600,6 @@ extension UserQueryFilter on QueryBuilder { }); } - QueryBuilder hasQuotaEqualTo(bool value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'hasQuota', - value: value, - )); - }); - } - QueryBuilder idEqualTo( String value, { bool caseSensitive = true, @@ -1285,118 +1249,7 @@ extension UserQueryFilter on QueryBuilder { extension UserQueryObject on QueryBuilder {} -extension UserQueryLinks on QueryBuilder { - QueryBuilder albums(FilterQuery q) { - return QueryBuilder.apply(this, (query) { - return query.link(q, r'albums'); - }); - } - - QueryBuilder albumsLengthEqualTo( - int length) { - return QueryBuilder.apply(this, (query) { - return query.linkLength(r'albums', length, true, length, true); - }); - } - - QueryBuilder albumsIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.linkLength(r'albums', 0, true, 0, true); - }); - } - - QueryBuilder albumsIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.linkLength(r'albums', 0, false, 999999, true); - }); - } - - QueryBuilder albumsLengthLessThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.linkLength(r'albums', 0, true, length, include); - }); - } - - QueryBuilder albumsLengthGreaterThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.linkLength(r'albums', length, include, 999999, true); - }); - } - - QueryBuilder albumsLengthBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.linkLength( - r'albums', lower, includeLower, upper, includeUpper); - }); - } - - QueryBuilder sharedAlbums( - FilterQuery q) { - return QueryBuilder.apply(this, (query) { - return query.link(q, r'sharedAlbums'); - }); - } - - QueryBuilder sharedAlbumsLengthEqualTo( - int length) { - return QueryBuilder.apply(this, (query) { - return query.linkLength(r'sharedAlbums', length, true, length, true); - }); - } - - QueryBuilder sharedAlbumsIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.linkLength(r'sharedAlbums', 0, true, 0, true); - }); - } - - QueryBuilder sharedAlbumsIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.linkLength(r'sharedAlbums', 0, false, 999999, true); - }); - } - - QueryBuilder sharedAlbumsLengthLessThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.linkLength(r'sharedAlbums', 0, true, length, include); - }); - } - - QueryBuilder sharedAlbumsLengthGreaterThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.linkLength(r'sharedAlbums', length, include, 999999, true); - }); - } - - QueryBuilder sharedAlbumsLengthBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.linkLength( - r'sharedAlbums', lower, includeLower, upper, includeUpper); - }); - } -} +extension UserQueryLinks on QueryBuilder {} extension UserQuerySortBy on QueryBuilder { QueryBuilder sortByAvatarColor() { @@ -1423,18 +1276,6 @@ extension UserQuerySortBy on QueryBuilder { }); } - QueryBuilder sortByHasQuota() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'hasQuota', Sort.asc); - }); - } - - QueryBuilder sortByHasQuotaDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'hasQuota', Sort.desc); - }); - } - QueryBuilder sortById() { return QueryBuilder.apply(this, (query) { return query.addSortBy(r'id', Sort.asc); @@ -1593,18 +1434,6 @@ extension UserQuerySortThenBy on QueryBuilder { }); } - QueryBuilder thenByHasQuota() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'hasQuota', Sort.asc); - }); - } - - QueryBuilder thenByHasQuotaDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'hasQuota', Sort.desc); - }); - } - QueryBuilder thenById() { return QueryBuilder.apply(this, (query) { return query.addSortBy(r'id', Sort.asc); @@ -1764,12 +1593,6 @@ extension UserQueryWhereDistinct on QueryBuilder { }); } - QueryBuilder distinctByHasQuota() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'hasQuota'); - }); - } - QueryBuilder distinctById( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { @@ -1848,7 +1671,7 @@ extension UserQueryProperty on QueryBuilder { }); } - QueryBuilder avatarColorProperty() { + QueryBuilder avatarColorProperty() { return QueryBuilder.apply(this, (query) { return query.addPropertyName(r'avatarColor'); }); @@ -1860,12 +1683,6 @@ extension UserQueryProperty on QueryBuilder { }); } - QueryBuilder hasQuotaProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'hasQuota'); - }); - } - QueryBuilder idProperty() { return QueryBuilder.apply(this, (query) { return query.addPropertyName(r'id'); diff --git a/mobile/lib/infrastructure/repositories/api.repository.dart b/mobile/lib/infrastructure/repositories/api.repository.dart new file mode 100644 index 0000000000..56c64c5512 --- /dev/null +++ b/mobile/lib/infrastructure/repositories/api.repository.dart @@ -0,0 +1,11 @@ +import 'package:immich_mobile/constants/errors.dart'; + +class ApiRepository { + const ApiRepository(); + + Future checkNull(Future future) async { + final response = await future; + if (response == null) throw NoResponseDtoError(); + return response; + } +} diff --git a/mobile/lib/infrastructure/repositories/store.repository.dart b/mobile/lib/infrastructure/repositories/store.repository.dart index 5cf6838ee1..1e5a5335d5 100644 --- a/mobile/lib/infrastructure/repositories/store.repository.dart +++ b/mobile/lib/infrastructure/repositories/store.repository.dart @@ -1,9 +1,9 @@ import 'package:immich_mobile/domain/interfaces/store.interface.dart'; import 'package:immich_mobile/domain/models/store.model.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/infrastructure/entities/store.entity.dart'; import 'package:immich_mobile/infrastructure/repositories/db.repository.dart'; -import 'package:immich_mobile/repositories/user.repository.dart'; +import 'package:immich_mobile/infrastructure/repositories/user.repository.dart'; import 'package:isar/isar.dart'; class IsarStoreRepository extends IsarDatabaseRepository @@ -78,7 +78,7 @@ class IsarStoreRepository extends IsarDatabaseRepository const (DateTime) => entity.intValue == null ? null : DateTime.fromMillisecondsSinceEpoch(entity.intValue!), - const (User) => await UserRepository(_db).getByDbId(entity.intValue!), + const (UserDto) => await IsarUserRepository(_db).get(entity.intValue!), _ => null, } as T?; @@ -88,8 +88,8 @@ class IsarStoreRepository extends IsarDatabaseRepository const (String) => (null, value as String), const (bool) => ((value as bool) ? 1 : 0, null), const (DateTime) => ((value as DateTime).millisecondsSinceEpoch, null), - const (User) => ( - (await UserRepository(_db).update(value as User)).isarId, + const (UserDto) => ( + (await IsarUserRepository(_db).update(value as UserDto)).id, null, ), _ => throw UnsupportedError( diff --git a/mobile/lib/infrastructure/repositories/user.repository.dart b/mobile/lib/infrastructure/repositories/user.repository.dart new file mode 100644 index 0000000000..2cb8023b2a --- /dev/null +++ b/mobile/lib/infrastructure/repositories/user.repository.dart @@ -0,0 +1,80 @@ +import 'package:immich_mobile/domain/interfaces/user.interface.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart' + as entity; +import 'package:immich_mobile/infrastructure/repositories/db.repository.dart'; +import 'package:isar/isar.dart'; + +class IsarUserRepository extends IsarDatabaseRepository + implements IUserRepository { + final Isar _db; + const IsarUserRepository(super.db) : _db = db; + + @override + Future delete(List ids) async { + await transaction(() async { + await _db.users.deleteAll(ids); + }); + } + + @override + Future deleteAll() async { + await transaction(() async { + await _db.users.clear(); + }); + } + + @override + Future get(int id) async { + return (await _db.users.get(id))?.toDto(); + } + + @override + Future> getAll({SortUserBy? sortBy}) async { + return (await _db.users + .where() + .optional( + sortBy != null, + (query) => switch (sortBy!) { + SortUserBy.id => query.sortById(), + }, + ) + .findAll()) + .map((u) => u.toDto()) + .toList(); + } + + @override + Future getByUserId(String id) async { + return (await _db.users.getById(id))?.toDto(); + } + + @override + Future> getByUserIds(List ids) async { + return (await _db.users.getAllById(ids)).map((u) => u?.toDto()).toList(); + } + + @override + Future insert(UserDto user) async { + await transaction(() async { + await _db.users.put(entity.User.fromDto(user)); + }); + return true; + } + + @override + Future update(UserDto user) async { + await transaction(() async { + await _db.users.put(entity.User.fromDto(user)); + }); + return user; + } + + @override + Future updateAll(List users) async { + await transaction(() async { + await _db.users.putAll(users.map(entity.User.fromDto).toList()); + }); + return true; + } +} diff --git a/mobile/lib/infrastructure/repositories/user_api.repository.dart b/mobile/lib/infrastructure/repositories/user_api.repository.dart new file mode 100644 index 0000000000..2623e8c264 --- /dev/null +++ b/mobile/lib/infrastructure/repositories/user_api.repository.dart @@ -0,0 +1,41 @@ +import 'dart:typed_data'; + +import 'package:http/http.dart'; +import 'package:immich_mobile/domain/interfaces/user_api.repository.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; +import 'package:immich_mobile/infrastructure/repositories/api.repository.dart'; +import 'package:immich_mobile/infrastructure/utils/user.converter.dart'; +import 'package:openapi/api.dart'; + +class UserApiRepository extends ApiRepository implements IUserApiRepository { + final UsersApi _api; + const UserApiRepository(this._api); + + @override + Future getMyUser() async { + final (adminDto, preferenceDto) = + await (_api.getMyUser(), _api.getMyPreferences()).wait; + if (adminDto == null) return null; + + return UserConverter.fromAdminDto(adminDto, preferenceDto); + } + + @override + Future createProfileImage({ + required String name, + required Uint8List data, + }) async { + final res = await checkNull( + _api.createProfileImage( + MultipartFile.fromBytes('file', data, filename: name), + ), + ); + return res.profileImagePath; + } + + @override + Future> getAll() async { + final dto = await checkNull(_api.searchUsers()); + return dto.map(UserConverter.fromSimpleUserDto).toList(); + } +} diff --git a/mobile/lib/infrastructure/utils/exif.converter.dart b/mobile/lib/infrastructure/utils/exif.converter.dart index ca4d175460..0f6e2b0295 100644 --- a/mobile/lib/infrastructure/utils/exif.converter.dart +++ b/mobile/lib/infrastructure/utils/exif.converter.dart @@ -9,7 +9,7 @@ abstract final class ExifDtoConverter { orientation: dto.orientation, timeZone: dto.timeZone, dateTimeOriginal: dto.dateTimeOriginal, - isFlipped: _isOrientationFlipped(dto.orientation), + isFlipped: isOrientationFlipped(dto.orientation), latitude: dto.latitude?.toDouble(), longitude: dto.longitude?.toDouble(), city: dto.city, @@ -25,7 +25,7 @@ abstract final class ExifDtoConverter { ); } - static bool _isOrientationFlipped(String? orientation) { + static bool isOrientationFlipped(String? orientation) { final value = orientation == null ? null : int.tryParse(orientation); if (value == null) { return false; diff --git a/mobile/lib/infrastructure/utils/user.converter.dart b/mobile/lib/infrastructure/utils/user.converter.dart new file mode 100644 index 0000000000..11f9ddec33 --- /dev/null +++ b/mobile/lib/infrastructure/utils/user.converter.dart @@ -0,0 +1,66 @@ +import 'package:immich_mobile/domain/models/user.model.dart'; +import 'package:openapi/api.dart'; + +abstract final class UserConverter { + /// Base user dto used where the complete user object is not required + static UserDto fromSimpleUserDto(UserResponseDto dto) => UserDto( + uid: dto.id, + email: dto.email, + name: dto.name, + isAdmin: false, + updatedAt: DateTime.now(), + profileImagePath: dto.profileImagePath, + avatarColor: dto.avatarColor.toAvatarColor(), + ); + + static UserDto fromAdminDto( + UserAdminResponseDto adminDto, [ + UserPreferencesResponseDto? preferenceDto, + ]) => + UserDto( + uid: adminDto.id, + email: adminDto.email, + name: adminDto.name, + isAdmin: adminDto.isAdmin, + updatedAt: adminDto.updatedAt, + profileImagePath: adminDto.profileImagePath, + avatarColor: adminDto.avatarColor.toAvatarColor(), + memoryEnabled: preferenceDto?.memories.enabled ?? true, + inTimeline: false, + isPartnerSharedBy: false, + isPartnerSharedWith: false, + quotaUsageInBytes: adminDto.quotaUsageInBytes ?? 0, + quotaSizeInBytes: adminDto.quotaSizeInBytes ?? 0, + ); + + static UserDto fromPartnerDto(PartnerResponseDto dto) => UserDto( + uid: dto.id, + email: dto.email, + name: dto.name, + isAdmin: false, + updatedAt: DateTime.now(), + profileImagePath: dto.profileImagePath, + avatarColor: dto.avatarColor.toAvatarColor(), + memoryEnabled: false, + inTimeline: dto.inTimeline ?? false, + isPartnerSharedBy: false, + isPartnerSharedWith: false, + quotaUsageInBytes: 0, + quotaSizeInBytes: 0, + ); +} + +extension on UserAvatarColor { + AvatarColor toAvatarColor() => switch (this) { + UserAvatarColor.red => AvatarColor.red, + UserAvatarColor.green => AvatarColor.green, + UserAvatarColor.blue => AvatarColor.blue, + UserAvatarColor.purple => AvatarColor.purple, + UserAvatarColor.orange => AvatarColor.orange, + UserAvatarColor.pink => AvatarColor.pink, + UserAvatarColor.amber => AvatarColor.amber, + UserAvatarColor.yellow => AvatarColor.yellow, + UserAvatarColor.gray => AvatarColor.gray, + UserAvatarColor.primary || _ => AvatarColor.primary, + }; +} diff --git a/mobile/lib/interfaces/album.interface.dart b/mobile/lib/interfaces/album.interface.dart index 3a83a8feb7..c1696eda80 100644 --- a/mobile/lib/interfaces/album.interface.dart +++ b/mobile/lib/interfaces/album.interface.dart @@ -1,6 +1,6 @@ +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/interfaces/database.interface.dart'; import 'package:immich_mobile/models/albums/album_search.model.dart'; @@ -31,9 +31,9 @@ abstract interface class IAlbumRepository implements IDatabaseRepository { Future count({bool? local}); - Future addUsers(Album album, List users); + Future addUsers(Album album, List users); - Future removeUsers(Album album, List users); + Future removeUsers(Album album, List users); Future addAssets(Album album, List assets); diff --git a/mobile/lib/interfaces/partner.interface.dart b/mobile/lib/interfaces/partner.interface.dart index 995e07c392..8e5fcb7a97 100644 --- a/mobile/lib/interfaces/partner.interface.dart +++ b/mobile/lib/interfaces/partner.interface.dart @@ -1,8 +1,8 @@ -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; abstract class IPartnerRepository { - Future> getSharedWith(); - Future> getSharedBy(); - Stream> watchSharedWith(); - Stream> watchSharedBy(); + Future> getSharedWith(); + Future> getSharedBy(); + Stream> watchSharedWith(); + Stream> watchSharedBy(); } diff --git a/mobile/lib/interfaces/partner_api.interface.dart b/mobile/lib/interfaces/partner_api.interface.dart index bca1baf66d..01149f473c 100644 --- a/mobile/lib/interfaces/partner_api.interface.dart +++ b/mobile/lib/interfaces/partner_api.interface.dart @@ -1,9 +1,9 @@ -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; abstract interface class IPartnerApiRepository { - Future> getAll(Direction direction); - Future create(String id); - Future update(String id, {required bool inTimeline}); + Future> getAll(Direction direction); + Future create(String id); + Future update(String id, {required bool inTimeline}); Future delete(String id); } diff --git a/mobile/lib/interfaces/user.interface.dart b/mobile/lib/interfaces/user.interface.dart deleted file mode 100644 index d099e0e50b..0000000000 --- a/mobile/lib/interfaces/user.interface.dart +++ /dev/null @@ -1,27 +0,0 @@ -import 'package:immich_mobile/entities/user.entity.dart'; -import 'package:immich_mobile/interfaces/database.interface.dart'; - -abstract interface class IUserRepository implements IDatabaseRepository { - Future get(String id); - - Future getByDbId(int id); - - Future> getByIds(List ids); - - Future> getAll({bool self = true, UserSort? sortBy}); - - /// Returns all users whose assets can be accessed (self+partners) - Future> getAllAccessible(); - - Future> upsertAll(List users); - - Future update(User user); - - Future deleteById(List ids); - - Future me(); - - Future clearTable(); -} - -enum UserSort { id } diff --git a/mobile/lib/interfaces/user_api.interface.dart b/mobile/lib/interfaces/user_api.interface.dart deleted file mode 100644 index 67ac3c0883..0000000000 --- a/mobile/lib/interfaces/user_api.interface.dart +++ /dev/null @@ -1,11 +0,0 @@ -import 'dart:typed_data'; - -import 'package:immich_mobile/entities/user.entity.dart'; - -abstract interface class IUserApiRepository { - Future> getAll(); - Future<({String profileImagePath})> createProfileImage({ - required String name, - required Uint8List data, - }); -} diff --git a/mobile/lib/mixins/error_logger.mixin.dart b/mobile/lib/mixins/error_logger.mixin.dart index 466028c338..482420a978 100644 --- a/mobile/lib/mixins/error_logger.mixin.dart +++ b/mobile/lib/mixins/error_logger.mixin.dart @@ -6,6 +6,7 @@ typedef AsyncFuture = Future>; mixin ErrorLoggerMixin { abstract final Logger logger; + // ignore: unintended_html_in_doc_comment /// Returns an AsyncValue if the future is successfully executed /// Else, logs the error to the overridden logger and returns an AsyncError<> AsyncFuture guardError( diff --git a/mobile/lib/models/activities/activity.model.dart b/mobile/lib/models/activities/activity.model.dart index 4702753f41..17f70d5d62 100644 --- a/mobile/lib/models/activities/activity.model.dart +++ b/mobile/lib/models/activities/activity.model.dart @@ -1,4 +1,4 @@ -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; enum ActivityType { comment, like } @@ -8,7 +8,7 @@ class Activity { final String? comment; final DateTime createdAt; final ActivityType type; - final User user; + final UserDto user; const Activity({ required this.id, @@ -25,7 +25,7 @@ class Activity { String? comment, DateTime? createdAt, ActivityType? type, - User? user, + UserDto? user, }) { return Activity( id: id ?? this.id, diff --git a/mobile/lib/pages/album/album_additional_shared_user_selection.page.dart b/mobile/lib/pages/album/album_additional_shared_user_selection.page.dart index 02026b828d..2dc41b396d 100644 --- a/mobile/lib/pages/album/album_additional_shared_user_selection.page.dart +++ b/mobile/lib/pages/album/album_additional_shared_user_selection.page.dart @@ -3,11 +3,11 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/extensions/asyncvalue_extensions.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/providers/album/suggested_shared_users.provider.dart'; -import 'package:immich_mobile/entities/album.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/widgets/common/user_circle_avatar.dart'; @RoutePage() @@ -21,15 +21,15 @@ class AlbumAdditionalSharedUserSelectionPage extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final AsyncValue> suggestedShareUsers = + final AsyncValue> suggestedShareUsers = ref.watch(otherUsersProvider); - final sharedUsersList = useState>({}); + final sharedUsersList = useState>({}); addNewUsersHandler() { - context.maybePop(sharedUsersList.value.map((e) => e.id).toList()); + context.maybePop(sharedUsersList.value.map((e) => e.uid).toList()); } - buildTileIcon(User user) { + buildTileIcon(UserDto user) { if (sharedUsersList.value.contains(user)) { return CircleAvatar( backgroundColor: context.primaryColor, @@ -45,7 +45,7 @@ class AlbumAdditionalSharedUserSelectionPage extends HookConsumerWidget { } } - buildUserList(List users) { + buildUserList(List users) { List usersChip = []; for (var user in sharedUsersList.value) { @@ -53,7 +53,7 @@ class AlbumAdditionalSharedUserSelectionPage extends HookConsumerWidget { Padding( padding: const EdgeInsets.symmetric(horizontal: 8.0), child: Chip( - backgroundColor: context.primaryColor.withOpacity(0.15), + backgroundColor: context.primaryColor.withValues(alpha: 0.15), label: Text( user.name, style: const TextStyle( @@ -151,7 +151,7 @@ class AlbumAdditionalSharedUserSelectionPage extends HookConsumerWidget { onData: (users) { for (var sharedUsers in album.sharedUsers) { users.removeWhere( - (u) => u.id == sharedUsers.id || u.id == album.ownerId, + (u) => u.uid == sharedUsers.id || u.uid == album.ownerId, ); } diff --git a/mobile/lib/pages/album/album_options.page.dart b/mobile/lib/pages/album/album_options.page.dart index 0e9bfeb2ce..a765be50b3 100644 --- a/mobile/lib/pages/album/album_options.page.dart +++ b/mobile/lib/pages/album/album_options.page.dart @@ -4,14 +4,16 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/extensions/theme_extensions.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart' + as entity; import 'package:immich_mobile/providers/album/album.provider.dart'; import 'package:immich_mobile/providers/album/current_album.provider.dart'; import 'package:immich_mobile/providers/auth.provider.dart'; -import 'package:immich_mobile/utils/immich_loading_overlay.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/utils/immich_loading_overlay.dart'; import 'package:immich_mobile/widgets/common/immich_toast.dart'; import 'package:immich_mobile/widgets/common/user_circle_avatar.dart'; @@ -26,7 +28,8 @@ class AlbumOptionsPage extends HookConsumerWidget { return const SizedBox(); } - final sharedUsers = useState(album.sharedUsers.toList()); + final sharedUsers = + useState(album.sharedUsers.map((u) => u.toDto()).toList()); final owner = album.owner.value; final userId = ref.watch(authProvider).userId; final activityEnabled = useState(album.activityEnabled); @@ -64,13 +67,13 @@ class AlbumOptionsPage extends HookConsumerWidget { isProcessing.value = false; } - void removeUserFromAlbum(User user) async { + void removeUserFromAlbum(UserDto user) async { isProcessing.value = true; try { await ref.read(albumProvider.notifier).removeUser(album, user); - album.sharedUsers.remove(user); - sharedUsers.value = album.sharedUsers.toList(); + album.sharedUsers.remove(entity.User.fromDto(user)); + sharedUsers.value = album.sharedUsers.map((u) => u.toDto()).toList(); } catch (error) { showErrorMessage(); } @@ -79,10 +82,10 @@ class AlbumOptionsPage extends HookConsumerWidget { isProcessing.value = false; } - void handleUserClick(User user) { + void handleUserClick(UserDto user) { var actions = []; - if (user.id == userId) { + if (user.uid == userId) { actions = [ ListTile( leading: const Icon(Icons.exit_to_app_rounded), @@ -123,8 +126,9 @@ class AlbumOptionsPage extends HookConsumerWidget { buildOwnerInfo() { return ListTile( - leading: - owner != null ? UserCircleAvatar(user: owner) : const SizedBox(), + leading: owner != null + ? UserCircleAvatar(user: owner.toDto()) + : const SizedBox(), title: Text( album.owner.value?.name ?? "", style: const TextStyle( @@ -166,10 +170,10 @@ class AlbumOptionsPage extends HookConsumerWidget { color: context.colorScheme.onSurfaceSecondary, ), ), - trailing: userId == user.id || isOwner + trailing: userId == user.uid || isOwner ? const Icon(Icons.more_horiz_rounded) : const SizedBox(), - onTap: userId == user.id || isOwner + onTap: userId == user.uid || isOwner ? () => handleUserClick(user) : null, ); diff --git a/mobile/lib/pages/album/album_shared_user_icons.dart b/mobile/lib/pages/album/album_shared_user_icons.dart index f417f9fb38..47ea476028 100644 --- a/mobile/lib/pages/album/album_shared_user_icons.dart +++ b/mobile/lib/pages/album/album_shared_user_icons.dart @@ -2,7 +2,7 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/providers/album/current_album.provider.dart'; import 'package:immich_mobile/routing/router.dart'; import 'package:immich_mobile/widgets/common/user_circle_avatar.dart'; @@ -12,7 +12,7 @@ class AlbumSharedUserIcons extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final sharedUsers = useRef>(const []); + final sharedUsers = useRef>(const []); sharedUsers.value = ref.watch( currentAlbumProvider.select((album) { if (album == null) { @@ -23,7 +23,7 @@ class AlbumSharedUserIcons extends HookConsumerWidget { return sharedUsers.value; } - return album.sharedUsers.toList(growable: false); + return album.sharedUsers.map((u) => u.toDto()).toList(growable: false); }), ); diff --git a/mobile/lib/pages/album/album_shared_user_selection.page.dart b/mobile/lib/pages/album/album_shared_user_selection.page.dart index ed8a45194d..1c797aa449 100644 --- a/mobile/lib/pages/album/album_shared_user_selection.page.dart +++ b/mobile/lib/pages/album/album_shared_user_selection.page.dart @@ -3,14 +3,14 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/extensions/asyncvalue_extensions.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/providers/album/album.provider.dart'; import 'package:immich_mobile/providers/album/album_title.provider.dart'; import 'package:immich_mobile/providers/album/suggested_shared_users.provider.dart'; import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/entities/asset.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/widgets/common/user_circle_avatar.dart'; @RoutePage() @@ -21,7 +21,7 @@ class AlbumSharedUserSelectionPage extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final sharedUsersList = useState>({}); + final sharedUsersList = useState>({}); final suggestedShareUsers = ref.watch(otherUsersProvider); createSharedAlbum() async { @@ -48,7 +48,7 @@ class AlbumSharedUserSelectionPage extends HookConsumerWidget { ); } - buildTileIcon(User user) { + buildTileIcon(UserDto user) { if (sharedUsersList.value.contains(user)) { return CircleAvatar( backgroundColor: context.primaryColor, @@ -64,7 +64,7 @@ class AlbumSharedUserSelectionPage extends HookConsumerWidget { } } - buildUserList(List users) { + buildUserList(List users) { List usersChip = []; for (var user in sharedUsersList.value) { @@ -72,7 +72,7 @@ class AlbumSharedUserSelectionPage extends HookConsumerWidget { Padding( padding: const EdgeInsets.symmetric(horizontal: 8.0), child: Chip( - backgroundColor: context.primaryColor.withOpacity(0.15), + backgroundColor: context.primaryColor.withValues(alpha: 0.15), label: Text( user.email, style: const TextStyle( diff --git a/mobile/lib/pages/albums/albums.page.dart b/mobile/lib/pages/albums/albums.page.dart index ac6bd2f2fb..acdfbf385f 100644 --- a/mobile/lib/pages/albums/albums.page.dart +++ b/mobile/lib/pages/albums/albums.page.dart @@ -33,7 +33,7 @@ class AlbumsPage extends HookConsumerWidget { final searchController = useTextEditingController(); final debounceTimer = useRef(null); final filterMode = useState(QuickFilterMode.all); - final userId = ref.watch(currentUserProvider)?.id; + final userId = ref.watch(currentUserProvider)?.uid; final searchFocusNode = useFocusNode(); toggleViewMode() { @@ -106,9 +106,9 @@ class AlbumsPage extends HookConsumerWidget { borderRadius: BorderRadius.circular(24), gradient: LinearGradient( colors: [ - context.colorScheme.primary.withOpacity(0.075), - context.colorScheme.primary.withOpacity(0.09), - context.colorScheme.primary.withOpacity(0.075), + context.colorScheme.primary.withValues(alpha: 0.075), + context.colorScheme.primary.withValues(alpha: 0.09), + context.colorScheme.primary.withValues(alpha: 0.075), ], begin: Alignment.topLeft, end: Alignment.bottomRight, diff --git a/mobile/lib/pages/common/activities.page.dart b/mobile/lib/pages/common/activities.page.dart index 9678058111..84a8622fa5 100644 --- a/mobile/lib/pages/common/activities.page.dart +++ b/mobile/lib/pages/common/activities.page.dart @@ -7,12 +7,12 @@ import 'package:immich_mobile/extensions/asyncvalue_extensions.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/models/activities/activity.model.dart'; import 'package:immich_mobile/providers/activity.provider.dart'; -import 'package:immich_mobile/widgets/activities/activity_text_field.dart'; -import 'package:immich_mobile/widgets/activities/activity_tile.dart'; -import 'package:immich_mobile/widgets/activities/dismissible_activity.dart'; import 'package:immich_mobile/providers/album/current_album.provider.dart'; import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart'; import 'package:immich_mobile/providers/user.provider.dart'; +import 'package:immich_mobile/widgets/activities/activity_text_field.dart'; +import 'package:immich_mobile/widgets/activities/activity_tile.dart'; +import 'package:immich_mobile/widgets/activities/dismissible_activity.dart'; @RoutePage() class ActivitiesPage extends HookConsumerWidget { @@ -72,7 +72,7 @@ class ActivitiesPage extends HookConsumerWidget { final activity = data[index]; final canDelete = activity.user.id == user?.id || - album.ownerId == user?.id; + album.ownerId == user?.uid; return Padding( padding: const EdgeInsets.all(5), diff --git a/mobile/lib/pages/common/app_log.page.dart b/mobile/lib/pages/common/app_log.page.dart index 56c32327dd..359a541de0 100644 --- a/mobile/lib/pages/common/app_log.page.dart +++ b/mobile/lib/pages/common/app_log.page.dart @@ -49,9 +49,9 @@ class AppLogPage extends HookConsumerWidget { Color getTileColor(LogLevel level) => switch (level) { LogLevel.info => Colors.transparent, - LogLevel.severe => Colors.redAccent.withOpacity(0.25), - LogLevel.warning => Colors.orangeAccent.withOpacity(0.25), - _ => context.primaryColor.withOpacity(0.1), + LogLevel.severe => Colors.redAccent.withValues(alpha: 0.25), + LogLevel.warning => Colors.orangeAccent.withValues(alpha: 0.25), + _ => context.primaryColor.withValues(alpha: 0.1), }; return Scaffold( diff --git a/mobile/lib/pages/editing/edit.page.dart b/mobile/lib/pages/editing/edit.page.dart index 385140eb59..9f2e6a2266 100644 --- a/mobile/lib/pages/editing/edit.page.dart +++ b/mobile/lib/pages/editing/edit.page.dart @@ -127,7 +127,7 @@ class EditImagePage extends ConsumerWidget { borderRadius: BorderRadius.circular(7), boxShadow: [ BoxShadow( - color: Colors.black.withOpacity(0.2), + color: Colors.black.withValues(alpha: 0.2), spreadRadius: 2, blurRadius: 10, offset: const Offset(0, 3), diff --git a/mobile/lib/pages/library/library.page.dart b/mobile/lib/pages/library/library.page.dart index 31b465ead7..86c411395b 100644 --- a/mobile/lib/pages/library/library.page.dart +++ b/mobile/lib/pages/library/library.page.dart @@ -2,7 +2,7 @@ import 'package:auto_route/auto_route.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/extensions/asyncvalue_extensions.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/providers/album/album.provider.dart'; @@ -163,7 +163,7 @@ class QuickAccessButtons extends ConsumerWidget { class PartnerList extends ConsumerWidget { const PartnerList({super.key, required this.partners}); - final List partners; + final List partners; @override Widget build(BuildContext context, WidgetRef ref) { diff --git a/mobile/lib/pages/library/partner/partner.page.dart b/mobile/lib/pages/library/partner/partner.page.dart index 1e9e801210..faea069c50 100644 --- a/mobile/lib/pages/library/partner/partner.page.dart +++ b/mobile/lib/pages/library/partner/partner.page.dart @@ -2,10 +2,10 @@ import 'package:auto_route/auto_route.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/providers/partner.provider.dart'; import 'package:immich_mobile/services/partner.service.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/widgets/common/confirm_dialog.dart'; import 'package:immich_mobile/widgets/common/immich_toast.dart'; import 'package:immich_mobile/widgets/common/user_avatar.dart'; @@ -16,7 +16,7 @@ class PartnerPage extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final List partners = ref.watch(partnerSharedByProvider); + final List partners = ref.watch(partnerSharedByProvider); final availableUsers = ref.watch(partnerAvailableProvider); addNewUsersHandler() async { @@ -29,13 +29,13 @@ class PartnerPage extends HookConsumerWidget { return; } - final selectedUser = await showDialog( + final selectedUser = await showDialog( context: context, builder: (context) { return SimpleDialog( title: const Text("partner_page_select_partner").tr(), children: [ - for (User u in users) + for (UserDto u in users) SimpleDialogOption( onPressed: () => context.pop(u), child: Row( @@ -67,7 +67,7 @@ class PartnerPage extends HookConsumerWidget { } } - onDeleteUser(User u) { + onDeleteUser(UserDto u) { return showDialog( context: context, builder: (BuildContext context) { @@ -80,7 +80,7 @@ class PartnerPage extends HookConsumerWidget { ); } - buildUserList(List users) { + buildUserList(List users) { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/mobile/lib/pages/library/partner/partner_detail.page.dart b/mobile/lib/pages/library/partner/partner_detail.page.dart index f018726fe2..618d31affa 100644 --- a/mobile/lib/pages/library/partner/partner_detail.page.dart +++ b/mobile/lib/pages/library/partner/partner_detail.page.dart @@ -2,11 +2,11 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; +import 'package:immich_mobile/providers/asset.provider.dart'; import 'package:immich_mobile/providers/multiselect.provider.dart'; import 'package:immich_mobile/providers/partner.provider.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; -import 'package:immich_mobile/providers/asset.provider.dart'; import 'package:immich_mobile/providers/timeline.provider.dart'; import 'package:immich_mobile/widgets/asset_grid/multiselect_grid.dart'; import 'package:immich_mobile/widgets/common/immich_toast.dart'; @@ -15,7 +15,7 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart'; class PartnerDetailPage extends HookConsumerWidget { const PartnerDetailPage({super.key, required this.partner}); - final User partner; + final UserDto partner; @override Widget build(BuildContext context, WidgetRef ref) { @@ -111,7 +111,7 @@ class PartnerDetailPage extends HookConsumerWidget { ), ), ), - renderListProvider: singleUserTimelineProvider(partner.isarId), + renderListProvider: singleUserTimelineProvider(partner.id), onRefresh: () => ref.read(assetProvider.notifier).getAllAsset(), deleteEnabled: false, favoriteEnabled: false, diff --git a/mobile/lib/pages/library/people/people_collection.page.dart b/mobile/lib/pages/library/people/people_collection.page.dart index e3fda83465..c859e96ff2 100644 --- a/mobile/lib/pages/library/people/people_collection.page.dart +++ b/mobile/lib/pages/library/people/people_collection.page.dart @@ -49,7 +49,7 @@ class PeopleCollectionPage extends HookConsumerWidget { decoration: InputDecoration( contentPadding: const EdgeInsets.only(left: 24), filled: true, - fillColor: context.primaryColor.withOpacity(0.1), + fillColor: context.primaryColor.withValues(alpha: 0.1), hintStyle: context.textTheme.bodyLarge?.copyWith( color: context.themeData.colorScheme.onSurfaceSecondary, ), diff --git a/mobile/lib/pages/library/shared_link/shared_link.page.dart b/mobile/lib/pages/library/shared_link/shared_link.page.dart index 7ad9943a89..f3afdb4a37 100644 --- a/mobile/lib/pages/library/shared_link/shared_link.page.dart +++ b/mobile/lib/pages/library/shared_link/shared_link.page.dart @@ -58,7 +58,8 @@ class SharedLinkPage extends HookConsumerWidget { child: Icon( Icons.link_off, size: 100, - color: context.themeData.iconTheme.color?.withOpacity(0.5), + color: + context.themeData.iconTheme.color?.withValues(alpha: 0.5), ), ), ), diff --git a/mobile/lib/pages/library/shared_link/shared_link_edit.page.dart b/mobile/lib/pages/library/shared_link/shared_link_edit.page.dart index 82819c94bd..4b311ba554 100644 --- a/mobile/lib/pages/library/shared_link/shared_link_edit.page.dart +++ b/mobile/lib/pages/library/shared_link/shared_link_edit.page.dart @@ -120,7 +120,7 @@ class SharedLinkEditPage extends HookConsumerWidget { fontSize: 14, ), disabledBorder: OutlineInputBorder( - borderSide: BorderSide(color: Colors.grey.withOpacity(0.5)), + borderSide: BorderSide(color: Colors.grey.withValues(alpha: 0.5)), ), ), onTapOutside: (_) => descriptionFocusNode.unfocus(), @@ -146,7 +146,7 @@ class SharedLinkEditPage extends HookConsumerWidget { fontSize: 14, ), disabledBorder: OutlineInputBorder( - borderSide: BorderSide(color: Colors.grey.withOpacity(0.5)), + borderSide: BorderSide(color: Colors.grey.withValues(alpha: 0.5)), ), ), ); diff --git a/mobile/lib/pages/photos/memory.page.dart b/mobile/lib/pages/photos/memory.page.dart index 0c2d3de8dc..211472f27a 100644 --- a/mobile/lib/pages/photos/memory.page.dart +++ b/mobile/lib/pages/photos/memory.page.dart @@ -350,7 +350,7 @@ class MemoryPage extends HookConsumerWidget { ); }, shape: const CircleBorder(), - color: Colors.white.withOpacity(0.2), + color: Colors.white.withValues(alpha: 0.2), elevation: 0, child: const Icon( Icons.close_rounded, diff --git a/mobile/lib/pages/photos/photos.page.dart b/mobile/lib/pages/photos/photos.page.dart index b3bfa366f2..c9211e984d 100644 --- a/mobile/lib/pages/photos/photos.page.dart +++ b/mobile/lib/pages/photos/photos.page.dart @@ -7,16 +7,16 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/providers/album/album.provider.dart'; -import 'package:immich_mobile/providers/multiselect.provider.dart'; -import 'package:immich_mobile/providers/timeline.provider.dart'; -import 'package:immich_mobile/widgets/memories/memory_lane.dart'; import 'package:immich_mobile/providers/asset.provider.dart'; +import 'package:immich_mobile/providers/multiselect.provider.dart'; import 'package:immich_mobile/providers/server_info.provider.dart'; +import 'package:immich_mobile/providers/timeline.provider.dart'; import 'package:immich_mobile/providers/user.provider.dart'; import 'package:immich_mobile/providers/websocket.provider.dart'; import 'package:immich_mobile/widgets/asset_grid/multiselect_grid.dart'; import 'package:immich_mobile/widgets/common/immich_app_bar.dart'; import 'package:immich_mobile/widgets/common/immich_loading_indicator.dart'; +import 'package:immich_mobile/widgets/memories/memory_lane.dart'; @RoutePage() class PhotosPage extends HookConsumerWidget { @@ -110,7 +110,7 @@ class PhotosPage extends HookConsumerWidget { : const SizedBox(), renderListProvider: timelineUsers.length > 1 ? multiUsersTimelineProvider(timelineUsers) - : singleUserTimelineProvider(currentUser?.isarId), + : singleUserTimelineProvider(currentUser?.id), buildLoadingIndicator: buildLoadingIndicator, onRefresh: refreshAssets, stackEnabled: true, diff --git a/mobile/lib/pages/search/search.page.dart b/mobile/lib/pages/search/search.page.dart index fcae1fb586..464ac31728 100644 --- a/mobile/lib/pages/search/search.page.dart +++ b/mobile/lib/pages/search/search.page.dart @@ -517,8 +517,6 @@ class SearchPage extends HookConsumerWidget { return Icons.abc_rounded; case TextSearchType.description: return Icons.text_snippet_outlined; - default: - return Icons.search_rounded; } } @@ -634,9 +632,9 @@ class SearchPage extends HookConsumerWidget { borderRadius: BorderRadius.circular(24), gradient: LinearGradient( colors: [ - context.colorScheme.primary.withOpacity(0.075), - context.colorScheme.primary.withOpacity(0.09), - context.colorScheme.primary.withOpacity(0.075), + context.colorScheme.primary.withValues(alpha: 0.075), + context.colorScheme.primary.withValues(alpha: 0.09), + context.colorScheme.primary.withValues(alpha: 0.075), ], begin: Alignment.topLeft, end: Alignment.bottomRight, diff --git a/mobile/lib/providers/activity.provider.dart b/mobile/lib/providers/activity.provider.dart index 8ae218c817..0dcc99320b 100644 --- a/mobile/lib/providers/activity.provider.dart +++ b/mobile/lib/providers/activity.provider.dart @@ -5,6 +5,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'activity.provider.g.dart'; +// ignore: unintended_html_in_doc_comment /// Maintains the current list of all activities for @riverpod class AlbumActivity extends _$AlbumActivity { diff --git a/mobile/lib/providers/activity_service.provider.g.dart b/mobile/lib/providers/activity_service.provider.g.dart index 1a08a6f8aa..2bf160c487 100644 --- a/mobile/lib/providers/activity_service.provider.g.dart +++ b/mobile/lib/providers/activity_service.provider.g.dart @@ -6,7 +6,7 @@ part of 'activity_service.provider.dart'; // RiverpodGenerator // ************************************************************************** -String _$activityServiceHash() => r'23a3ee7db71676d2719daa64217a683cc5c7eab0'; +String _$activityServiceHash() => r'ce775779787588defe1e76406e09a9c109470310'; /// See also [activityService]. @ProviderFor(activityService) diff --git a/mobile/lib/providers/activity_statistics.provider.dart b/mobile/lib/providers/activity_statistics.provider.dart index b1d2b4b987..c260a7a547 100644 --- a/mobile/lib/providers/activity_statistics.provider.dart +++ b/mobile/lib/providers/activity_statistics.provider.dart @@ -3,6 +3,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'activity_statistics.provider.g.dart'; +// ignore: unintended_html_in_doc_comment /// Maintains the current number of comments by @riverpod class ActivityStatistics extends _$ActivityStatistics { diff --git a/mobile/lib/providers/album/album.provider.dart b/mobile/lib/providers/album/album.provider.dart index a2d7db68ec..39f5af7344 100644 --- a/mobile/lib/providers/album/album.provider.dart +++ b/mobile/lib/providers/album/album.provider.dart @@ -2,11 +2,11 @@ import 'dart:async'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/constants/enums.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; +import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/models/albums/album_search.model.dart'; import 'package:immich_mobile/services/album.service.dart'; -import 'package:immich_mobile/entities/asset.entity.dart'; -import 'package:immich_mobile/entities/album.entity.dart'; final isRefreshingRemoteAlbumProvider = StateProvider((ref) => false); @@ -88,7 +88,7 @@ class AlbumNotifier extends StateNotifier> { await albumService.addUsers(album, userIds); } - Future removeUser(Album album, User user) async { + Future removeUser(Album album, UserDto user) async { final isRemoved = await albumService.removeUser(album, user); if (isRemoved && album.sharedUsers.isEmpty) { diff --git a/mobile/lib/providers/album/suggested_shared_users.provider.dart b/mobile/lib/providers/album/suggested_shared_users.provider.dart index fe8a1fccce..3c8dcb6733 100644 --- a/mobile/lib/providers/album/suggested_shared_users.provider.dart +++ b/mobile/lib/providers/album/suggested_shared_users.provider.dart @@ -1,9 +1,15 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; -import 'package:immich_mobile/services/user.service.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; +import 'package:immich_mobile/domain/services/user.service.dart'; +import 'package:immich_mobile/providers/infrastructure/user.provider.dart'; +import 'package:immich_mobile/providers/user.provider.dart'; -final otherUsersProvider = FutureProvider.autoDispose>((ref) { +final otherUsersProvider = + FutureProvider.autoDispose>((ref) async { UserService userService = ref.watch(userServiceProvider); + final currentUser = ref.watch(currentUserProvider); - return userService.getUsers(); + final allUsers = await userService.getAll(); + allUsers.removeWhere((u) => currentUser?.id == u.id); + return allUsers; }); diff --git a/mobile/lib/providers/api.provider.g.dart b/mobile/lib/providers/api.provider.g.dart index 2573f3d291..76ccb4ad6d 100644 --- a/mobile/lib/providers/api.provider.g.dart +++ b/mobile/lib/providers/api.provider.g.dart @@ -6,7 +6,7 @@ part of 'api.provider.dart'; // RiverpodGenerator // ************************************************************************** -String _$apiServiceHash() => r'5b8beddb448316bdae5e3963ff77601653715729'; +String _$apiServiceHash() => r'93a7e3b4d3004741abc3061c4688239c3a72f9c4'; /// See also [apiService]. @ProviderFor(apiService) diff --git a/mobile/lib/providers/app_settings.provider.g.dart b/mobile/lib/providers/app_settings.provider.g.dart index 1d2fe173b1..88cab49c1b 100644 --- a/mobile/lib/providers/app_settings.provider.g.dart +++ b/mobile/lib/providers/app_settings.provider.g.dart @@ -7,7 +7,7 @@ part of 'app_settings.provider.dart'; // ************************************************************************** String _$appSettingsServiceHash() => - r'45ea609a91d250290431a7a08a14d16b37c7515d'; + r'3736e0d384ec7b1f896938589656dd6eb1552d60'; /// See also [appSettingsService]. @ProviderFor(appSettingsService) diff --git a/mobile/lib/providers/asset.provider.dart b/mobile/lib/providers/asset.provider.dart index 53fe0338ce..fef0f7b420 100644 --- a/mobile/lib/providers/asset.provider.dart +++ b/mobile/lib/providers/asset.provider.dart @@ -1,15 +1,16 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/domain/models/store.model.dart'; +import 'package:immich_mobile/domain/services/user.service.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/providers/infrastructure/user.provider.dart'; import 'package:immich_mobile/providers/memory.provider.dart'; import 'package:immich_mobile/services/album.service.dart'; import 'package:immich_mobile/services/asset.service.dart'; import 'package:immich_mobile/services/etag.service.dart'; import 'package:immich_mobile/services/exif.service.dart'; import 'package:immich_mobile/services/sync.service.dart'; -import 'package:immich_mobile/services/user.service.dart'; import 'package:logging/logging.dart'; final assetProvider = StateNotifierProvider((ref) { @@ -59,7 +60,7 @@ class AssetNotifier extends StateNotifier { await clearAllAssets(); log.info("Manual refresh requested, cleared assets and albums from db"); } - final users = await _userService.getUsersFromServer(); + final users = await _syncService.getUsersFromServer(); bool changedUsers = false; if (users != null) { changedUsers = await _syncService.syncUsersFromServer(users); @@ -86,7 +87,7 @@ class AssetNotifier extends StateNotifier { _assetService.clearTable(), _exifService.clearTable(), _albumService.clearTable(), - _userService.clearTable(), + _userService.deleteAll(), _etagService.clearTable(), ]); } diff --git a/mobile/lib/providers/asset_viewer/asset_stack.provider.g.dart b/mobile/lib/providers/asset_viewer/asset_stack.provider.g.dart index da49c11429..5d4051b285 100644 --- a/mobile/lib/providers/asset_viewer/asset_stack.provider.g.dart +++ b/mobile/lib/providers/asset_viewer/asset_stack.provider.g.dart @@ -6,7 +6,7 @@ part of 'asset_stack.provider.dart'; // RiverpodGenerator // ************************************************************************** -String _$assetStackIndexHash() => r'0f2df55e929767c8c698bd432b5e6e351d000a16'; +String _$assetStackIndexHash() => r'38b4b0116e3e4592620b118ae01cf89b77da9cfe'; /// Copied from Dart SDK class _SystemHash { diff --git a/mobile/lib/providers/auth.provider.dart b/mobile/lib/providers/auth.provider.dart index e2939e89ce..2a140911b0 100644 --- a/mobile/lib/providers/auth.provider.dart +++ b/mobile/lib/providers/auth.provider.dart @@ -2,8 +2,9 @@ import 'package:flutter/foundation.dart'; import 'package:flutter_udid/flutter_udid.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/domain/models/store.model.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/entities/store.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/infrastructure/utils/user.converter.dart'; import 'package:immich_mobile/models/auth/auth_state.model.dart'; import 'package:immich_mobile/models/auth/login_response.model.dart'; import 'package:immich_mobile/providers/api.provider.dart'; @@ -105,7 +106,7 @@ class AuthNotifier extends StateNotifier { String deviceId = Store.tryGet(StoreKey.deviceId) ?? await FlutterUdid.consistentUdid; - User? user = Store.tryGet(StoreKey.currentUser); + UserDto? user = Store.tryGet(StoreKey.currentUser); UserAdminResponseDto? userResponse; UserPreferencesResponseDto? userPreferences; @@ -141,18 +142,18 @@ class AuthNotifier extends StateNotifier { // If the user information is successfully retrieved, update the store // Due to the flow of the code, this will always happen on first login - if (userResponse != null) { + if (userResponse == null) { + _log.severe("Unable to get user information from the server."); + } else { await Store.put(StoreKey.deviceId, deviceId); await Store.put(StoreKey.deviceIdHash, fastHash(deviceId)); await Store.put( StoreKey.currentUser, - User.fromUserDto(userResponse, userPreferences), + UserConverter.fromAdminDto(userResponse, userPreferences), ); await Store.put(StoreKey.accessToken, accessToken); - user = User.fromUserDto(userResponse, userPreferences); - } else { - _log.severe("Unable to get user information from the server."); + user = UserConverter.fromAdminDto(userResponse, userPreferences); } // If the user is null, the login was not successful @@ -163,7 +164,7 @@ class AuthNotifier extends StateNotifier { state = state.copyWith( isAuthenticated: true, - userId: user.id, + userId: user.uid, userEmail: user.email, name: user.name, profileImagePath: user.profileImagePath, diff --git a/mobile/lib/providers/immich_logo_provider.g.dart b/mobile/lib/providers/immich_logo_provider.g.dart index 9f2d81b46a..0889e60fda 100644 --- a/mobile/lib/providers/immich_logo_provider.g.dart +++ b/mobile/lib/providers/immich_logo_provider.g.dart @@ -6,7 +6,7 @@ part of 'immich_logo_provider.dart'; // RiverpodGenerator // ************************************************************************** -String _$immichLogoHash() => r'040cc44fae3339e0f40a091fb3b2f2abe9f83acd'; +String _$immichLogoHash() => r'6f23d217c44279537b7edee1ca80ebf47f69a4d0'; /// See also [immichLogo]. @ProviderFor(immichLogo) diff --git a/mobile/lib/providers/infrastructure/db.provider.g.dart b/mobile/lib/providers/infrastructure/db.provider.g.dart index d35c2202ec..33b330192f 100644 --- a/mobile/lib/providers/infrastructure/db.provider.g.dart +++ b/mobile/lib/providers/infrastructure/db.provider.g.dart @@ -6,7 +6,7 @@ part of 'db.provider.dart'; // RiverpodGenerator // ************************************************************************** -String _$isarHash() => r'f0e886fa20e56dd1dc0082fcc723016289bd03cb'; +String _$isarHash() => r'69d3a06aa7e69a4381478e03f7956eb07d7f7feb'; /// See also [isar]. @ProviderFor(isar) diff --git a/mobile/lib/providers/infrastructure/exif.provider.g.dart b/mobile/lib/providers/infrastructure/exif.provider.g.dart index 5eec1bd23e..053abf18cc 100644 --- a/mobile/lib/providers/infrastructure/exif.provider.g.dart +++ b/mobile/lib/providers/infrastructure/exif.provider.g.dart @@ -6,7 +6,7 @@ part of 'exif.provider.dart'; // RiverpodGenerator // ************************************************************************** -String _$exifRepositoryHash() => r'f8f94d2a43fa79b08e58d60e81d7877825f33ec0'; +String _$exifRepositoryHash() => r'f0abe778ed61fbb257001fdf2ac6e17814011fee'; /// See also [exifRepository]. @ProviderFor(exifRepository) diff --git a/mobile/lib/providers/infrastructure/store.provider.dart b/mobile/lib/providers/infrastructure/store.provider.dart index 2712208e76..c7f0c04a4f 100644 --- a/mobile/lib/providers/infrastructure/store.provider.dart +++ b/mobile/lib/providers/infrastructure/store.provider.dart @@ -1,11 +1,15 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/domain/interfaces/store.interface.dart'; +import 'package:immich_mobile/domain/services/store.service.dart'; import 'package:immich_mobile/infrastructure/repositories/store.repository.dart'; import 'package:immich_mobile/providers/infrastructure/db.provider.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'store.provider.g.dart'; -@riverpod +@Riverpod(keepAlive: true) IStoreRepository storeRepository(Ref ref) => IsarStoreRepository(ref.watch(isarProvider)); + +@Riverpod(keepAlive: true) +StoreService storeService(Ref _) => StoreService.I; diff --git a/mobile/lib/providers/infrastructure/store.provider.g.dart b/mobile/lib/providers/infrastructure/store.provider.g.dart index 0551793b80..ffdcd291b6 100644 --- a/mobile/lib/providers/infrastructure/store.provider.g.dart +++ b/mobile/lib/providers/infrastructure/store.provider.g.dart @@ -6,11 +6,11 @@ part of 'store.provider.dart'; // RiverpodGenerator // ************************************************************************** -String _$storeRepositoryHash() => r'2f1c3e2e2db5082a40eb30a183a6c770f5b09d76'; +String _$storeRepositoryHash() => r'99d24875d30c5e86b1c6caa352a0026167114e62'; /// See also [storeRepository]. @ProviderFor(storeRepository) -final storeRepositoryProvider = AutoDisposeProvider.internal( +final storeRepositoryProvider = Provider.internal( storeRepository, name: r'storeRepositoryProvider', debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') @@ -22,6 +22,22 @@ final storeRepositoryProvider = AutoDisposeProvider.internal( @Deprecated('Will be removed in 3.0. Use Ref instead') // ignore: unused_element -typedef StoreRepositoryRef = AutoDisposeProviderRef; +typedef StoreRepositoryRef = ProviderRef; +String _$storeServiceHash() => r'250e10497c42df360e9e1f9a618d0b19c1b5b0a0'; + +/// See also [storeService]. +@ProviderFor(storeService) +final storeServiceProvider = Provider.internal( + storeService, + name: r'storeServiceProvider', + debugGetCreateSourceHash: + const bool.fromEnvironment('dart.vm.product') ? null : _$storeServiceHash, + dependencies: null, + allTransitiveDependencies: null, +); + +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element +typedef StoreServiceRef = ProviderRef; // ignore_for_file: type=lint // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package diff --git a/mobile/lib/providers/infrastructure/user.provider.dart b/mobile/lib/providers/infrastructure/user.provider.dart new file mode 100644 index 0000000000..e6eaac06b6 --- /dev/null +++ b/mobile/lib/providers/infrastructure/user.provider.dart @@ -0,0 +1,27 @@ +import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:immich_mobile/domain/interfaces/user.interface.dart'; +import 'package:immich_mobile/domain/interfaces/user_api.repository.dart'; +import 'package:immich_mobile/domain/services/user.service.dart'; +import 'package:immich_mobile/infrastructure/repositories/user.repository.dart'; +import 'package:immich_mobile/infrastructure/repositories/user_api.repository.dart'; +import 'package:immich_mobile/providers/api.provider.dart'; +import 'package:immich_mobile/providers/infrastructure/db.provider.dart'; +import 'package:immich_mobile/providers/infrastructure/store.provider.dart'; +import 'package:riverpod_annotation/riverpod_annotation.dart'; + +part 'user.provider.g.dart'; + +@Riverpod(keepAlive: true) +IUserRepository userRepository(Ref ref) => + IsarUserRepository(ref.watch(isarProvider)); + +@Riverpod(keepAlive: true) +IUserApiRepository userApiRepository(Ref ref) => + UserApiRepository(ref.watch(apiServiceProvider).usersApi); + +@Riverpod(keepAlive: true) +UserService userService(Ref ref) => UserService( + userRepository: ref.watch(userRepositoryProvider), + userApiRepository: ref.watch(userApiRepositoryProvider), + storeService: ref.watch(storeServiceProvider), + ); diff --git a/mobile/lib/providers/infrastructure/user.provider.g.dart b/mobile/lib/providers/infrastructure/user.provider.g.dart new file mode 100644 index 0000000000..fdb4223ee8 --- /dev/null +++ b/mobile/lib/providers/infrastructure/user.provider.g.dart @@ -0,0 +1,60 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'user.provider.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +String _$userRepositoryHash() => r'1a2ac726bcc44397dcaecf449084fefd336696d4'; + +/// See also [userRepository]. +@ProviderFor(userRepository) +final userRepositoryProvider = Provider.internal( + userRepository, + name: r'userRepositoryProvider', + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$userRepositoryHash, + dependencies: null, + allTransitiveDependencies: null, +); + +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element +typedef UserRepositoryRef = ProviderRef; +String _$userApiRepositoryHash() => r'6b19f2c99fb83162a5ceb91adb8589eaae01bc92'; + +/// See also [userApiRepository]. +@ProviderFor(userApiRepository) +final userApiRepositoryProvider = Provider.internal( + userApiRepository, + name: r'userApiRepositoryProvider', + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$userApiRepositoryHash, + dependencies: null, + allTransitiveDependencies: null, +); + +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element +typedef UserApiRepositoryRef = ProviderRef; +String _$userServiceHash() => r'4a0873357b7115b4d6bfa8e89b847c0b74ce0d93'; + +/// See also [userService]. +@ProviderFor(userService) +final userServiceProvider = Provider.internal( + userService, + name: r'userServiceProvider', + debugGetCreateSourceHash: + const bool.fromEnvironment('dart.vm.product') ? null : _$userServiceHash, + dependencies: null, + allTransitiveDependencies: null, +); + +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element +typedef UserServiceRef = ProviderRef; +// ignore_for_file: type=lint +// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package diff --git a/mobile/lib/providers/map/map_marker.provider.g.dart b/mobile/lib/providers/map/map_marker.provider.g.dart index c79292aa61..76cc44a103 100644 --- a/mobile/lib/providers/map/map_marker.provider.g.dart +++ b/mobile/lib/providers/map/map_marker.provider.g.dart @@ -6,7 +6,7 @@ part of 'map_marker.provider.dart'; // RiverpodGenerator // ************************************************************************** -String _$mapMarkersHash() => r'737d52f3d02e6a458b11d730f2fe522c39ee1ebf'; +String _$mapMarkersHash() => r'f33ac4baa3251b3f06423aece89673315966f885'; /// See also [mapMarkers]. @ProviderFor(mapMarkers) diff --git a/mobile/lib/providers/map/map_service.provider.g.dart b/mobile/lib/providers/map/map_service.provider.g.dart index b7adb96ab9..70e44da621 100644 --- a/mobile/lib/providers/map/map_service.provider.g.dart +++ b/mobile/lib/providers/map/map_service.provider.g.dart @@ -6,7 +6,7 @@ part of 'map_service.provider.dart'; // RiverpodGenerator // ************************************************************************** -String _$mapServiceHash() => r'2f68c07ac6cd5c74ec8be3bd2df91f4db673b79e'; +String _$mapServiceHash() => r'7b26bcd231ed5728ac51fe015dddbf8f91491abb'; /// See also [mapService]. @ProviderFor(mapService) diff --git a/mobile/lib/providers/partner.provider.dart b/mobile/lib/providers/partner.provider.dart index 282e779432..f210c7fe3f 100644 --- a/mobile/lib/providers/partner.provider.dart +++ b/mobile/lib/providers/partner.provider.dart @@ -2,16 +2,16 @@ import 'dart:async'; import 'package:collection/collection.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/providers/album/suggested_shared_users.provider.dart'; import 'package:immich_mobile/services/partner.service.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; -class PartnerSharedWithNotifier extends StateNotifier> { +class PartnerSharedWithNotifier extends StateNotifier> { final PartnerService _partnerService; - late final StreamSubscription> streamSub; + late final StreamSubscription> streamSub; PartnerSharedWithNotifier(this._partnerService) : super([]) { - Function eq = const ListEquality().equals; + Function eq = const ListEquality().equals; _partnerService.getSharedWith().then((partners) { if (!eq(state, partners)) { state = partners; @@ -25,7 +25,7 @@ class PartnerSharedWithNotifier extends StateNotifier> { }); } - Future updatePartner(User partner, {required bool inTimeline}) { + Future updatePartner(UserDto partner, {required bool inTimeline}) { return _partnerService.updatePartner(partner, inTimeline: inTimeline); } @@ -39,18 +39,18 @@ class PartnerSharedWithNotifier extends StateNotifier> { } final partnerSharedWithProvider = - StateNotifierProvider>((ref) { + StateNotifierProvider>((ref) { return PartnerSharedWithNotifier( ref.watch(partnerServiceProvider), ); }); -class PartnerSharedByNotifier extends StateNotifier> { +class PartnerSharedByNotifier extends StateNotifier> { final PartnerService _partnerService; - late final StreamSubscription> streamSub; + late final StreamSubscription> streamSub; PartnerSharedByNotifier(this._partnerService) : super([]) { - Function eq = const ListEquality().equals; + Function eq = const ListEquality().equals; _partnerService.getSharedBy().then((partners) { if (!eq(state, partners)) { state = partners; @@ -74,15 +74,15 @@ class PartnerSharedByNotifier extends StateNotifier> { } final partnerSharedByProvider = - StateNotifierProvider>((ref) { + StateNotifierProvider>((ref) { return PartnerSharedByNotifier(ref.watch(partnerServiceProvider)); }); final partnerAvailableProvider = - FutureProvider.autoDispose>((ref) async { + FutureProvider.autoDispose>((ref) async { final otherUsers = await ref.watch(otherUsersProvider.future); final currentPartners = ref.watch(partnerSharedByProvider); - final available = Set.of(otherUsers); + final available = Set.of(otherUsers); available.removeAll(currentPartners); return available.toList(); }); diff --git a/mobile/lib/providers/search/paginated_search.provider.g.dart b/mobile/lib/providers/search/paginated_search.provider.g.dart index 86061675dc..650cf130fc 100644 --- a/mobile/lib/providers/search/paginated_search.provider.g.dart +++ b/mobile/lib/providers/search/paginated_search.provider.g.dart @@ -7,7 +7,7 @@ part of 'paginated_search.provider.dart'; // ************************************************************************** String _$paginatedSearchRenderListHash() => - r'9efb98fd73d4e57e1ccd97a902cd459e3f18f749'; + r'22d715ff7864e5a946be38322ce7813616f899c2'; /// See also [paginatedSearchRenderList]. @ProviderFor(paginatedSearchRenderList) diff --git a/mobile/lib/providers/search/people.provider.g.dart b/mobile/lib/providers/search/people.provider.g.dart index 51295f991a..391edd362c 100644 --- a/mobile/lib/providers/search/people.provider.g.dart +++ b/mobile/lib/providers/search/people.provider.g.dart @@ -6,7 +6,7 @@ part of 'people.provider.dart'; // RiverpodGenerator // ************************************************************************** -String _$getAllPeopleHash() => r'3417b7e0c211382d4480a415e352139995d57b6d'; +String _$getAllPeopleHash() => r'226947af3b09ce62224916543958dd1d5e2ba651'; /// See also [getAllPeople]. @ProviderFor(getAllPeople) @@ -22,7 +22,7 @@ final getAllPeopleProvider = AutoDisposeFutureProvider>.internal( @Deprecated('Will be removed in 3.0. Use Ref instead') // ignore: unused_element typedef GetAllPeopleRef = AutoDisposeFutureProviderRef>; -String _$personAssetsHash() => r'3dfecb67a54d07e4208bcb9581b2625acd2e1832'; +String _$personAssetsHash() => r'c1d35ee0e024bd6915e21bc724be4b458a14bc24'; /// Copied from Dart SDK class _SystemHash { @@ -173,7 +173,7 @@ class _PersonAssetsProviderElement String get personId => (origin as PersonAssetsProvider).personId; } -String _$updatePersonNameHash() => r'7145aaaf6fc38fdafe3a283ebf3d3f4fd0774cd2'; +String _$updatePersonNameHash() => r'45f7693172de522a227406d8198811434cf2bbbc'; /// See also [updatePersonName]. @ProviderFor(updatePersonName) diff --git a/mobile/lib/providers/search/search_filter.provider.g.dart b/mobile/lib/providers/search/search_filter.provider.g.dart index a5e70b01e8..03f88b0332 100644 --- a/mobile/lib/providers/search/search_filter.provider.g.dart +++ b/mobile/lib/providers/search/search_filter.provider.g.dart @@ -7,7 +7,7 @@ part of 'search_filter.provider.dart'; // ************************************************************************** String _$getSearchSuggestionsHash() => - r'bc1e9a1a060868f14e6eb970d2251dbfe39c6866'; + r'bc30a65e8fcb273cbd07bab876baf67bcc794737'; /// Copied from Dart SDK class _SystemHash { diff --git a/mobile/lib/providers/upload_profile_image.provider.dart b/mobile/lib/providers/upload_profile_image.provider.dart index 83f30e5018..10aa645654 100644 --- a/mobile/lib/providers/upload_profile_image.provider.dart +++ b/mobile/lib/providers/upload_profile_image.provider.dart @@ -3,8 +3,8 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:image_picker/image_picker.dart'; - -import 'package:immich_mobile/services/user.service.dart'; +import 'package:immich_mobile/domain/services/user.service.dart'; +import 'package:immich_mobile/providers/infrastructure/user.provider.dart'; enum UploadProfileStatus { idle, @@ -72,7 +72,7 @@ class UploadProfileImageState { class UploadProfileImageNotifier extends StateNotifier { - UploadProfileImageNotifier(this._userSErvice) + UploadProfileImageNotifier(this._userService) : super( UploadProfileImageState( profileImagePath: '', @@ -80,18 +80,21 @@ class UploadProfileImageNotifier ), ); - final UserService _userSErvice; + final UserService _userService; Future upload(XFile file) async { state = state.copyWith(status: UploadProfileStatus.loading); - var res = await _userSErvice.uploadProfileImage(file); + var profileImagePath = await _userService.createProfileImage( + file.name, + await file.readAsBytes(), + ); - if (res != null) { + if (profileImagePath != null) { debugPrint("Successfully upload profile image"); state = state.copyWith( status: UploadProfileStatus.success, - profileImagePath: res.profileImagePath, + profileImagePath: profileImagePath, ); return true; } diff --git a/mobile/lib/providers/user.provider.dart b/mobile/lib/providers/user.provider.dart index 0a1bc0275a..fb574fa99a 100644 --- a/mobile/lib/providers/user.provider.dart +++ b/mobile/lib/providers/user.provider.dart @@ -2,13 +2,14 @@ import 'dart:async'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/domain/models/store.model.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/entities/store.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/infrastructure/utils/user.converter.dart'; import 'package:immich_mobile/providers/api.provider.dart'; import 'package:immich_mobile/services/api.service.dart'; import 'package:immich_mobile/services/timeline.service.dart'; -class CurrentUserProvider extends StateNotifier { +class CurrentUserProvider extends StateNotifier { CurrentUserProvider(this._apiService) : super(null) { state = Store.tryGet(StoreKey.currentUser); streamSub = @@ -16,7 +17,7 @@ class CurrentUserProvider extends StateNotifier { } final ApiService _apiService; - late final StreamSubscription streamSub; + late final StreamSubscription streamSub; refresh() async { try { @@ -25,7 +26,7 @@ class CurrentUserProvider extends StateNotifier { if (user != null) { await Store.put( StoreKey.currentUser, - User.fromUserDto(user, userPreferences), + UserConverter.fromAdminDto(user, userPreferences), ); } } catch (_) {} @@ -39,7 +40,7 @@ class CurrentUserProvider extends StateNotifier { } final currentUserProvider = - StateNotifierProvider((ref) { + StateNotifierProvider((ref) { return CurrentUserProvider( ref.watch(apiServiceProvider), ); diff --git a/mobile/lib/repositories/activity_api.repository.dart b/mobile/lib/repositories/activity_api.repository.dart index 8da3759709..868415caf9 100644 --- a/mobile/lib/repositories/activity_api.repository.dart +++ b/mobile/lib/repositories/activity_api.repository.dart @@ -1,5 +1,5 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/infrastructure/utils/user.converter.dart'; import 'package:immich_mobile/interfaces/activity_api.interface.dart'; import 'package:immich_mobile/models/activities/activity.model.dart'; import 'package:immich_mobile/providers/api.provider.dart'; @@ -60,7 +60,7 @@ class ActivityApiRepository extends ApiRepository type: dto.type == ReactionType.comment ? ActivityType.comment : ActivityType.like, - user: User.fromSimpleUserDto(dto.user), + user: UserConverter.fromSimpleUserDto(dto.user), assetId: dto.assetId, comment: dto.comment, ); diff --git a/mobile/lib/repositories/album.repository.dart b/mobile/lib/repositories/album.repository.dart index 1d2df89579..a6657f7637 100644 --- a/mobile/lib/repositories/album.repository.dart +++ b/mobile/lib/repositories/album.repository.dart @@ -1,9 +1,11 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/domain/models/store.model.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart' + as entity; import 'package:immich_mobile/interfaces/album.interface.dart'; import 'package:immich_mobile/models/albums/album_search.model.dart'; import 'package:immich_mobile/providers/db.provider.dart'; @@ -43,11 +45,11 @@ class AlbumRepository extends DatabaseRepository implements IAlbumRepository { } if (owner == true) { query = query.owner( - (q) => q.isarIdEqualTo(Store.get(StoreKey.currentUser).isarId), + (q) => q.isarIdEqualTo(Store.get(StoreKey.currentUser).id), ); } else if (owner == false) { query = query.owner( - (q) => q.not().isarIdEqualTo(Store.get(StoreKey.currentUser).isarId), + (q) => q.not().isarIdEqualTo(Store.get(StoreKey.currentUser).id), ); } if (remote == true) { @@ -100,8 +102,9 @@ class AlbumRepository extends DatabaseRepository implements IAlbumRepository { Future get(int id) => db.albums.get(id); @override - Future removeUsers(Album album, List users) => - txn(() => album.sharedUsers.update(unlink: users)); + Future removeUsers(Album album, List users) => txn( + () => album.sharedUsers.update(unlink: users.map(entity.User.fromDto)), + ); @override Future addAssets(Album album, List assets) => @@ -121,8 +124,8 @@ class AlbumRepository extends DatabaseRepository implements IAlbumRepository { } @override - Future addUsers(Album album, List users) => - txn(() => album.sharedUsers.update(link: users)); + Future addUsers(Album album, List users) => + txn(() => album.sharedUsers.update(link: users.map(entity.User.fromDto))); @override Future deleteAllLocal() => @@ -141,11 +144,11 @@ class AlbumRepository extends DatabaseRepository implements IAlbumRepository { switch (filterMode) { case QuickFilterMode.sharedWithMe: query = query.owner( - (q) => q.not().isarIdEqualTo(Store.get(StoreKey.currentUser).isarId), + (q) => q.not().isarIdEqualTo(Store.get(StoreKey.currentUser).id), ); case QuickFilterMode.myAlbums: query = query.owner( - (q) => q.isarIdEqualTo(Store.get(StoreKey.currentUser).isarId), + (q) => q.isarIdEqualTo(Store.get(StoreKey.currentUser).id), ); case QuickFilterMode.all: break; diff --git a/mobile/lib/repositories/album_api.repository.dart b/mobile/lib/repositories/album_api.repository.dart index 2438304158..a7bbe452e6 100644 --- a/mobile/lib/repositories/album_api.repository.dart +++ b/mobile/lib/repositories/album_api.repository.dart @@ -2,7 +2,9 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/constants/enums.dart'; import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart' + as entity; +import 'package:immich_mobile/infrastructure/utils/user.converter.dart'; import 'package:immich_mobile/interfaces/album_api.interface.dart'; import 'package:immich_mobile/providers/api.provider.dart'; import 'package:immich_mobile/repositories/api.repository.dart'; @@ -164,11 +166,12 @@ class AlbumApiRepository extends ApiRepository implements IAlbumApiRepository { sortOrder: dto.order == AssetOrder.asc ? SortOrder.asc : SortOrder.desc, ); album.remoteAssetCount = dto.assetCount; - album.owner.value = User.fromSimpleUserDto(dto.owner); + album.owner.value = + entity.User.fromDto(UserConverter.fromSimpleUserDto(dto.owner)); album.remoteThumbnailAssetId = dto.albumThumbnailAssetId; final users = dto.albumUsers - .map((albumUser) => User.fromSimpleUserDto(albumUser.user)); - album.sharedUsers.addAll(users); + .map((albumUser) => UserConverter.fromSimpleUserDto(albumUser.user)); + album.sharedUsers.addAll(users.map(entity.User.fromDto)); final assets = dto.assets.map(Asset.remote).toList(); album.assets.addAll(assets); return album; diff --git a/mobile/lib/repositories/album_media.repository.dart b/mobile/lib/repositories/album_media.repository.dart index f4f31cf14e..f08322e20a 100644 --- a/mobile/lib/repositories/album_media.repository.dart +++ b/mobile/lib/repositories/album_media.repository.dart @@ -3,6 +3,7 @@ import 'package:immich_mobile/domain/models/store.model.dart'; import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart'; import 'package:immich_mobile/interfaces/album_media.interface.dart'; import 'package:immich_mobile/repositories/asset_media.repository.dart'; import 'package:photo_manager/photo_manager.dart' hide AssetType; @@ -86,7 +87,7 @@ class AlbumMediaRepository implements IAlbumMediaRepository { shared: false, activityEnabled: false, ); - album.owner.value = Store.get(StoreKey.currentUser); + album.owner.value = User.fromDto(Store.get(StoreKey.currentUser)); album.localId = assetPathEntity.id; album.isAll = assetPathEntity.isAll; return album; diff --git a/mobile/lib/repositories/asset_media.repository.dart b/mobile/lib/repositories/asset_media.repository.dart index 97d22f3600..0149a8d6c6 100644 --- a/mobile/lib/repositories/asset_media.repository.dart +++ b/mobile/lib/repositories/asset_media.repository.dart @@ -24,7 +24,7 @@ class AssetMediaRepository implements IAssetMediaRepository { final Asset asset = Asset( checksum: "", localId: local.id, - ownerId: Store.get(StoreKey.currentUser).isarId, + ownerId: Store.get(StoreKey.currentUser).id, fileCreatedAt: local.createDateTime, fileModifiedAt: local.modifiedDateTime, updatedAt: local.modifiedDateTime, diff --git a/mobile/lib/repositories/auth.repository.dart b/mobile/lib/repositories/auth.repository.dart index 18e14865aa..f9e82e1635 100644 --- a/mobile/lib/repositories/auth.repository.dart +++ b/mobile/lib/repositories/auth.repository.dart @@ -6,8 +6,8 @@ import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/etag.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart'; import 'package:immich_mobile/interfaces/auth.interface.dart'; import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart'; import 'package:immich_mobile/providers/db.provider.dart'; diff --git a/mobile/lib/repositories/partner.repository.dart b/mobile/lib/repositories/partner.repository.dart index cae49fee39..5ea10f98c8 100644 --- a/mobile/lib/repositories/partner.repository.dart +++ b/mobile/lib/repositories/partner.repository.dart @@ -1,5 +1,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart' + as entity; import 'package:immich_mobile/interfaces/partner.interface.dart'; import 'package:immich_mobile/providers/db.provider.dart'; import 'package:immich_mobile/repositories/database.repository.dart'; @@ -14,34 +16,40 @@ class PartnerRepository extends DatabaseRepository PartnerRepository(super.db); @override - Future> getSharedBy() { - return db.users - .filter() - .isPartnerSharedByEqualTo(true) - .sortById() - .findAll(); + Future> getSharedBy() async { + return (await db.users + .filter() + .isPartnerSharedByEqualTo(true) + .sortById() + .findAll()) + .map((u) => u.toDto()) + .toList(); } @override - Future> getSharedWith() { - return db.users - .filter() - .isPartnerSharedWithEqualTo(true) - .sortById() - .findAll(); + Future> getSharedWith() async { + return (await db.users + .filter() + .isPartnerSharedWithEqualTo(true) + .sortById() + .findAll()) + .map((u) => u.toDto()) + .toList(); } @override - Stream> watchSharedBy() { - return db.users.filter().isPartnerSharedByEqualTo(true).sortById().watch(); + Stream> watchSharedBy() { + return (db.users.filter().isPartnerSharedByEqualTo(true).sortById().watch()) + .map((users) => users.map((u) => u.toDto()).toList()); } @override - Stream> watchSharedWith() { - return db.users - .filter() - .isPartnerSharedWithEqualTo(true) - .sortById() - .watch(); + Stream> watchSharedWith() { + return (db.users + .filter() + .isPartnerSharedWithEqualTo(true) + .sortById() + .watch()) + .map((users) => users.map((u) => u.toDto()).toList()); } } diff --git a/mobile/lib/repositories/partner_api.repository.dart b/mobile/lib/repositories/partner_api.repository.dart index 1ae16d9d52..367e2a58d7 100644 --- a/mobile/lib/repositories/partner_api.repository.dart +++ b/mobile/lib/repositories/partner_api.repository.dart @@ -1,5 +1,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; +import 'package:immich_mobile/infrastructure/utils/user.converter.dart'; import 'package:immich_mobile/interfaces/partner_api.interface.dart'; import 'package:immich_mobile/providers/api.provider.dart'; import 'package:immich_mobile/repositories/api.repository.dart'; @@ -18,7 +19,7 @@ class PartnerApiRepository extends ApiRepository PartnerApiRepository(this._api); @override - Future> getAll(Direction direction) async { + Future> getAll(Direction direction) async { final response = await checkNull( _api.getPartners( direction == Direction.sharedByMe @@ -26,26 +27,26 @@ class PartnerApiRepository extends ApiRepository : PartnerDirection.with_, ), ); - return response.map(User.fromPartnerDto).toList(); + return response.map(UserConverter.fromPartnerDto).toList(); } @override - Future create(String id) async { + Future create(String id) async { final dto = await checkNull(_api.createPartner(id)); - return User.fromPartnerDto(dto); + return UserConverter.fromPartnerDto(dto); } @override Future delete(String id) => _api.removePartner(id); @override - Future update(String id, {required bool inTimeline}) async { + Future update(String id, {required bool inTimeline}) async { final dto = await checkNull( _api.updatePartner( id, UpdatePartnerDto(inTimeline: inTimeline), ), ); - return User.fromPartnerDto(dto); + return UserConverter.fromPartnerDto(dto); } } diff --git a/mobile/lib/repositories/timeline.repository.dart b/mobile/lib/repositories/timeline.repository.dart index 1b9ee8ad37..1b0471059f 100644 --- a/mobile/lib/repositories/timeline.repository.dart +++ b/mobile/lib/repositories/timeline.repository.dart @@ -2,7 +2,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/constants/enums.dart'; import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart'; import 'package:immich_mobile/interfaces/timeline.interface.dart'; import 'package:immich_mobile/providers/db.provider.dart'; import 'package:immich_mobile/repositories/database.repository.dart'; diff --git a/mobile/lib/repositories/user.repository.dart b/mobile/lib/repositories/user.repository.dart deleted file mode 100644 index ea67b30e0d..0000000000 --- a/mobile/lib/repositories/user.repository.dart +++ /dev/null @@ -1,73 +0,0 @@ -import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/domain/models/store.model.dart'; -import 'package:immich_mobile/entities/store.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; -import 'package:immich_mobile/interfaces/user.interface.dart'; -import 'package:immich_mobile/providers/db.provider.dart'; -import 'package:immich_mobile/repositories/database.repository.dart'; -import 'package:isar/isar.dart'; - -final userRepositoryProvider = - Provider((ref) => UserRepository(ref.watch(dbProvider))); - -class UserRepository extends DatabaseRepository implements IUserRepository { - UserRepository(super.db); - - @override - Future> getByIds(List ids) async => - (await db.users.getAllById(ids)).nonNulls.toList(); - - @override - Future get(String id) => db.users.getById(id); - - @override - Future> getAll({bool self = true, UserSort? sortBy}) { - final baseQuery = db.users.where(); - final int userId = Store.get(StoreKey.currentUser).isarId; - final QueryBuilder afterWhere = - self ? baseQuery.noOp() : baseQuery.isarIdNotEqualTo(userId); - final QueryBuilder query = switch (sortBy) { - null => afterWhere.noOp(), - UserSort.id => afterWhere.sortById(), - }; - return query.findAll(); - } - - @override - Future update(User user) async { - await txn(() => db.users.put(user)); - return user; - } - - @override - Future me() => Future.value(Store.get(StoreKey.currentUser)); - - @override - Future deleteById(List ids) => txn(() => db.users.deleteAll(ids)); - - @override - Future> upsertAll(List users) async { - await txn(() => db.users.putAll(users)); - return users; - } - - @override - Future> getAllAccessible() => db.users - .filter() - .isPartnerSharedWithEqualTo(true) - .or() - .isarIdEqualTo(Store.get(StoreKey.currentUser).isarId) - .findAll(); - - @override - Future getByDbId(int id) async { - return await db.users.get(id); - } - - @override - Future clearTable() async { - await txn(() async { - await db.users.clear(); - }); - } -} diff --git a/mobile/lib/repositories/user_api.repository.dart b/mobile/lib/repositories/user_api.repository.dart deleted file mode 100644 index 9641c4e0e6..0000000000 --- a/mobile/lib/repositories/user_api.repository.dart +++ /dev/null @@ -1,40 +0,0 @@ -import 'dart:typed_data'; - -import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:http/http.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; -import 'package:immich_mobile/interfaces/user_api.interface.dart'; -import 'package:immich_mobile/providers/api.provider.dart'; -import 'package:immich_mobile/repositories/api.repository.dart'; -import 'package:openapi/api.dart'; - -final userApiRepositoryProvider = Provider( - (ref) => UserApiRepository( - ref.watch(apiServiceProvider).usersApi, - ), -); - -class UserApiRepository extends ApiRepository implements IUserApiRepository { - final UsersApi _api; - - UserApiRepository(this._api); - - @override - Future> getAll() async { - final dto = await checkNull(_api.searchUsers()); - return dto.map(User.fromSimpleUserDto).toList(); - } - - @override - Future<({String profileImagePath})> createProfileImage({ - required String name, - required Uint8List data, - }) async { - final response = await checkNull( - _api.createProfileImage( - MultipartFile.fromBytes('file', data, filename: name), - ), - ); - return (profileImagePath: response.profileImagePath); - } -} diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart index cd7a6f6b98..d7edc6fd28 100644 --- a/mobile/lib/routing/router.dart +++ b/mobile/lib/routing/router.dart @@ -2,11 +2,10 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/domain/models/log.model.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/models/folder/recursive_folder.model.dart'; -import 'package:immich_mobile/pages/library/folder/folder.page.dart'; import 'package:immich_mobile/models/memories/memory.model.dart'; import 'package:immich_mobile/models/search/search_filter.model.dart'; import 'package:immich_mobile/models/shared_link/shared_link.model.dart'; @@ -37,6 +36,7 @@ import 'package:immich_mobile/pages/editing/edit.page.dart'; import 'package:immich_mobile/pages/editing/filter.page.dart'; import 'package:immich_mobile/pages/library/archive.page.dart'; import 'package:immich_mobile/pages/library/favorite.page.dart'; +import 'package:immich_mobile/pages/library/folder/folder.page.dart'; import 'package:immich_mobile/pages/library/library.page.dart'; import 'package:immich_mobile/pages/library/local_albums.page.dart'; import 'package:immich_mobile/pages/library/partner/partner.page.dart'; diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart index f2f169247e..a78371e05e 100644 --- a/mobile/lib/routing/router.gr.dart +++ b/mobile/lib/routing/router.gr.dart @@ -1162,7 +1162,7 @@ class NativeVideoViewerRouteArgs { class PartnerDetailRoute extends PageRouteInfo { PartnerDetailRoute({ Key? key, - required User partner, + required UserDto partner, List? children, }) : super( PartnerDetailRoute.name, @@ -1195,7 +1195,7 @@ class PartnerDetailRouteArgs { final Key? key; - final User partner; + final UserDto partner; @override String toString() { diff --git a/mobile/lib/routing/tab_navigation_observer.dart b/mobile/lib/routing/tab_navigation_observer.dart index b6a845a0b3..edbfe6da4c 100644 --- a/mobile/lib/routing/tab_navigation_observer.dart +++ b/mobile/lib/routing/tab_navigation_observer.dart @@ -3,7 +3,7 @@ import 'package:flutter/foundation.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/domain/models/store.model.dart'; import 'package:immich_mobile/entities/store.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/infrastructure/utils/user.converter.dart'; import 'package:immich_mobile/providers/api.provider.dart'; import 'package:immich_mobile/providers/asset.provider.dart'; import 'package:immich_mobile/providers/memory.provider.dart'; @@ -39,7 +39,7 @@ class TabNavigationObserver extends AutoRouterObserver { await Store.put( StoreKey.currentUser, - User.fromUserDto(userResponseDto, userPreferences), + UserConverter.fromAdminDto(userResponseDto, userPreferences), ); ref.read(serverInfoProvider.notifier).getServerVersion(); } catch (e) { diff --git a/mobile/lib/services/album.service.dart b/mobile/lib/services/album.service.dart index 3a44ca7286..d3fe7674d5 100644 --- a/mobile/lib/services/album.service.dart +++ b/mobile/lib/services/album.service.dart @@ -7,11 +7,13 @@ import 'package:flutter/foundation.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/constants/enums.dart'; import 'package:immich_mobile/domain/models/store.model.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/backup_album.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart' + as entity; import 'package:immich_mobile/interfaces/album.interface.dart'; import 'package:immich_mobile/interfaces/album_api.interface.dart'; import 'package:immich_mobile/interfaces/album_media.interface.dart'; @@ -26,12 +28,10 @@ import 'package:immich_mobile/repositories/asset.repository.dart'; import 'package:immich_mobile/repositories/backup.repository.dart'; import 'package:immich_mobile/services/entity.service.dart'; import 'package:immich_mobile/services/sync.service.dart'; -import 'package:immich_mobile/services/user.service.dart'; import 'package:logging/logging.dart'; final albumServiceProvider = Provider( (ref) => AlbumService( - ref.watch(userServiceProvider), ref.watch(syncServiceProvider), ref.watch(entityServiceProvider), ref.watch(albumRepositoryProvider), @@ -43,7 +43,6 @@ final albumServiceProvider = Provider( ); class AlbumService { - final UserService _userService; final SyncService _syncService; final EntityService _entityService; final IAlbumRepository _albumRepository; @@ -56,7 +55,6 @@ class AlbumService { Completer _remoteCompleter = Completer()..complete(false); AlbumService( - this._userService, this._syncService, this._entityService, this._albumRepository, @@ -169,7 +167,7 @@ class AlbumService { final Stopwatch sw = Stopwatch()..start(); bool changes = false; try { - final users = await _userService.getUsersFromServer(); + final users = await _syncService.getUsersFromServer(); if (users != null) { await _syncService.syncUsersFromServer(users); } @@ -202,12 +200,12 @@ class AlbumService { Future createAlbum( String albumName, Iterable assets, [ - Iterable sharedUsers = const [], + Iterable sharedUsers = const [], ]) async { final Album album = await _albumApiRepository.create( albumName, assetIds: assets.map((asset) => asset.remoteId!), - sharedUserIds: sharedUsers.map((user) => user.id), + sharedUserIds: sharedUsers.map((user) => user.uid), ); await _entityService.fillAlbumWithDatabaseEntities(album); return _albumRepository.create(album); @@ -294,7 +292,7 @@ class AlbumService { Future deleteAlbum(Album album) async { try { - final userId = Store.get(StoreKey.currentUser).isarId; + final userId = Store.get(StoreKey.currentUser).id; if (album.owner.value?.isarId == userId) { await _albumApiRepository.delete(album.remoteId!); } @@ -356,15 +354,15 @@ class AlbumService { Future removeUser( Album album, - User user, + UserDto user, ) async { try { await _albumApiRepository.removeUser( album.remoteId!, - userId: user.id, + userId: user.uid, ); - album.sharedUsers.remove(user); + album.sharedUsers.remove(entity.User.fromDto(user)); await _albumRepository.removeUsers(album, [user]); final a = await _albumRepository.get(album.id); // trigger watcher @@ -388,7 +386,10 @@ class AlbumService { album.sharedUsers.addAll(updatedAlbum.remoteUsers); album.shared = true; - await _albumRepository.addUsers(album, album.sharedUsers.toList()); + await _albumRepository.addUsers( + album, + album.sharedUsers.map((u) => u.toDto()).toList(), + ); await _albumRepository.update(album); return true; diff --git a/mobile/lib/services/asset.service.dart b/mobile/lib/services/asset.service.dart index 815962efac..ff3e908ac3 100644 --- a/mobile/lib/services/asset.service.dart +++ b/mobile/lib/services/asset.service.dart @@ -5,29 +5,32 @@ import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/domain/interfaces/exif.interface.dart'; +import 'package:immich_mobile/domain/interfaces/user.interface.dart'; +import 'package:immich_mobile/domain/models/store.model.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; +import 'package:immich_mobile/domain/services/store.service.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/backup_album.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/interfaces/asset.interface.dart'; import 'package:immich_mobile/interfaces/asset_api.interface.dart'; import 'package:immich_mobile/interfaces/asset_media.interface.dart'; import 'package:immich_mobile/interfaces/backup_album.interface.dart'; import 'package:immich_mobile/interfaces/etag.interface.dart'; -import 'package:immich_mobile/interfaces/user.interface.dart'; import 'package:immich_mobile/models/backup/backup_candidate.model.dart'; import 'package:immich_mobile/providers/api.provider.dart'; import 'package:immich_mobile/providers/infrastructure/exif.provider.dart'; +import 'package:immich_mobile/providers/infrastructure/store.provider.dart'; +import 'package:immich_mobile/providers/infrastructure/user.provider.dart' + hide userServiceProvider; import 'package:immich_mobile/repositories/asset.repository.dart'; import 'package:immich_mobile/repositories/asset_api.repository.dart'; import 'package:immich_mobile/repositories/asset_media.repository.dart'; import 'package:immich_mobile/repositories/backup.repository.dart'; import 'package:immich_mobile/repositories/etag.repository.dart'; -import 'package:immich_mobile/repositories/user.repository.dart'; import 'package:immich_mobile/services/album.service.dart'; import 'package:immich_mobile/services/api.service.dart'; import 'package:immich_mobile/services/backup.service.dart'; import 'package:immich_mobile/services/sync.service.dart'; -import 'package:immich_mobile/services/user.service.dart'; import 'package:logging/logging.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; import 'package:openapi/api.dart'; @@ -42,9 +45,9 @@ final assetServiceProvider = Provider( ref.watch(backupAlbumRepositoryProvider), ref.watch(apiServiceProvider), ref.watch(syncServiceProvider), - ref.watch(userServiceProvider), ref.watch(backupServiceProvider), ref.watch(albumServiceProvider), + ref.watch(storeServiceProvider), ref.watch(assetMediaRepositoryProvider), ), ); @@ -58,9 +61,9 @@ class AssetService { final IBackupAlbumRepository _backupRepository; final ApiService _apiService; final SyncService _syncService; - final UserService _userService; final BackupService _backupService; final AlbumService _albumService; + final StoreService _storeService; final IAssetMediaRepository _assetMediaRepository; final log = Logger('AssetService'); @@ -73,9 +76,9 @@ class AssetService { this._backupRepository, this._apiService, this._syncService, - this._userService, this._backupService, this._albumService, + this._storeService, this._assetMediaRepository, ); @@ -83,15 +86,14 @@ class AssetService { /// required. Returns `true` if there were any changes. Future refreshRemoteAssets() async { final syncedUserIds = await _etagRepository.getAllIds(); - final List syncedUsers = syncedUserIds.isEmpty + final List syncedUsers = syncedUserIds.isEmpty ? [] - : await _userRepository.getByIds(syncedUserIds); + : (await _userRepository.getByUserIds(syncedUserIds)).nonNulls.toList(); final Stopwatch sw = Stopwatch()..start(); final bool changes = await _syncService.syncRemoteAssetsToDb( users: syncedUsers, getChangedAssets: _getRemoteAssetChanges, loadAssets: _getRemoteAssets, - refreshUsers: _userService.getUsersFromServer, ); debugPrint("refreshRemoteAssets full took ${sw.elapsedMilliseconds}ms"); return changes; @@ -99,10 +101,10 @@ class AssetService { /// Returns `(null, null)` if changes are invalid -> requires full sync Future<(List? toUpsert, List? toDelete)> - _getRemoteAssetChanges(List users, DateTime since) async { + _getRemoteAssetChanges(List users, DateTime since) async { final dto = AssetDeltaSyncDto( updatedAfter: since, - userIds: users.map((e) => e.id).toList(), + userIds: users.map((e) => e.uid).toList(), ); final changes = await _apiService.syncApi.getDeltaSync(dto); return changes == null || changes.needsFullSync @@ -132,7 +134,7 @@ class AssetService { } /// Returns `null` if the server state did not change, else list of assets - Future?> _getRemoteAssets(User user, DateTime until) async { + Future?> _getRemoteAssets(UserDto user, DateTime until) async { const int chunkSize = 10000; try { final List allAssets = []; @@ -143,7 +145,7 @@ class AssetService { limit: chunkSize, updatedUntil: until, lastId: lastId, - userId: user.id, + userId: user.uid, ); log.fine("Requesting $chunkSize assets from $lastId"); final List? assets = @@ -314,9 +316,9 @@ class AssetService { ); await refreshRemoteAssets(); - final owner = await _userRepository.me(); + final owner = _storeService.get(StoreKey.currentUser); final remoteAssets = await _assetRepository.getAll( - ownerId: owner.isarId, + ownerId: owner.id, state: AssetState.merged, ); @@ -519,13 +521,13 @@ class AssetService { return _assetRepository.watchAsset(id, fireImmediately: fireImmediately); } - Future> getRecentlyAddedAssets() async { - final me = await _userRepository.me(); - return _assetRepository.getRecentlyAddedAssets(me.isarId); + Future> getRecentlyAddedAssets() { + final me = _storeService.get(StoreKey.currentUser); + return _assetRepository.getRecentlyAddedAssets(me.id); } - Future> getMotionAssets() async { - final me = await _userRepository.me(); - return _assetRepository.getMotionAssets(me.isarId); + Future> getMotionAssets() { + final me = _storeService.get(StoreKey.currentUser); + return _assetRepository.getMotionAssets(me.id); } } diff --git a/mobile/lib/services/background.service.dart b/mobile/lib/services/background.service.dart index 548e4b1ad5..d69f282103 100644 --- a/mobile/lib/services/background.service.dart +++ b/mobile/lib/services/background.service.dart @@ -12,11 +12,17 @@ import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/domain/interfaces/exif.interface.dart'; +import 'package:immich_mobile/domain/interfaces/user.interface.dart'; +import 'package:immich_mobile/domain/interfaces/user_api.repository.dart'; import 'package:immich_mobile/domain/models/store.model.dart'; +import 'package:immich_mobile/domain/services/store.service.dart'; import 'package:immich_mobile/entities/backup_album.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/infrastructure/repositories/exif.repository.dart'; +import 'package:immich_mobile/infrastructure/repositories/user.repository.dart'; +import 'package:immich_mobile/infrastructure/repositories/user_api.repository.dart'; import 'package:immich_mobile/interfaces/backup_album.interface.dart'; +import 'package:immich_mobile/interfaces/partner.interface.dart'; import 'package:immich_mobile/models/backup/backup_candidate.model.dart'; import 'package:immich_mobile/models/backup/current_upload_asset.model.dart'; import 'package:immich_mobile/models/backup/error_upload_asset.model.dart'; @@ -32,10 +38,9 @@ import 'package:immich_mobile/repositories/backup.repository.dart'; import 'package:immich_mobile/repositories/etag.repository.dart'; import 'package:immich_mobile/repositories/file_media.repository.dart'; import 'package:immich_mobile/repositories/network.repository.dart'; +import 'package:immich_mobile/repositories/partner.repository.dart'; import 'package:immich_mobile/repositories/partner_api.repository.dart'; import 'package:immich_mobile/repositories/permission.repository.dart'; -import 'package:immich_mobile/repositories/user.repository.dart'; -import 'package:immich_mobile/repositories/user_api.repository.dart'; import 'package:immich_mobile/services/album.service.dart'; import 'package:immich_mobile/services/api.service.dart'; import 'package:immich_mobile/services/app_settings.service.dart'; @@ -46,13 +51,12 @@ import 'package:immich_mobile/services/hash.service.dart'; import 'package:immich_mobile/services/localization.service.dart'; import 'package:immich_mobile/services/network.service.dart'; import 'package:immich_mobile/services/sync.service.dart'; -import 'package:immich_mobile/services/user.service.dart'; import 'package:immich_mobile/utils/backup_progress.dart'; import 'package:immich_mobile/utils/bootstrap.dart'; import 'package:immich_mobile/utils/diff.dart'; import 'package:immich_mobile/utils/http_ssl_cert_override.dart'; import 'package:network_info_plus/network_info_plus.dart'; -import 'package:path_provider_ios/path_provider_ios.dart'; +import 'package:path_provider_foundation/path_provider_foundation.dart'; import 'package:photo_manager/photo_manager.dart' show PMProgressHandler; final backgroundServiceProvider = Provider( @@ -322,7 +326,7 @@ class BackgroundService { // NOTE: I'm not sure this is strictly necessary anymore, but // out of an abundance of caution, we will keep it in until someone // can say for sure - PathProviderIOS.registerWith(); + PathProviderFoundation.registerWith(); } switch (call.method) { case "backgroundProcessing": @@ -385,8 +389,8 @@ class BackgroundService { AlbumMediaRepository albumMediaRepository = AlbumMediaRepository(); FileMediaRepository fileMediaRepository = FileMediaRepository(); AssetMediaRepository assetMediaRepository = AssetMediaRepository(); - UserRepository userRepository = UserRepository(db); - UserApiRepository userApiRepository = + IUserRepository userRepository = IsarUserRepository(db); + IUserApiRepository userApiRepository = UserApiRepository(apiService.usersApi); AlbumApiRepository albumApiRepository = AlbumApiRepository(apiService.albumsApi); @@ -396,6 +400,7 @@ class BackgroundService { HashService(assetRepository, this, albumMediaRepository); EntityService entityService = EntityService(assetRepository, userRepository); + IPartnerRepository partnerRepository = PartnerRepository(db); SyncService syncSerive = SyncService( hashService, entityService, @@ -404,16 +409,14 @@ class BackgroundService { albumRepository, assetRepository, exifInfoRepository, + partnerRepository, userRepository, + StoreService.I, eTagRepository, - ); - UserService userService = UserService( partnerApiRepository, userApiRepository, - userRepository, ); AlbumService albumService = AlbumService( - userService, syncSerive, entityService, albumRepository, diff --git a/mobile/lib/services/backup_verification.service.dart b/mobile/lib/services/backup_verification.service.dart index c2e93a678a..e4d5ab4afd 100644 --- a/mobile/lib/services/backup_verification.service.dart +++ b/mobile/lib/services/backup_verification.service.dart @@ -34,7 +34,7 @@ class BackupVerificationService { /// Returns at most [limit] assets that were backed up without exif Future> findWronglyBackedUpAssets({int limit = 100}) async { - final owner = Store.get(StoreKey.currentUser).isarId; + final owner = Store.get(StoreKey.currentUser).id; final List onlyLocal = await _assetRepository.getAll( ownerId: owner, state: AssetState.local, diff --git a/mobile/lib/services/entity.service.dart b/mobile/lib/services/entity.service.dart index ddbe77f8c9..9e61366b94 100644 --- a/mobile/lib/services/entity.service.dart +++ b/mobile/lib/services/entity.service.dart @@ -1,9 +1,10 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:immich_mobile/domain/interfaces/user.interface.dart'; import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart'; import 'package:immich_mobile/interfaces/asset.interface.dart'; -import 'package:immich_mobile/interfaces/user.interface.dart'; +import 'package:immich_mobile/providers/infrastructure/user.provider.dart'; import 'package:immich_mobile/repositories/asset.repository.dart'; -import 'package:immich_mobile/repositories/user.repository.dart'; class EntityService { final IAssetRepository _assetRepository; @@ -17,7 +18,8 @@ class EntityService { final ownerId = album.ownerId; if (ownerId != null) { // replace owner with user from database - album.owner.value = await _userRepository.get(ownerId); + final user = await _userRepository.getByUserId(ownerId); + album.owner.value = user == null ? null : User.fromDto(user); } final thumbnailAssetId = album.remoteThumbnailAssetId ?? album.thumbnail.value?.remoteId; @@ -29,9 +31,9 @@ class EntityService { if (album.remoteUsers.isNotEmpty) { // replace all users with users from database final users = await _userRepository - .getByIds(album.remoteUsers.map((user) => user.id).toList()); + .getByUserIds(album.remoteUsers.map((user) => user.id).toList()); album.sharedUsers.clear(); - album.sharedUsers.addAll(users); + album.sharedUsers.addAll(users.nonNulls.map(User.fromDto)); album.shared = true; } if (album.remoteAssets.isNotEmpty) { diff --git a/mobile/lib/services/partner.service.dart b/mobile/lib/services/partner.service.dart index 6bd429b51d..cc3631a0b1 100644 --- a/mobile/lib/services/partner.service.dart +++ b/mobile/lib/services/partner.service.dart @@ -1,11 +1,11 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/domain/interfaces/user.interface.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/interfaces/partner.interface.dart'; import 'package:immich_mobile/interfaces/partner_api.interface.dart'; -import 'package:immich_mobile/interfaces/user.interface.dart'; +import 'package:immich_mobile/providers/infrastructure/user.provider.dart'; import 'package:immich_mobile/repositories/partner.repository.dart'; import 'package:immich_mobile/repositories/partner_api.repository.dart'; -import 'package:immich_mobile/repositories/user.repository.dart'; import 'package:logging/logging.dart'; final partnerServiceProvider = Provider( @@ -28,57 +28,58 @@ class PartnerService { this._partnerRepository, ); - Future> getSharedWith() async { + Future> getSharedWith() async { return _partnerRepository.getSharedWith(); } - Future> getSharedBy() async { + Future> getSharedBy() async { return _partnerRepository.getSharedBy(); } - Stream> watchSharedWith() { + Stream> watchSharedWith() { return _partnerRepository.watchSharedWith(); } - Stream> watchSharedBy() { + Stream> watchSharedBy() { return _partnerRepository.watchSharedBy(); } - Future removePartner(User partner) async { + Future removePartner(UserDto partner) async { try { - await _partnerApiRepository.delete(partner.id); - partner.isPartnerSharedBy = false; - await _userRepository.update(partner); + await _partnerApiRepository.delete(partner.uid); + await _userRepository.update(partner.copyWith(isPartnerSharedBy: false)); } catch (e) { - _log.warning("Failed to remove partner ${partner.id}", e); + _log.warning("Failed to remove partner ${partner.uid}", e); return false; } return true; } - Future addPartner(User partner) async { + Future addPartner(UserDto partner) async { try { - await _partnerApiRepository.create(partner.id); - partner.isPartnerSharedBy = true; - await _userRepository.update(partner); + await _partnerApiRepository.create(partner.uid); + await _userRepository.update(partner.copyWith(isPartnerSharedBy: true)); return true; } catch (e) { - _log.warning("Failed to add partner ${partner.id}", e); + _log.warning("Failed to add partner ${partner.uid}", e); } return false; } - Future updatePartner(User partner, {required bool inTimeline}) async { + Future updatePartner( + UserDto partner, { + required bool inTimeline, + }) async { try { final dto = await _partnerApiRepository.update( - partner.id, + partner.uid, inTimeline: inTimeline, ); - partner.inTimeline = dto.inTimeline; - await _userRepository.update(partner); + await _userRepository + .update(partner.copyWith(inTimeline: dto.inTimeline)); return true; } catch (e) { - _log.warning("Failed to update partner ${partner.id}", e); + _log.warning("Failed to update partner ${partner.uid}", e); } return false; } diff --git a/mobile/lib/services/person.service.g.dart b/mobile/lib/services/person.service.g.dart index c7352606b3..8c2d46b3bd 100644 --- a/mobile/lib/services/person.service.g.dart +++ b/mobile/lib/services/person.service.g.dart @@ -6,7 +6,7 @@ part of 'person.service.dart'; // RiverpodGenerator // ************************************************************************** -String _$personServiceHash() => r'32f28cb5a3de0553c17447e33a0efde7409a43ed'; +String _$personServiceHash() => r'10883bccc6c402205e6785cf9ee6cd7142cd0983'; /// See also [personService]. @ProviderFor(personService) diff --git a/mobile/lib/services/sync.service.dart b/mobile/lib/services/sync.service.dart index b937dde320..a598941f81 100644 --- a/mobile/lib/services/sync.service.dart +++ b/mobile/lib/services/sync.service.dart @@ -3,24 +3,32 @@ import 'dart:async'; import 'package:collection/collection.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/domain/interfaces/exif.interface.dart'; +import 'package:immich_mobile/domain/interfaces/user.interface.dart'; +import 'package:immich_mobile/domain/interfaces/user_api.repository.dart'; +import 'package:immich_mobile/domain/models/store.model.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; +import 'package:immich_mobile/domain/services/store.service.dart'; import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/etag.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/extensions/collection_extensions.dart'; import 'package:immich_mobile/interfaces/album.interface.dart'; import 'package:immich_mobile/interfaces/album_api.interface.dart'; import 'package:immich_mobile/interfaces/album_media.interface.dart'; import 'package:immich_mobile/interfaces/asset.interface.dart'; import 'package:immich_mobile/interfaces/etag.interface.dart'; -import 'package:immich_mobile/interfaces/user.interface.dart'; +import 'package:immich_mobile/interfaces/partner.interface.dart'; +import 'package:immich_mobile/interfaces/partner_api.interface.dart'; import 'package:immich_mobile/providers/infrastructure/exif.provider.dart'; +import 'package:immich_mobile/providers/infrastructure/store.provider.dart'; +import 'package:immich_mobile/providers/infrastructure/user.provider.dart'; import 'package:immich_mobile/repositories/album.repository.dart'; import 'package:immich_mobile/repositories/album_api.repository.dart'; import 'package:immich_mobile/repositories/album_media.repository.dart'; import 'package:immich_mobile/repositories/asset.repository.dart'; import 'package:immich_mobile/repositories/etag.repository.dart'; -import 'package:immich_mobile/repositories/user.repository.dart'; +import 'package:immich_mobile/repositories/partner.repository.dart'; +import 'package:immich_mobile/repositories/partner_api.repository.dart'; import 'package:immich_mobile/services/entity.service.dart'; import 'package:immich_mobile/services/hash.service.dart'; import 'package:immich_mobile/utils/async_mutex.dart'; @@ -37,8 +45,12 @@ final syncServiceProvider = Provider( ref.watch(albumRepositoryProvider), ref.watch(assetRepositoryProvider), ref.watch(exifRepositoryProvider), + ref.watch(partnerRepositoryProvider), ref.watch(userRepositoryProvider), + ref.watch(storeServiceProvider), ref.watch(etagRepositoryProvider), + ref.watch(partnerApiRepositoryProvider), + ref.watch(userApiRepositoryProvider), ), ); @@ -51,7 +63,11 @@ class SyncService { final IAssetRepository _assetRepository; final IExifInfoRepository _exifInfoRepository; final IUserRepository _userRepository; + final IPartnerRepository _partnerRepository; + final StoreService _storeService; final IETagRepository _eTagRepository; + final IPartnerApiRepository _partnerApiRepository; + final IUserApiRepository _userApiRepository; final AsyncMutex _lock = AsyncMutex(); final Logger _log = Logger('SyncService'); @@ -63,33 +79,36 @@ class SyncService { this._albumRepository, this._assetRepository, this._exifInfoRepository, + this._partnerRepository, this._userRepository, + this._storeService, this._eTagRepository, + this._partnerApiRepository, + this._userApiRepository, ); // public methods: /// Syncs users from the server to the local database /// Returns `true`if there were any changes - Future syncUsersFromServer(List users) => + Future syncUsersFromServer(List users) => _lock.run(() => _syncUsersFromServer(users)); /// Syncs remote assets owned by the logged-in user to the DB /// Returns `true` if there were any changes Future syncRemoteAssetsToDb({ - required List users, + required List users, required Future<(List? toUpsert, List? toDelete)> Function( - List users, + List users, DateTime since, ) getChangedAssets, - required FutureOr?> Function(User user, DateTime until) + required FutureOr?> Function(UserDto user, DateTime until) loadAssets, - required FutureOr?> Function() refreshUsers, }) => _lock.run( () async => await _syncRemoteAssetChanges(users, getChangedAssets) ?? - await _syncRemoteAssetsFull(refreshUsers, loadAssets), + await _syncRemoteAssetsFull(getUsersFromServer, loadAssets), ); /// Syncs remote albums to the database @@ -134,16 +153,16 @@ class SyncService { /// Syncs users from the server to the local database /// Returns `true`if there were any changes - Future _syncUsersFromServer(List users) async { - users.sortBy((u) => u.id); - final dbUsers = await _userRepository.getAll(sortBy: UserSort.id); + Future _syncUsersFromServer(List users) async { + users.sortBy((u) => u.uid); + final dbUsers = await _userRepository.getAll(sortBy: SortUserBy.id); final List toDelete = []; - final List toUpsert = []; + final List toUpsert = []; final changes = diffSortedListsSync( users, dbUsers, - compare: (User a, User b) => a.id.compareTo(b.id), - both: (User a, User b) { + compare: (UserDto a, UserDto b) => a.uid.compareTo(b.uid), + both: (UserDto a, UserDto b) { if (!a.updatedAt.isAtSameMomentAs(b.updatedAt) || a.isPartnerSharedBy != b.isPartnerSharedBy || a.isPartnerSharedWith != b.isPartnerSharedWith || @@ -153,13 +172,13 @@ class SyncService { } return false; }, - onlyFirst: (User a) => toUpsert.add(a), - onlySecond: (User b) => toDelete.add(b.isarId), + onlyFirst: (UserDto a) => toUpsert.add(a), + onlySecond: (UserDto b) => toDelete.add(b.id), ); if (changes) { await _userRepository.transaction(() async { - await _userRepository.deleteById(toDelete); - await _userRepository.upsertAll(toUpsert); + await _userRepository.delete(toDelete); + await _userRepository.updateAll(toUpsert); }); } return changes; @@ -185,15 +204,15 @@ class SyncService { /// Efficiently syncs assets via changes. Returns `null` when a full sync is required. Future _syncRemoteAssetChanges( - List users, + List users, Future<(List? toUpsert, List? toDelete)> Function( - List users, + List users, DateTime since, ) getChangedAssets, ) async { - final currentUser = await _userRepository.me(); + final currentUser = _storeService.get(StoreKey.currentUser); final DateTime? since = - (await _eTagRepository.get(currentUser.isarId))?.time?.toUtc(); + (await _eTagRepository.get(currentUser.id))?.time?.toUtc(); if (since == null) return null; final DateTime now = DateTime.now(); final (toUpsert, toDelete) = await getChangedAssets(users, since); @@ -240,10 +259,16 @@ class SyncService { }); } + Future> _getAllAccessibleUsers() async { + final sharedWith = (await _partnerRepository.getSharedWith()).toSet(); + sharedWith.add(_storeService.get(StoreKey.currentUser)); + return sharedWith.toList(); + } + /// Syncs assets by loading and comparing all assets from the server. Future _syncRemoteAssetsFull( - FutureOr?> Function() refreshUsers, - FutureOr?> Function(User user, DateTime until) loadAssets, + FutureOr?> Function() refreshUsers, + FutureOr?> Function(UserDto user, DateTime until) loadAssets, ) async { final serverUsers = await refreshUsers(); if (serverUsers == null) { @@ -251,17 +276,17 @@ class SyncService { return false; } await _syncUsersFromServer(serverUsers); - final List users = await _userRepository.getAllAccessible(); + final List users = await _getAllAccessibleUsers(); bool changes = false; - for (User u in users) { + for (UserDto u in users) { changes |= await _syncRemoteAssetsForUser(u, loadAssets); } return changes; } Future _syncRemoteAssetsForUser( - User user, - FutureOr?> Function(User user, DateTime until) loadAssets, + UserDto user, + FutureOr?> Function(UserDto user, DateTime until) loadAssets, ) async { final DateTime now = DateTime.now().toUtc(); final List? remote = await loadAssets(user, now); @@ -269,7 +294,7 @@ class SyncService { return false; } final List inDb = await _assetRepository.getAll( - ownerId: user.isarId, + ownerId: user.id, sortBy: AssetSort.checksum, ); assert(inDb.isSorted(Asset.compareByChecksum), "inDb not sorted!"); @@ -295,13 +320,13 @@ class SyncService { return true; } - Future _updateUserAssetsETag(List users, DateTime time) { - final etags = users.map((u) => ETag(id: u.id, time: time)).toList(); + Future _updateUserAssetsETag(List users, DateTime time) { + final etags = users.map((u) => ETag(id: u.uid, time: time)).toList(); return _eTagRepository.upsertAll(etags); } - Future _clearUserAssetsETag(List users) { - final ids = users.map((u) => u.id).toList(); + Future _clearUserAssetsETag(List users) { + final ids = users.map((u) => u.uid).toList(); return _eTagRepository.deleteByIds(ids); } @@ -373,26 +398,27 @@ class SyncService { ); // update shared users - final List sharedUsers = album.sharedUsers.toList(growable: false); + final List sharedUsers = + album.sharedUsers.map((u) => u.toDto()).toList(growable: false); sharedUsers.sort((a, b) => a.id.compareTo(b.id)); - final List users = dto.remoteUsers.toList() + final List users = dto.remoteUsers.map((u) => u.toDto()).toList() ..sort((a, b) => a.id.compareTo(b.id)); final List userIdsToAdd = []; - final List usersToUnlink = []; + final List usersToUnlink = []; diffSortedListsSync( users, sharedUsers, - compare: (User a, User b) => a.id.compareTo(b.id), + compare: (UserDto a, UserDto b) => a.id.compareTo(b.id), both: (a, b) => false, - onlyFirst: (User a) => userIdsToAdd.add(a.id), - onlySecond: (User a) => usersToUnlink.add(a), + onlyFirst: (UserDto a) => userIdsToAdd.add(a.uid), + onlySecond: (UserDto a) => usersToUnlink.add(a), ); // for shared album: put missing album assets into local DB final (existingInDb, updated) = await _linkWithExistingFromDb(toAdd); await upsertAssetsWithExif(updated); final assetsToLink = existingInDb + updated; - final usersToLink = await _userRepository.getByIds(userIdsToAdd); + final usersToLink = await _userRepository.getByUserIds(userIdsToAdd); album.name = dto.name; album.shared = dto.shared; @@ -416,7 +442,7 @@ class SyncService { try { await _assetRepository.transaction(() async { await _assetRepository.updateAll(toUpdate); - await _albumRepository.addUsers(album, usersToLink); + await _albumRepository.addUsers(album, usersToLink.nonNulls.toList()); await _albumRepository.removeUsers(album, usersToUnlink); await _albumRepository.addAssets(album, assetsToLink); await _albumRepository.removeAssets(album, toUnlink); @@ -429,7 +455,7 @@ class SyncService { } if (album.shared || dto.shared) { - final userId = (await _userRepository.me()).isarId; + final userId = (_storeService.get(StoreKey.currentUser)).id; final foreign = await _assetRepository.getByAlbum(album, notOwnedBy: [userId]); existing.addAll(foreign); @@ -482,8 +508,7 @@ class SyncService { ); } else if (album.shared) { // delete assets in DB unless they belong to this user or are part of some other shared album or belong to a partner - final userIds = - (await _userRepository.getAllAccessible()).map((user) => user.isarId); + final userIds = (await _getAllAccessibleUsers()).map((user) => user.id); final orphanedAssets = await _assetRepository.getByAlbum(album, notOwnedBy: userIds); deleteCandidates.addAll(orphanedAssets); @@ -566,7 +591,7 @@ class SyncService { // general case, e.g. some assets have been deleted or there are excluded albums on iOS final inDb = await _assetRepository.getByAlbum( dbAlbum, - ownerId: (await _userRepository.me()).isarId, + ownerId: (_storeService.get(StoreKey.currentUser)).id, sortBy: AssetSort.checksum, ); @@ -836,6 +861,61 @@ class SyncService { return false; } } + + Future?> getUsersFromServer() async { + List? users; + try { + users = await _userApiRepository.getAll(); + } catch (e) { + _log.warning("Failed to fetch users", e); + users = null; + } + final List sharedBy = + await _partnerApiRepository.getAll(Direction.sharedByMe); + final List sharedWith = + await _partnerApiRepository.getAll(Direction.sharedWithMe); + + if (users == null) { + _log.warning("Failed to refresh users"); + return null; + } + + users.sortBy((u) => u.uid); + sharedBy.sortBy((u) => u.uid); + sharedWith.sortBy((u) => u.uid); + + final updatedSharedBy = []; + + diffSortedListsSync( + users, + sharedBy, + compare: (UserDto a, UserDto b) => a.uid.compareTo(b.uid), + both: (UserDto a, UserDto b) { + updatedSharedBy.add(a.copyWith(isPartnerSharedBy: true)); + return true; + }, + onlyFirst: (UserDto a) => updatedSharedBy.add(a), + onlySecond: (UserDto b) => updatedSharedBy.add(b), + ); + + final updatedSharedWith = []; + + diffSortedListsSync( + updatedSharedBy, + sharedWith, + compare: (UserDto a, UserDto b) => a.uid.compareTo(b.uid), + both: (UserDto a, UserDto b) { + updatedSharedWith.add( + a.copyWith(inTimeline: b.inTimeline, isPartnerSharedWith: true), + ); + return true; + }, + onlyFirst: (UserDto a) => updatedSharedWith.add(a), + onlySecond: (UserDto b) => updatedSharedWith.add(b), + ); + + return updatedSharedWith; + } } /// Returns a triple(toAdd, toUpdate, toRemove) diff --git a/mobile/lib/services/timeline.service.dart b/mobile/lib/services/timeline.service.dart index db85230662..03042e266b 100644 --- a/mobile/lib/services/timeline.service.dart +++ b/mobile/lib/services/timeline.service.dart @@ -1,41 +1,42 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:immich_mobile/domain/models/store.model.dart'; +import 'package:immich_mobile/domain/services/store.service.dart'; import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/interfaces/timeline.interface.dart'; -import 'package:immich_mobile/interfaces/user.interface.dart'; import 'package:immich_mobile/providers/app_settings.provider.dart'; +import 'package:immich_mobile/providers/infrastructure/store.provider.dart'; import 'package:immich_mobile/repositories/timeline.repository.dart'; -import 'package:immich_mobile/repositories/user.repository.dart'; import 'package:immich_mobile/services/app_settings.service.dart'; import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart'; final timelineServiceProvider = Provider((ref) { return TimelineService( ref.watch(timelineRepositoryProvider), - ref.watch(userRepositoryProvider), ref.watch(appSettingsServiceProvider), + ref.watch(storeServiceProvider), ); }); class TimelineService { final ITimelineRepository _timelineRepository; - final IUserRepository _userRepository; final AppSettingsService _appSettingsService; + final StoreService _storeService; const TimelineService( this._timelineRepository, - this._userRepository, this._appSettingsService, + this._storeService, ); Future> getTimelineUserIds() async { - final me = await _userRepository.me(); - return _timelineRepository.getTimelineUserIds(me.isarId); + final me = _storeService.get(StoreKey.currentUser); + return _timelineRepository.getTimelineUserIds(me.id); } Stream> watchTimelineUserIds() async* { - final me = await _userRepository.me(); - yield* _timelineRepository.watchTimelineUsers(me.isarId); + final me = _storeService.get(StoreKey.currentUser); + yield* _timelineRepository.watchTimelineUsers(me.id); } Stream watchHomeTimeline(int userId) { @@ -50,15 +51,15 @@ class TimelineService { } Stream watchArchiveTimeline() async* { - final user = await _userRepository.me(); + final user = _storeService.get(StoreKey.currentUser); - yield* _timelineRepository.watchArchiveTimeline(user.isarId); + yield* _timelineRepository.watchArchiveTimeline(user.id); } Stream watchFavoriteTimeline() async* { - final user = await _userRepository.me(); + final user = _storeService.get(StoreKey.currentUser); - yield* _timelineRepository.watchFavoriteTimeline(user.isarId); + yield* _timelineRepository.watchFavoriteTimeline(user.id); } Stream watchAlbumTimeline(Album album) async* { @@ -69,9 +70,9 @@ class TimelineService { } Stream watchTrashTimeline() async* { - final user = await _userRepository.me(); + final user = _storeService.get(StoreKey.currentUser); - yield* _timelineRepository.watchTrashTimeline(user.isarId); + yield* _timelineRepository.watchTrashTimeline(user.id); } Stream watchAllVideosTimeline() { @@ -96,9 +97,9 @@ class TimelineService { } Stream watchAssetSelectionTimeline() async* { - final user = await _userRepository.me(); + final user = _storeService.get(StoreKey.currentUser); - yield* _timelineRepository.watchAssetSelectionTimeline(user.isarId); + yield* _timelineRepository.watchAssetSelectionTimeline(user.id); } GroupAssetsBy _getGroupByOption() { diff --git a/mobile/lib/services/trash.service.dart b/mobile/lib/services/trash.service.dart index 8d6cdd8bab..338f063fd3 100644 --- a/mobile/lib/services/trash.service.dart +++ b/mobile/lib/services/trash.service.dart @@ -1,12 +1,11 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:immich_mobile/domain/models/store.model.dart'; +import 'package:immich_mobile/domain/services/store.service.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/interfaces/asset.interface.dart'; -import 'package:immich_mobile/interfaces/user.interface.dart'; - import 'package:immich_mobile/providers/api.provider.dart'; +import 'package:immich_mobile/providers/infrastructure/store.provider.dart'; import 'package:immich_mobile/repositories/asset.repository.dart'; -import 'package:immich_mobile/repositories/user.repository.dart'; - import 'package:immich_mobile/services/api.service.dart'; import 'package:openapi/api.dart'; @@ -14,16 +13,20 @@ final trashServiceProvider = Provider((ref) { return TrashService( ref.watch(apiServiceProvider), ref.watch(assetRepositoryProvider), - ref.watch(userRepositoryProvider), + ref.watch(storeServiceProvider), ); }); class TrashService { final ApiService _apiService; final IAssetRepository _assetRepository; - final IUserRepository _userRepository; + final StoreService _storeService; - TrashService(this._apiService, this._assetRepository, this._userRepository); + TrashService( + this._apiService, + this._assetRepository, + this._storeService, + ); Future restoreAssets(Iterable assetList) async { final remoteAssets = assetList.where((a) => a.isRemote); @@ -40,11 +43,11 @@ class TrashService { } Future emptyTrash() async { - final user = await _userRepository.me(); + final user = _storeService.get(StoreKey.currentUser); await _apiService.trashApi.emptyTrash(); - final trashedAssets = await _assetRepository.getTrashAssets(user.isarId); + final trashedAssets = await _assetRepository.getTrashAssets(user.id); final ids = trashedAssets.map((e) => e.remoteId!).toList(); await _assetRepository.transaction(() async { @@ -71,11 +74,11 @@ class TrashService { } Future restoreTrash() async { - final user = await _userRepository.me(); + final user = _storeService.get(StoreKey.currentUser); await _apiService.trashApi.restoreTrash(); - final trashedAssets = await _assetRepository.getTrashAssets(user.isarId); + final trashedAssets = await _assetRepository.getTrashAssets(user.id); final updatedAssets = trashedAssets.map((asset) { asset.isTrashed = false; return asset; diff --git a/mobile/lib/services/user.service.dart b/mobile/lib/services/user.service.dart deleted file mode 100644 index 921202ec59..0000000000 --- a/mobile/lib/services/user.service.dart +++ /dev/null @@ -1,100 +0,0 @@ -import 'package:collection/collection.dart'; -import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:image_picker/image_picker.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; -import 'package:immich_mobile/interfaces/partner_api.interface.dart'; -import 'package:immich_mobile/interfaces/user.interface.dart'; -import 'package:immich_mobile/interfaces/user_api.interface.dart'; -import 'package:immich_mobile/repositories/partner_api.repository.dart'; -import 'package:immich_mobile/repositories/user.repository.dart'; -import 'package:immich_mobile/repositories/user_api.repository.dart'; -import 'package:immich_mobile/utils/diff.dart'; -import 'package:logging/logging.dart'; - -final userServiceProvider = Provider( - (ref) => UserService( - ref.watch(partnerApiRepositoryProvider), - ref.watch(userApiRepositoryProvider), - ref.watch(userRepositoryProvider), - ), -); - -class UserService { - final IPartnerApiRepository _partnerApiRepository; - final IUserApiRepository _userApiRepository; - final IUserRepository _userRepository; - final Logger _log = Logger("UserService"); - - UserService( - this._partnerApiRepository, - this._userApiRepository, - this._userRepository, - ); - - Future> getUsers({bool self = false}) { - return _userRepository.getAll(self: self); - } - - Future<({String profileImagePath})?> uploadProfileImage(XFile image) async { - try { - return await _userApiRepository.createProfileImage( - name: image.name, - data: await image.readAsBytes(), - ); - } catch (e) { - _log.warning("Failed to upload profile image", e); - return null; - } - } - - Future?> getUsersFromServer() async { - List? users; - try { - users = await _userApiRepository.getAll(); - } catch (e) { - _log.warning("Failed to fetch users", e); - users = null; - } - final List sharedBy = - await _partnerApiRepository.getAll(Direction.sharedByMe); - final List sharedWith = - await _partnerApiRepository.getAll(Direction.sharedWithMe); - - if (users == null) { - _log.warning("Failed to refresh users"); - return null; - } - - users.sortBy((u) => u.id); - sharedBy.sortBy((u) => u.id); - sharedWith.sortBy((u) => u.id); - - diffSortedListsSync( - users, - sharedBy, - compare: (User a, User b) => a.id.compareTo(b.id), - both: (User a, User b) => a.isPartnerSharedBy = true, - onlyFirst: (_) {}, - onlySecond: (_) {}, - ); - - diffSortedListsSync( - users, - sharedWith, - compare: (User a, User b) => a.id.compareTo(b.id), - both: (User a, User b) { - a.isPartnerSharedWith = true; - a.inTimeline = b.inTimeline; - return true; - }, - onlyFirst: (_) {}, - onlySecond: (_) {}, - ); - - return users; - } - - Future clearTable() { - return _userRepository.clearTable(); - } -} diff --git a/mobile/lib/theme/theme_data.dart b/mobile/lib/theme/theme_data.dart index de96e12c5d..33dc5dff54 100644 --- a/mobile/lib/theme/theme_data.dart +++ b/mobile/lib/theme/theme_data.dart @@ -24,9 +24,8 @@ ThemeData getThemeData({ hintColor: colorScheme.onSurfaceSecondary, focusColor: colorScheme.primary, scaffoldBackgroundColor: colorScheme.surface, - splashColor: colorScheme.primary.withOpacity(0.1), - highlightColor: colorScheme.primary.withOpacity(0.1), - dialogBackgroundColor: colorScheme.surfaceContainer, + splashColor: colorScheme.primary.withValues(alpha: 0.1), + highlightColor: colorScheme.primary.withValues(alpha: 0.1), bottomSheetTheme: BottomSheetThemeData( backgroundColor: colorScheme.surfaceContainer, ), @@ -163,6 +162,7 @@ ThemeData getThemeData({ ), ), ), + dialogTheme: DialogThemeData(backgroundColor: colorScheme.surfaceContainer), ); } diff --git a/mobile/lib/utils/bootstrap.dart b/mobile/lib/utils/bootstrap.dart index db019798a3..21231becf6 100644 --- a/mobile/lib/utils/bootstrap.dart +++ b/mobile/lib/utils/bootstrap.dart @@ -10,10 +10,10 @@ import 'package:immich_mobile/entities/backup_album.entity.dart'; import 'package:immich_mobile/entities/duplicated_asset.entity.dart'; import 'package:immich_mobile/entities/etag.entity.dart'; import 'package:immich_mobile/entities/ios_device_asset.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'; import 'package:immich_mobile/infrastructure/entities/log.entity.dart'; import 'package:immich_mobile/infrastructure/entities/store.entity.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart'; import 'package:immich_mobile/infrastructure/repositories/log.repository.dart'; import 'package:immich_mobile/infrastructure/repositories/store.repository.dart'; import 'package:isar/isar.dart'; diff --git a/mobile/lib/utils/migration.dart b/mobile/lib/utils/migration.dart index 990fc082d5..d2f0a2ac9d 100644 --- a/mobile/lib/utils/migration.dart +++ b/mobile/lib/utils/migration.dart @@ -5,8 +5,8 @@ import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/etag.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart'; import 'package:isar/isar.dart'; const int targetVersion = 8; diff --git a/mobile/lib/utils/provider_utils.dart b/mobile/lib/utils/provider_utils.dart index 3eac55089d..bf18d24213 100644 --- a/mobile/lib/utils/provider_utils.dart +++ b/mobile/lib/utils/provider_utils.dart @@ -1,10 +1,11 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:immich_mobile/providers/infrastructure/user.provider.dart'; import 'package:immich_mobile/repositories/activity_api.repository.dart'; import 'package:immich_mobile/repositories/album_api.repository.dart'; import 'package:immich_mobile/repositories/asset_api.repository.dart'; import 'package:immich_mobile/repositories/partner_api.repository.dart'; import 'package:immich_mobile/repositories/person_api.repository.dart'; -import 'package:immich_mobile/repositories/user_api.repository.dart'; +import 'package:immich_mobile/repositories/timeline.repository.dart'; void invalidateAllApiRepositoryProviders(WidgetRef ref) { ref.invalidate(userApiRepositoryProvider); @@ -13,4 +14,5 @@ void invalidateAllApiRepositoryProviders(WidgetRef ref) { ref.invalidate(albumApiRepositoryProvider); ref.invalidate(personApiRepositoryProvider); ref.invalidate(assetApiRepositoryProvider); + ref.invalidate(timelineRepositoryProvider); } diff --git a/mobile/lib/widgets/activities/activity_tile.dart b/mobile/lib/widgets/activities/activity_tile.dart index 1c89a39b46..2dd16b73cb 100644 --- a/mobile/lib/widgets/activities/activity_tile.dart +++ b/mobile/lib/widgets/activities/activity_tile.dart @@ -63,7 +63,7 @@ class _ActivityTitle extends StatelessWidget { Widget build(BuildContext context) { final textColor = context.isDarkTheme ? Colors.white : Colors.black; final textStyle = context.textTheme.bodyMedium - ?.copyWith(color: textColor.withOpacity(0.6)); + ?.copyWith(color: textColor.withValues(alpha: 0.6)); return Row( mainAxisAlignment: diff --git a/mobile/lib/widgets/album/album_thumbnail_card.dart b/mobile/lib/widgets/album/album_thumbnail_card.dart index ac62ecee03..ec984d1017 100644 --- a/mobile/lib/widgets/album/album_thumbnail_card.dart +++ b/mobile/lib/widgets/album/album_thumbnail_card.dart @@ -58,7 +58,7 @@ class AlbumThumbnailCard extends StatelessWidget { // Add the owner name to the subtitle String? owner; if (showOwner) { - if (album.ownerId == Store.get(StoreKey.currentUser).id) { + if (album.ownerId == Store.get(StoreKey.currentUser).uid) { owner = 'album_thumbnail_owned'.tr(); } else if (album.ownerName != null) { owner = 'album_thumbnail_shared_by'.tr(args: [album.ownerName!]); diff --git a/mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart b/mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart index d870c5abe2..941a2a7ac6 100644 --- a/mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart +++ b/mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart @@ -542,7 +542,24 @@ class ImmichAssetGridViewState extends ConsumerState { Widget build(BuildContext context) { return PopScope( canPop: !(widget.selectionActive && _selectedAssets.isNotEmpty), - onPopInvokedWithResult: (didPop, _) => !didPop ? _deselectAll() : null, + onPopInvokedWithResult: (didPop, _) { + if (didPop) { + return; + } else { + if (widget.preselectedAssets == null) { + Navigator.of(context).canPop() ? Navigator.of(context).pop() : null; + } + if (_selectedAssets.length != widget.preselectedAssets!.length && + !widget.preselectedAssets!.containsAll(_selectedAssets)) { + { + _deselectAll(); + return; + } + } else { + Navigator.of(context).canPop() ? Navigator.of(context).pop() : null; + } + } + }, child: Stack( children: [ AssetDragRegion( diff --git a/mobile/lib/widgets/asset_grid/thumbnail_image.dart b/mobile/lib/widgets/asset_grid/thumbnail_image.dart index 81932e2b94..d25b7a3e90 100644 --- a/mobile/lib/widgets/asset_grid/thumbnail_image.dart +++ b/mobile/lib/widgets/asset_grid/thumbnail_image.dart @@ -202,12 +202,12 @@ class ThumbnailImage extends ConsumerWidget { bottom: 5, child: Icon( storageIcon(asset), - color: Colors.white.withOpacity(.8), + color: Colors.white.withValues(alpha: .8), size: 16, shadows: [ Shadow( blurRadius: 5.0, - color: Colors.black.withOpacity(0.6), + color: Colors.black.withValues(alpha: 0.6), offset: const Offset(0.0, 0.0), ), ], diff --git a/mobile/lib/widgets/asset_viewer/bottom_gallery_bar.dart b/mobile/lib/widgets/asset_viewer/bottom_gallery_bar.dart index 256141dc7d..1b225f106f 100644 --- a/mobile/lib/widgets/asset_viewer/bottom_gallery_bar.dart +++ b/mobile/lib/widgets/asset_viewer/bottom_gallery_bar.dart @@ -5,25 +5,25 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; +import 'package:immich_mobile/pages/editing/edit.page.dart'; import 'package:immich_mobile/providers/album/album.provider.dart'; import 'package:immich_mobile/providers/album/current_album.provider.dart'; +import 'package:immich_mobile/providers/asset.provider.dart'; import 'package:immich_mobile/providers/asset_viewer/asset_stack.provider.dart'; import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart'; import 'package:immich_mobile/providers/asset_viewer/download.provider.dart'; import 'package:immich_mobile/providers/asset_viewer/show_controls.provider.dart'; -import 'package:immich_mobile/services/stack.service.dart'; -import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart'; -import 'package:immich_mobile/widgets/asset_viewer/video_controls.dart'; -import 'package:immich_mobile/widgets/asset_grid/delete_dialog.dart'; -import 'package:immich_mobile/routing/router.dart'; -import 'package:immich_mobile/widgets/common/immich_image.dart'; -import 'package:immich_mobile/entities/asset.entity.dart'; -import 'package:immich_mobile/providers/asset.provider.dart'; import 'package:immich_mobile/providers/server_info.provider.dart'; import 'package:immich_mobile/providers/user.provider.dart'; +import 'package:immich_mobile/routing/router.dart'; +import 'package:immich_mobile/services/stack.service.dart'; +import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart'; +import 'package:immich_mobile/widgets/asset_grid/delete_dialog.dart'; +import 'package:immich_mobile/widgets/asset_viewer/video_controls.dart'; +import 'package:immich_mobile/widgets/common/immich_image.dart'; import 'package:immich_mobile/widgets/common/immich_toast.dart'; -import 'package:immich_mobile/pages/editing/edit.page.dart'; class BottomGalleryBar extends ConsumerWidget { final ValueNotifier assetIndex; @@ -49,7 +49,7 @@ class BottomGalleryBar extends ConsumerWidget { if (asset == null) { return const SizedBox(); } - final isOwner = asset.ownerId == ref.watch(currentUserProvider)?.isarId; + final isOwner = asset.ownerId == ref.watch(currentUserProvider)?.id; final showControls = ref.watch(showControlsProvider); final stackId = asset.stackId; diff --git a/mobile/lib/widgets/asset_viewer/description_input.dart b/mobile/lib/widgets/asset_viewer/description_input.dart index 2d9d71ac9e..844e4744b3 100644 --- a/mobile/lib/widgets/asset_viewer/description_input.dart +++ b/mobile/lib/widgets/asset_viewer/description_input.dart @@ -81,7 +81,7 @@ class DescriptionInput extends HookConsumerWidget { } return TextField( - enabled: owner?.isarId == asset.ownerId, + enabled: owner?.id == asset.ownerId, focusNode: focusNode, onTap: () => isFocus.value = true, onChanged: (value) { diff --git a/mobile/lib/widgets/asset_viewer/gallery_app_bar.dart b/mobile/lib/widgets/asset_viewer/gallery_app_bar.dart index 18dd5058e3..dcef6c79d4 100644 --- a/mobile/lib/widgets/asset_viewer/gallery_app_bar.dart +++ b/mobile/lib/widgets/asset_viewer/gallery_app_bar.dart @@ -3,22 +3,22 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/providers/album/current_album.provider.dart'; -import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart'; -import 'package:immich_mobile/providers/asset_viewer/scroll_to_date_notifier.provider.dart'; -import 'package:immich_mobile/providers/tab.provider.dart'; -import 'package:immich_mobile/widgets/album/add_to_album_bottom_sheet.dart'; -import 'package:immich_mobile/providers/asset_viewer/download.provider.dart'; -import 'package:immich_mobile/providers/asset_viewer/show_controls.provider.dart'; -import 'package:immich_mobile/widgets/asset_viewer/top_control_app_bar.dart'; -import 'package:immich_mobile/providers/backup/manual_upload.provider.dart'; -import 'package:immich_mobile/providers/trash.provider.dart'; -import 'package:immich_mobile/widgets/asset_grid/upload_dialog.dart'; -import 'package:immich_mobile/providers/partner.provider.dart'; -import 'package:immich_mobile/routing/router.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; +import 'package:immich_mobile/providers/album/current_album.provider.dart'; import 'package:immich_mobile/providers/asset.provider.dart'; +import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart'; +import 'package:immich_mobile/providers/asset_viewer/download.provider.dart'; +import 'package:immich_mobile/providers/asset_viewer/scroll_to_date_notifier.provider.dart'; +import 'package:immich_mobile/providers/asset_viewer/show_controls.provider.dart'; +import 'package:immich_mobile/providers/backup/manual_upload.provider.dart'; +import 'package:immich_mobile/providers/partner.provider.dart'; +import 'package:immich_mobile/providers/tab.provider.dart'; +import 'package:immich_mobile/providers/trash.provider.dart'; import 'package:immich_mobile/providers/user.provider.dart'; +import 'package:immich_mobile/routing/router.dart'; +import 'package:immich_mobile/widgets/album/add_to_album_bottom_sheet.dart'; +import 'package:immich_mobile/widgets/asset_grid/upload_dialog.dart'; +import 'package:immich_mobile/widgets/asset_viewer/top_control_app_bar.dart'; import 'package:immich_mobile/widgets/common/immich_toast.dart'; class GalleryAppBar extends ConsumerWidget { @@ -33,12 +33,12 @@ class GalleryAppBar extends ConsumerWidget { return const SizedBox(); } final album = ref.watch(currentAlbumProvider); - final isOwner = asset.ownerId == ref.watch(currentUserProvider)?.isarId; + final isOwner = asset.ownerId == ref.watch(currentUserProvider)?.id; final showControls = ref.watch(showControlsProvider); final isPartner = ref .watch(partnerSharedWithProvider) - .map((e) => e.isarId) + .map((e) => e.id) .contains(asset.ownerId); toggleFavorite(Asset asset) => @@ -113,7 +113,7 @@ class GalleryAppBar extends ConsumerWidget { duration: const Duration(milliseconds: 100), opacity: showControls ? 1.0 : 0.0, child: Container( - color: Colors.black.withOpacity(0.4), + color: Colors.black.withValues(alpha: 0.4), child: TopControlAppBar( isOwner: isOwner, isPartner: isPartner, diff --git a/mobile/lib/widgets/common/app_bar_dialog/app_bar_profile_info.dart b/mobile/lib/widgets/common/app_bar_dialog/app_bar_profile_info.dart index d51e122954..4d4376b71d 100644 --- a/mobile/lib/widgets/common/app_bar_dialog/app_bar_profile_info.dart +++ b/mobile/lib/widgets/common/app_bar_dialog/app_bar_profile_info.dart @@ -67,8 +67,9 @@ class AppBarProfileInfoBox extends HookConsumerWidget { profileImagePath, ); if (user != null) { - user.profileImagePath = profileImagePath; - await Store.put(StoreKey.currentUser, user); + final updatedUser = + user.copyWith(profileImagePath: profileImagePath); + await Store.put(StoreKey.currentUser, updatedUser); ref.read(currentUserProvider.notifier).refresh(); } } diff --git a/mobile/lib/widgets/common/app_bar_dialog/app_bar_server_info.dart b/mobile/lib/widgets/common/app_bar_dialog/app_bar_server_info.dart index 8cab0bd72f..9c6f4a62fa 100644 --- a/mobile/lib/widgets/common/app_bar_dialog/app_bar_server_info.dart +++ b/mobile/lib/widgets/common/app_bar_dialog/app_bar_server_info.dart @@ -170,7 +170,7 @@ class AppBarServerInfo extends HookConsumerWidget { child: Tooltip( verticalOffset: 0, decoration: BoxDecoration( - color: context.primaryColor.withOpacity(0.9), + color: context.primaryColor.withValues(alpha: 0.9), borderRadius: BorderRadius.circular(10), ), textStyle: TextStyle( diff --git a/mobile/lib/widgets/common/dropdown_search_menu.dart b/mobile/lib/widgets/common/dropdown_search_menu.dart index 2fd5539b01..5b73d649f8 100644 --- a/mobile/lib/widgets/common/dropdown_search_menu.dart +++ b/mobile/lib/widgets/common/dropdown_search_menu.dart @@ -146,7 +146,7 @@ class DropdownSearchMenu extends HookWidget { ? Theme.of(context) .colorScheme .onSurface - .withOpacity(0.12) + .withValues(alpha: 0.12) : null, padding: const EdgeInsets.all(16.0), child: Text( diff --git a/mobile/lib/widgets/common/immich_app_bar.dart b/mobile/lib/widgets/common/immich_app_bar.dart index 8f2144f272..60cf0708d8 100644 --- a/mobile/lib/widgets/common/immich_app_bar.dart +++ b/mobile/lib/widgets/common/immich_app_bar.dart @@ -125,7 +125,7 @@ class ImmichAppBar extends ConsumerWidget implements PreferredSizeWidget { decoration: BoxDecoration( color: badgeBackground, border: Border.all( - color: context.colorScheme.outline.withOpacity(.3), + color: context.colorScheme.outline.withValues(alpha: .3), ), borderRadius: BorderRadius.circular(widgetSize / 2), ), diff --git a/mobile/lib/widgets/common/immich_toast.dart b/mobile/lib/widgets/common/immich_toast.dart index b0f1306aba..7f3207032b 100644 --- a/mobile/lib/widgets/common/immich_toast.dart +++ b/mobile/lib/widgets/common/immich_toast.dart @@ -43,7 +43,7 @@ class ImmichToast { borderRadius: BorderRadius.circular(5.0), color: context.colorScheme.surfaceContainer, border: Border.all( - color: context.colorScheme.outline.withOpacity(.5), + color: context.colorScheme.outline.withValues(alpha: .5), width: 1, ), ), diff --git a/mobile/lib/widgets/common/scaffold_error_body.dart b/mobile/lib/widgets/common/scaffold_error_body.dart index bca2934c23..5011d229e7 100644 --- a/mobile/lib/widgets/common/scaffold_error_body.dart +++ b/mobile/lib/widgets/common/scaffold_error_body.dart @@ -27,7 +27,8 @@ class ScaffoldErrorBody extends StatelessWidget { child: Icon( Icons.error_outline, size: 100, - color: context.themeData.iconTheme.color?.withOpacity(0.5), + color: + context.themeData.iconTheme.color?.withValues(alpha: 0.5), ), ), ), diff --git a/mobile/lib/widgets/common/user_avatar.dart b/mobile/lib/widgets/common/user_avatar.dart index 62491210c9..753a1f5d37 100644 --- a/mobile/lib/widgets/common/user_avatar.dart +++ b/mobile/lib/widgets/common/user_avatar.dart @@ -1,14 +1,14 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:immich_mobile/domain/models/store.model.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/entities/store.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/services/api.service.dart'; -Widget userAvatar(BuildContext context, User u, {double? radius}) { +Widget userAvatar(BuildContext context, UserDto u, {double? radius}) { final url = - "${Store.get(StoreKey.serverEndpoint)}/users/${u.id}/profile-image"; + "${Store.get(StoreKey.serverEndpoint)}/users/${u.uid}/profile-image"; final nameFirstLetter = u.name.isNotEmpty ? u.name[0] : ""; return CircleAvatar( radius: radius, diff --git a/mobile/lib/widgets/common/user_circle_avatar.dart b/mobile/lib/widgets/common/user_circle_avatar.dart index 2b7eadf04b..4bc7bfa0f4 100644 --- a/mobile/lib/widgets/common/user_circle_avatar.dart +++ b/mobile/lib/widgets/common/user_circle_avatar.dart @@ -4,15 +4,15 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/domain/models/store.model.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/entities/store.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/services/api.service.dart'; import 'package:immich_mobile/widgets/common/transparent_image.dart'; // ignore: must_be_immutable class UserCircleAvatar extends ConsumerWidget { - final User user; + final UserDto user; double radius; double size; @@ -27,13 +27,13 @@ class UserCircleAvatar extends ConsumerWidget { Widget build(BuildContext context, WidgetRef ref) { bool isDarkTheme = context.themeData.brightness == Brightness.dark; final profileImageUrl = - '${Store.get(StoreKey.serverEndpoint)}/users/${user.id}/profile-image?d=${Random().nextInt(1024)}'; + '${Store.get(StoreKey.serverEndpoint)}/users/${user.uid}/profile-image?d=${Random().nextInt(1024)}'; final textIcon = DefaultTextStyle( style: TextStyle( fontWeight: FontWeight.bold, fontSize: 12, - color: isDarkTheme && user.avatarColor == AvatarColorEnum.primary + color: isDarkTheme && user.avatarColor == AvatarColor.primary ? Colors.black : Colors.white, ), @@ -42,7 +42,7 @@ class UserCircleAvatar extends ConsumerWidget { return CircleAvatar( backgroundColor: user.avatarColor.toColor(), radius: radius, - child: user.profileImagePath.isEmpty + child: user.profileImagePath == null ? textIcon : ClipRRect( borderRadius: const BorderRadius.all(Radius.circular(50)), diff --git a/mobile/lib/widgets/memories/memory_bottom_info.dart b/mobile/lib/widgets/memories/memory_bottom_info.dart index 84f4cb6c72..6adf1d46b0 100644 --- a/mobile/lib/widgets/memories/memory_bottom_info.dart +++ b/mobile/lib/widgets/memories/memory_bottom_info.dart @@ -48,7 +48,7 @@ class MemoryBottomInfo extends StatelessWidget { .scrollToDate(memory.assets[0].fileCreatedAt); }, shape: const CircleBorder(), - color: Colors.white.withOpacity(0.2), + color: Colors.white.withValues(alpha: 0.2), elevation: 0, child: const Icon( Icons.open_in_new, diff --git a/mobile/lib/widgets/memories/memory_card.dart b/mobile/lib/widgets/memories/memory_card.dart index b63a310b32..abe3586194 100644 --- a/mobile/lib/widgets/memories/memory_card.dart +++ b/mobile/lib/widgets/memories/memory_card.dart @@ -126,7 +126,7 @@ class _BlurredBackdrop extends HookWidget { ), ), child: Container( - color: Colors.black.withOpacity(0.2), + color: Colors.black.withValues(alpha: 0.2), ), ); } else { @@ -147,7 +147,7 @@ class _BlurredBackdrop extends HookWidget { ), ), child: Container( - color: Colors.black.withOpacity(0.2), + color: Colors.black.withValues(alpha: 0.2), ), ), ); diff --git a/mobile/lib/widgets/memories/memory_lane.dart b/mobile/lib/widgets/memories/memory_lane.dart index d5b46dab51..3f97bd1ea4 100644 --- a/mobile/lib/widgets/memories/memory_lane.dart +++ b/mobile/lib/widgets/memories/memory_lane.dart @@ -31,7 +31,7 @@ class MemoryLane extends HookConsumerWidget { elevation: 2, backgroundColor: Colors.black, overlayColor: WidgetStateProperty.all( - Colors.white.withOpacity(0.1), + Colors.white.withValues(alpha: 0.1), ), onTap: (memoryIndex) { ref.read(hapticFeedbackProvider.notifier).heavyImpact(); @@ -84,7 +84,7 @@ class MemoryCard extends ConsumerWidget { children: [ ColorFiltered( colorFilter: ColorFilter.mode( - Colors.black.withOpacity(0.2), + Colors.black.withValues(alpha: 0.2), BlendMode.darken, ), child: Hero( diff --git a/mobile/lib/widgets/search/search_filter/people_picker.dart b/mobile/lib/widgets/search/search_filter/people_picker.dart index 04f9538875..2c45e2097c 100644 --- a/mobile/lib/widgets/search/search_filter/people_picker.dart +++ b/mobile/lib/widgets/search/search_filter/people_picker.dart @@ -37,7 +37,7 @@ class PeoplePicker extends HookConsumerWidget { decoration: InputDecoration( contentPadding: const EdgeInsets.only(left: 24), filled: true, - fillColor: context.primaryColor.withOpacity(0.1), + fillColor: context.primaryColor.withValues(alpha: 0.1), hintStyle: context.textTheme.bodyLarge?.copyWith( color: context.themeData.colorScheme.onSurfaceSecondary, ), diff --git a/mobile/lib/widgets/search/search_filter/search_filter_chip.dart b/mobile/lib/widgets/search/search_filter/search_filter_chip.dart index 2a445c8ad7..c1e628adeb 100644 --- a/mobile/lib/widgets/search/search_filter/search_filter_chip.dart +++ b/mobile/lib/widgets/search/search_filter/search_filter_chip.dart @@ -22,7 +22,7 @@ class SearchFilterChip extends StatelessWidget { onTap: onTap, child: Card( elevation: 0, - color: context.primaryColor.withOpacity(.5), + color: context.primaryColor.withValues(alpha: .5), shape: StadiumBorder( side: BorderSide(color: context.colorScheme.secondaryContainer), ), diff --git a/mobile/lib/widgets/search/thumbnail_with_info_container.dart b/mobile/lib/widgets/search/thumbnail_with_info_container.dart index d2084bdcc8..1f5f3c2d16 100644 --- a/mobile/lib/widgets/search/thumbnail_with_info_container.dart +++ b/mobile/lib/widgets/search/thumbnail_with_info_container.dart @@ -44,8 +44,8 @@ class ThumbnailWithInfoContainer extends StatelessWidget { colors: [ Colors.transparent, label == '' - ? Colors.black.withOpacity(0.1) - : Colors.black.withOpacity(0.5), + ? Colors.black.withValues(alpha: 0.1) + : Colors.black.withValues(alpha: 0.5), ], stops: const [0.0, 1.0], ), diff --git a/mobile/lib/widgets/settings/networking_settings/external_network_preference.dart b/mobile/lib/widgets/settings/networking_settings/external_network_preference.dart index 09f2617152..633d84c9c8 100644 --- a/mobile/lib/widgets/settings/networking_settings/external_network_preference.dart +++ b/mobile/lib/widgets/settings/networking_settings/external_network_preference.dart @@ -72,7 +72,7 @@ class ExternalNetworkPreference extends HookConsumerWidget { builder: (BuildContext context, Widget? child) { return Material( color: context.colorScheme.surfaceContainerHighest, - shadowColor: context.colorScheme.primary.withOpacity(0.2), + shadowColor: context.colorScheme.primary.withValues(alpha: 0.2), child: child, ); }, @@ -116,7 +116,7 @@ class ExternalNetworkPreference extends HookConsumerWidget { child: Icon( Icons.dns_rounded, size: 120, - color: context.primaryColor.withOpacity(0.05), + color: context.primaryColor.withValues(alpha: 0.05), ), ), ListView( diff --git a/mobile/lib/widgets/settings/networking_settings/local_network_preference.dart b/mobile/lib/widgets/settings/networking_settings/local_network_preference.dart index 6e38531afc..a50d216a9d 100644 --- a/mobile/lib/widgets/settings/networking_settings/local_network_preference.dart +++ b/mobile/lib/widgets/settings/networking_settings/local_network_preference.dart @@ -161,7 +161,7 @@ class LocalNetworkPreference extends HookConsumerWidget { child: Icon( Icons.home_outlined, size: 120, - color: context.primaryColor.withOpacity(0.05), + color: context.primaryColor.withValues(alpha: 0.05), ), ), ListView( diff --git a/mobile/lib/widgets/settings/preference_settings/primary_color_setting.dart b/mobile/lib/widgets/settings/preference_settings/primary_color_setting.dart index 119407ccad..af34ab9e16 100644 --- a/mobile/lib/widgets/settings/preference_settings/primary_color_setting.dart +++ b/mobile/lib/widgets/settings/preference_settings/primary_color_setting.dart @@ -98,7 +98,7 @@ class PrimaryColorSetting extends HookConsumerWidget { child: Container( decoration: BoxDecoration( borderRadius: const BorderRadius.all(Radius.circular(100)), - color: Colors.grey[900]?.withOpacity(.4), + color: Colors.grey[900]?.withValues(alpha: .4), ), child: const Padding( padding: EdgeInsets.all(3), diff --git a/mobile/lib/widgets/shared_link/shared_link_item.dart b/mobile/lib/widgets/shared_link/shared_link_item.dart index a9ed359280..09724a37d3 100644 --- a/mobile/lib/widgets/shared_link/shared_link_item.dart +++ b/mobile/lib/widgets/shared_link/shared_link_item.dart @@ -240,7 +240,7 @@ class SharedLinkItem extends ConsumerWidget { child: Tooltip( verticalOffset: 0, decoration: BoxDecoration( - color: colorScheme.primary.withOpacity(0.9), + color: colorScheme.primary.withValues(alpha: 0.9), borderRadius: BorderRadius.circular(10), ), textStyle: TextStyle( @@ -268,7 +268,7 @@ class SharedLinkItem extends ConsumerWidget { child: Tooltip( verticalOffset: 0, decoration: BoxDecoration( - color: colorScheme.primary.withOpacity(0.9), + color: colorScheme.primary.withValues(alpha: 0.9), borderRadius: BorderRadius.circular(10), ), textStyle: TextStyle( diff --git a/mobile/openapi/lib/model/manual_job_name.dart b/mobile/openapi/lib/model/manual_job_name.dart index 71c60d8e64..311215ad9e 100644 --- a/mobile/openapi/lib/model/manual_job_name.dart +++ b/mobile/openapi/lib/model/manual_job_name.dart @@ -28,6 +28,7 @@ class ManualJobName { static const userCleanup = ManualJobName._(r'user-cleanup'); static const memoryCleanup = ManualJobName._(r'memory-cleanup'); static const memoryCreate = ManualJobName._(r'memory-create'); + static const backupDatabase = ManualJobName._(r'backup-database'); /// List of all possible values in this [enum][ManualJobName]. static const values = [ @@ -36,6 +37,7 @@ class ManualJobName { userCleanup, memoryCleanup, memoryCreate, + backupDatabase, ]; static ManualJobName? fromJson(dynamic value) => ManualJobNameTypeTransformer().decode(value); @@ -79,6 +81,7 @@ class ManualJobNameTypeTransformer { case r'user-cleanup': return ManualJobName.userCleanup; case r'memory-cleanup': return ManualJobName.memoryCleanup; case r'memory-create': return ManualJobName.memoryCreate; + case r'backup-database': return ManualJobName.backupDatabase; default: if (!allowNull) { throw ArgumentError('Unknown enum value to decode: $data'); diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock index 2c44c3fa99..a5556f9dcf 100644 --- a/mobile/pubspec.lock +++ b/mobile/pubspec.lock @@ -5,23 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 + sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" url: "https://pub.dev" source: hosted - version: "72.0.0" + version: "76.0.0" _macros: dependency: transitive description: dart source: sdk - version: "0.3.2" + version: "0.3.3" analyzer: dependency: "direct overridden" description: name: analyzer - sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 + sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" url: "https://pub.dev" source: hosted - version: "6.7.0" + version: "6.11.0" analyzer_plugin: dependency: "direct overridden" description: @@ -34,42 +34,42 @@ packages: dependency: transitive description: name: ansicolor - sha256: "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880" + sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.0.3" archive: dependency: transitive description: name: archive - sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + sha256: "0c64e928dcbefddecd234205422bcfc2b5e6d31be0b86fef0d0dd48d7b4c9742" url: "https://pub.dev" source: hosted - version: "3.6.1" + version: "4.0.4" args: dependency: transitive description: name: args - sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.6.0" async: dependency: "direct main" description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" auto_route: dependency: "direct main" description: name: auto_route - sha256: b83e8ce46da7228cdd019b5a11205454847f0a971bca59a7529b98df9876889b + sha256: "1d1bd908a1fec327719326d5d0791edd37f16caff6493c01003689fb03315ad7" url: "https://pub.dev" source: hosted - version: "9.2.2" + version: "9.3.0+1" auto_route_generator: dependency: "direct dev" description: @@ -82,66 +82,66 @@ packages: dependency: "direct main" description: name: background_downloader - sha256: "6a945db1a1c7727a4bc9c1d7c882cfb1a819f873b77e01d5e5dd6a3fb231cb28" + sha256: ed64a215cd24c83a478f602364a3ca86a6dafd178ad783188cc32c6956d5e529 url: "https://pub.dev" source: hosted - version: "8.5.5" + version: "8.9.4" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" build: dependency: transitive description: name: build - sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" build_config: dependency: transitive description: name: build_config - sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" build_daemon: dependency: transitive description: name: build_daemon - sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" + sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.0.4" build_resolvers: dependency: transitive description: name: build_resolvers - sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" + sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0 url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.4" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" + sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99" url: "https://pub.dev" source: hosted - version: "2.4.11" + version: "2.4.15" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe + sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021" url: "https://pub.dev" source: hosted - version: "7.3.1" + version: "8.0.0" built_collection: dependency: transitive description: @@ -154,34 +154,34 @@ packages: dependency: transitive description: name: built_value - sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb + sha256: ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4 url: "https://pub.dev" source: hosted - version: "8.9.2" + version: "8.9.5" cached_network_image: dependency: "direct main" description: name: cached_network_image - sha256: "28ea9690a8207179c319965c13cd8df184d5ee721ae2ce60f398ced1219cea1f" + sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916" url: "https://pub.dev" source: hosted - version: "3.3.1" + version: "3.4.1" cached_network_image_platform_interface: dependency: transitive description: name: cached_network_image_platform_interface - sha256: "9e90e78ae72caa874a323d78fa6301b3fb8fa7ea76a8f96dc5b5bf79f283bf2f" + sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.1.1" cached_network_image_web: dependency: transitive description: name: cached_network_image_web - sha256: "205d6a9f1862de34b93184f22b9d2d94586b2f05c581d546695e3d8f6a805cd7" + sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.1" cancellation_token: dependency: transitive description: @@ -194,18 +194,18 @@ packages: dependency: "direct main" description: name: cancellation_token_http - sha256: "37ad2a20dba02aeb1f0a4d845e7a57eebacdb709e1186e0491e7cd81c559c4ff" + sha256: "0fff478fe5153700396b3472ddf93303c219f1cb8d8e779e65b014cb9c7f0213" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" characters: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -226,42 +226,42 @@ packages: dependency: transitive description: name: cli_util - sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 + sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.4.2" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" code_builder: dependency: transitive description: name: code_builder - sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 + sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" url: "https://pub.dev" source: hosted - version: "4.10.0" + version: "4.10.1" collection: dependency: "direct main" description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" connectivity_plus: dependency: "direct main" description: name: connectivity_plus - sha256: "2056db5241f96cdc0126bd94459fc4cdc13876753768fc7a31c425e50a7177d0" + sha256: "04bf81bb0b77de31557b58d052b24b3eee33f09a6e7a8c68a3e247c7df19ec27" url: "https://pub.dev" source: hosted - version: "6.0.5" + version: "6.1.3" connectivity_plus_platform_interface: dependency: transitive description: @@ -274,18 +274,18 @@ packages: dependency: transitive description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" crop_image: dependency: "direct main" description: name: crop_image - sha256: "6cf20655ecbfba99c369d43ec7adcfa49bf135af88fb75642173d6224a95d3f1" + sha256: "4fdebd00d0c7d1a6e3abeb1e3843efbc202204b867f3e377fcebcf77aaf69a17" url: "https://pub.dev" source: hosted - version: "1.0.13" + version: "1.0.16" cross_file: dependency: transitive description: @@ -298,50 +298,50 @@ packages: dependency: transitive description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.6" csslib: dependency: transitive description: name: csslib - sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb" + sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.2" custom_lint: dependency: "direct dev" description: name: custom_lint - sha256: "7c0aec12df22f9082146c354692056677f1e70bc43471644d1fdb36c6fdda799" + sha256: "4500e88854e7581ee43586abeaf4443cb22375d6d289241a87b1aadf678d5545" url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.10" custom_lint_builder: dependency: transitive description: name: custom_lint_builder - sha256: d7dc41e709dde223806660268678be7993559e523eb3164e2a1425fd6f7615a9 + sha256: "5a95eff100da256fbf086b329c17c8b49058c261cdf56d3a4157d3c31c511d78" url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.10" custom_lint_core: dependency: transitive description: name: custom_lint_core - sha256: a85e8f78f4c52f6c63cdaf8c872eb573db0231dcdf3c3a5906d493c1f8bc20e6 + sha256: "76a4046cc71d976222a078a8fd4a65e198b70545a8d690a75196dd14f08510f6" url: "https://pub.dev" source: hosted - version: "0.6.3" + version: "0.6.10" dart_style: dependency: transitive description: name: dart_style - sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" + sha256: "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820" url: "https://pub.dev" source: hosted - version: "2.3.6" + version: "2.3.8" dartx: dependency: transitive description: @@ -354,10 +354,10 @@ packages: dependency: transitive description: name: dbus - sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac" + sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c" url: "https://pub.dev" source: hosted - version: "0.7.10" + version: "0.7.11" desktop_webview_window: dependency: transitive description: @@ -370,18 +370,18 @@ packages: dependency: "direct main" description: name: device_info_plus - sha256: f545ffbadee826f26f2e1a0f0cbd667ae9a6011cc0f77c0f8f00a969655e6e95 + sha256: "306b78788d1bb569edb7c55d622953c2414ca12445b41c9117963e03afc5c513" url: "https://pub.dev" source: hosted - version: "11.1.1" + version: "11.3.3" device_info_plus_platform_interface: dependency: transitive description: name: device_info_plus_platform_interface - sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" + sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2" url: "https://pub.dev" source: hosted - version: "7.0.1" + version: "7.0.2" dynamic_color: dependency: "direct main" description: @@ -418,50 +418,50 @@ packages: dependency: "direct dev" description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" ffi: dependency: transitive description: name: ffi - sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" + sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" file: dependency: transitive description: name: file - sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" file_picker: dependency: "direct main" description: name: file_picker - sha256: aac85f20436608e01a6ffd1fdd4e746a7f33c93a2c83752e626bdfaea139b877 + sha256: ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810 url: "https://pub.dev" source: hosted - version: "8.1.3" + version: "8.3.7" file_selector_linux: dependency: transitive description: name: file_selector_linux - sha256: "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492" + sha256: "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33" url: "https://pub.dev" source: hosted - version: "0.9.2+1" + version: "0.9.3+2" file_selector_macos: dependency: transitive description: name: file_selector_macos - sha256: f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385 + sha256: "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc" url: "https://pub.dev" source: hosted - version: "0.9.4" + version: "0.9.4+2" file_selector_platform_interface: dependency: transitive description: @@ -474,18 +474,18 @@ packages: dependency: transitive description: name: file_selector_windows - sha256: "2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69" + sha256: "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b" url: "https://pub.dev" source: hosted - version: "0.9.3+2" + version: "0.9.3+4" fixnum: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -495,10 +495,10 @@ packages: dependency: "direct main" description: name: flutter_cache_manager - sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba" + sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386" url: "https://pub.dev" source: hosted - version: "3.3.1" + version: "3.4.1" flutter_displaymode: dependency: "direct main" description: @@ -524,10 +524,10 @@ packages: dependency: "direct dev" description: name: flutter_launcher_icons - sha256: "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77" + sha256: bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c url: "https://pub.dev" source: hosted - version: "0.14.1" + version: "0.14.3" flutter_lints: dependency: "direct dev" description: @@ -540,10 +540,10 @@ packages: dependency: "direct main" description: name: flutter_local_notifications - sha256: dd6676d8c2926537eccdf9f72128bbb2a9d0814689527b17f92c248ff192eaf3 + sha256: "674173fd3c9eda9d4c8528da2ce0ea69f161577495a9cc835a2a4ecd7eadeb35" url: "https://pub.dev" source: hosted - version: "17.2.1+2" + version: "17.2.4" flutter_local_notifications_linux: dependency: transitive description: @@ -569,18 +569,18 @@ packages: dependency: "direct dev" description: name: flutter_native_splash - sha256: aa06fec78de2190f3db4319dd60fdc8d12b2626e93ef9828633928c2dcaea840 + sha256: edb09c35ee9230c4b03f13dd45bb3a276d0801865f0a4650b7e2a3bba61a803a url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.5" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "9d98bd47ef9d34e803d438f17fd32b116d31009f534a6fa5ce3a1167f189a6de" + sha256: "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3" url: "https://pub.dev" source: hosted - version: "2.0.21" + version: "2.0.27" flutter_riverpod: dependency: transitive description: @@ -593,10 +593,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c + sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b url: "https://pub.dev" source: hosted - version: "2.0.9" + version: "2.0.17" flutter_test: dependency: "direct dev" description: flutter @@ -606,10 +606,10 @@ packages: dependency: "direct main" description: name: flutter_udid - sha256: "63384bd96203aaefccfd7137fab642edda18afede12b0e9e1a2c96fe2589fd07" + sha256: be464dc5b1fb7ee894f6a32d65c086ca5e177fdcf9375ac08d77495b98150f84 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" flutter_web_auth_2: dependency: "direct main" description: @@ -635,10 +635,10 @@ packages: dependency: "direct main" description: name: fluttertoast - sha256: "95f349437aeebe524ef7d6c9bde3e6b4772717cf46a0eb6a3ceaddc740b297cc" + sha256: "25e51620424d92d3db3832464774a6143b5053f15e382d8ffbfd40b6e795dcf1" url: "https://pub.dev" source: hosted - version: "8.2.8" + version: "8.2.12" freezed_annotation: dependency: transitive description: @@ -680,10 +680,10 @@ packages: dependency: transitive description: name: geolocator_apple - sha256: bc2aca02423ad429cb0556121f56e60360a2b7d694c8570301d06ea0c00732fd + sha256: c4ecead17985ede9634f21500072edfcb3dba0ef7b97f8d7bc556d2d722b3ba3 url: "https://pub.dev" source: hosted - version: "2.3.7" + version: "2.3.9" geolocator_platform_interface: dependency: transitive description: @@ -712,10 +712,10 @@ packages: dependency: transitive description: name: glob - sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" graphs: dependency: transitive description: @@ -736,50 +736,50 @@ packages: dependency: transitive description: name: hotreloader - sha256: ed56fdc1f3a8ac924e717257621d09e9ec20e308ab6352a73a50a1d7a4d9158e + sha256: bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "4.3.0" html: dependency: transitive description: name: html - sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" + sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec" url: "https://pub.dev" source: hosted - version: "0.15.4" + version: "0.15.5" http: dependency: "direct main" description: name: http - sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 + sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.3.0" http_multi_server: dependency: transitive description: name: http_multi_server - sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" http_parser: - dependency: "direct main" + dependency: transitive description: name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.1.2" image: dependency: transitive description: name: image - sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8" + sha256: "13d3349ace88f12f4a0d175eb5c12dcdd39d35c4c109a8a13dfeb6d0bd9e31c3" url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "4.5.3" image_picker: dependency: "direct main" description: @@ -792,26 +792,26 @@ packages: dependency: transitive description: name: image_picker_android - sha256: c0e72ecd170b00a5590bb71238d57dc8ad22ee14c60c6b0d1a4e05cafbc5db4b + sha256: "8bd392ba8b0c8957a157ae0dc9fcf48c58e6c20908d5880aea1d79734df090e9" url: "https://pub.dev" source: hosted - version: "0.8.12+11" + version: "0.8.12+22" image_picker_for_web: dependency: transitive description: name: image_picker_for_web - sha256: "65d94623e15372c5c51bebbcb820848d7bcb323836e12dfdba60b5d3a8b39e50" + sha256: "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.6" image_picker_ios: dependency: transitive description: name: image_picker_ios - sha256: "6703696ad49f5c3c8356d576d7ace84d1faf459afb07accbb0fae780753ff447" + sha256: "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100" url: "https://pub.dev" source: hosted - version: "0.8.12" + version: "0.8.12+2" image_picker_linux: dependency: transitive description: @@ -824,18 +824,18 @@ packages: dependency: transitive description: name: image_picker_macos - sha256: "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62" + sha256: "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1" url: "https://pub.dev" source: hosted - version: "0.2.1+1" + version: "0.2.1+2" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface - sha256: "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80" + sha256: "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.10.1" image_picker_windows: dependency: transitive description: @@ -868,10 +868,10 @@ packages: dependency: transitive description: name: io - sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" isar: dependency: "direct main" description: @@ -916,18 +916,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -940,26 +940,26 @@ packages: dependency: transitive description: name: lints - sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413" + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "5.1.1" logging: dependency: "direct main" description: name: logging - sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" macros: dependency: transitive description: name: macros - sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" url: "https://pub.dev" source: hosted - version: "0.1.2-main.4" + version: "0.1.3-main.0" maplibre_gl: dependency: "direct main" description: @@ -988,10 +988,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -1004,18 +1004,18 @@ packages: dependency: "direct overridden" description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" mime: dependency: transitive description: name: mime - sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "2.0.0" mocktail: dependency: "direct dev" description: @@ -1037,18 +1037,18 @@ packages: dependency: "direct main" description: name: network_info_plus - sha256: bf9e39e523e9951d741868dc33ac386b0bc24301e9b7c8a7d60dbc34879150a8 + sha256: "08f4166bbb77da9e407edef6322a33f87b18c0ca46483fb25606cb3d2bfcdd2a" url: "https://pub.dev" source: hosted - version: "6.1.1" + version: "6.1.3" network_info_plus_platform_interface: dependency: transitive description: name: network_info_plus_platform_interface - sha256: b7f35f4a7baef511159e524499f3c15464a49faa5ec10e92ee0bce265e664906 + sha256: "7e7496a8a9d8136859b8881affc613c4a21304afeb6c324bcefc4bd0aff6b94b" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2" nm: dependency: transitive description: @@ -1076,74 +1076,66 @@ packages: dependency: transitive description: name: package_config - sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" package_info_plus: dependency: "direct main" description: name: package_info_plus - sha256: da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce + sha256: "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191" url: "https://pub.dev" source: hosted - version: "8.1.1" + version: "8.3.0" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66 + sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.2.0" path: dependency: "direct main" description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" path_parsing: dependency: transitive description: name: path_parsing - sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" path_provider: dependency: "direct main" description: name: path_provider - sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "490539678396d4c3c0b06efdaab75ae60675c3e0c66f72bc04c2e2c1e0e2abeb" + sha256: "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12" url: "https://pub.dev" source: hosted - version: "2.2.9" + version: "2.2.16" path_provider_foundation: - dependency: transitive - description: - name: path_provider_foundation - sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 - url: "https://pub.dev" - source: hosted - version: "2.4.0" - path_provider_ios: dependency: "direct main" description: - name: path_provider_ios - sha256: "03d639406f5343478352433f00d3c4394d52dac8df3d847869c5e2333e0bbce8" + name: path_provider_foundation + sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942" url: "https://pub.dev" source: hosted - version: "2.0.11" + version: "2.4.1" path_provider_linux: dependency: transitive description: @@ -1172,42 +1164,42 @@ packages: dependency: "direct main" description: name: permission_handler - sha256: "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb" + sha256: "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849" url: "https://pub.dev" source: hosted - version: "11.3.1" + version: "11.4.0" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: eaf2a1ec4472775451e88ca6a7b86559ef2f1d1ed903942ed135e38ea0097dca + sha256: d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc url: "https://pub.dev" source: hosted - version: "12.0.8" + version: "12.1.0" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0 + sha256: f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98 url: "https://pub.dev" source: hosted - version: "9.4.5" + version: "9.4.6" permission_handler_html: dependency: transitive description: name: permission_handler_html - sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851 + sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24" url: "https://pub.dev" source: hosted - version: "0.1.3+2" + version: "0.1.3+5" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: fe0ffe274d665be8e34f9c59705441a7d248edebbe5d9e3ec2665f88b79358ea + sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878 url: "https://pub.dev" source: hosted - version: "4.2.2" + version: "4.3.0" permission_handler_windows: dependency: transitive description: @@ -1220,18 +1212,18 @@ packages: dependency: transitive description: name: petitparser - sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646" url: "https://pub.dev" source: hosted - version: "6.0.2" + version: "6.1.0" photo_manager: dependency: "direct main" description: name: photo_manager - sha256: f5ef2618870e9a50d8bfeb81a02c242d580ae8614bd5ea9e1b80dbb7e49d4260 + sha256: "0bc7548fd3111eb93a3b0abf1c57364e40aeda32512c100085a48dade60e574f" url: "https://pub.dev" source: hosted - version: "3.6.1" + version: "3.6.4" photo_manager_image_provider: dependency: "direct main" description: @@ -1244,10 +1236,10 @@ packages: dependency: transitive description: name: platform - sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" url: "https://pub.dev" source: hosted - version: "3.1.5" + version: "3.1.6" plugin_platform_interface: dependency: transitive description: @@ -1264,30 +1256,38 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.1" + posix: + dependency: transitive + description: + name: posix + sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a + url: "https://pub.dev" + source: hosted + version: "6.0.1" process: dependency: transitive description: name: process - sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32" + sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d" url: "https://pub.dev" source: hosted - version: "5.0.2" + version: "5.0.3" pub_semver: dependency: transitive description: name: pub_semver - sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" pubspec_parse: dependency: transitive description: name: pubspec_parse - sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 + sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.5.0" riverpod: dependency: transitive description: @@ -1332,10 +1332,10 @@ packages: dependency: transitive description: name: rxdart - sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" + sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" url: "https://pub.dev" source: hosted - version: "0.27.7" + version: "0.28.0" scrollable_positioned_list: dependency: "direct main" description: @@ -1380,50 +1380,50 @@ packages: dependency: "direct main" description: name: share_plus - sha256: "9c9bafd4060728d7cdb2464c341743adbd79d327cb067ec7afb64583540b47c8" + sha256: fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da url: "https://pub.dev" source: hosted - version: "10.1.2" + version: "10.1.4" share_plus_platform_interface: dependency: transitive description: name: share_plus_platform_interface - sha256: c57c0bbfec7142e3a0f55633be504b796af72e60e3c791b44d5a017b985f7a48 + sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "5.0.2" shared_preferences: dependency: transitive description: name: shared_preferences - sha256: c272f9cabca5a81adc9b0894381e9c1def363e980f960fa903c604c471b22f68 + sha256: "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.5.2" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "041be4d9d2dc6079cf342bc8b761b03787e3b71192d658220a56cac9c04a0294" + sha256: "3ec7210872c4ba945e3244982918e502fa2bfb5230dff6832459ca0e1879b7ad" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.8" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "671e7a931f55a08aa45be2a13fe7247f2a41237897df434b30d2012388191833" + sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03" url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.5.4" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "2ba0510d3017f91655b7543e9ee46d48619de2a2af38e5c790423f7007c7ccc1" + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" shared_preferences_platform_interface: dependency: transitive description: @@ -1436,39 +1436,39 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: "59dc807b94d29d52ddbb1b3c0d3b9d0a67fc535a64e62a5542c8db0513fcb6c2" + sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.3" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: "398084b47b7f92110683cac45c6dc4aae853db47e470e5ddcd52cab7f7196ab2" + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" shelf: dependency: transitive description: name: shelf - sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 url: "https://pub.dev" source: hosted - version: "1.4.1" + version: "1.4.2" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" + sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "3.0.0" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" socket_io_client: dependency: "direct main" description: @@ -1497,10 +1497,10 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" sprintf: dependency: transitive description: @@ -1513,26 +1513,50 @@ packages: dependency: transitive description: name: sqflite - sha256: a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d + sha256: e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03 url: "https://pub.dev" source: hosted - version: "2.3.3+1" + version: "2.4.2" + sqflite_android: + dependency: transitive + description: + name: sqflite_android + sha256: "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b" + url: "https://pub.dev" + source: hosted + version: "2.4.1" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4" + sha256: "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b" url: "https://pub.dev" source: hosted - version: "2.5.4" + version: "2.5.5" + sqflite_darwin: + dependency: transitive + description: + name: sqflite_darwin + sha256: "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + sqflite_platform_interface: + dependency: transitive + description: + name: sqflite_platform_interface + sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920" + url: "https://pub.dev" + source: hosted + version: "2.4.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" state_notifier: dependency: transitive description: @@ -1545,26 +1569,26 @@ packages: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" stream_transform: dependency: transitive description: name: stream_transform - sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.1" sync_http: dependency: transitive description: @@ -1577,26 +1601,26 @@ packages: dependency: transitive description: name: synchronized - sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" + sha256: "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6" url: "https://pub.dev" source: hosted - version: "3.1.0+1" + version: "3.3.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.4" thumbhash: dependency: "direct main" description: @@ -1609,10 +1633,10 @@ packages: dependency: transitive description: name: time - sha256: ad8e018a6c9db36cb917a031853a1aae49467a93e0d464683e029537d848c221 + sha256: "370572cf5d1e58adcb3e354c47515da3f7469dac3a95b447117e728e7be6f461" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" timezone: dependency: "direct main" description: @@ -1625,18 +1649,18 @@ packages: dependency: transitive description: name: timing - sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" typed_data: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" universal_io: dependency: transitive description: @@ -1649,42 +1673,42 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3" + sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603" url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.3.1" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: "94d8ad05f44c6d4e2ffe5567ab4d741b82d62e3c8e288cc1fcea45965edf47c9" + sha256: "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4" url: "https://pub.dev" source: hosted - version: "6.3.8" + version: "6.3.15" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e + sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626" url: "https://pub.dev" source: hosted - version: "6.3.1" + version: "6.3.2" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 + sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de" + sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.2" url_launcher_platform_interface: dependency: transitive description: @@ -1697,50 +1721,50 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" + sha256: "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9" url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.4.0" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185" + sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77" url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.4" uuid: dependency: transitive description: name: uuid - sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90" + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.4.2" + version: "4.5.1" vector_graphics: dependency: transitive description: name: vector_graphics - sha256: "4ac59808bbfca6da38c99f415ff2d3a5d7ca0a6b4809c71d9cf30fba5daf9752" + sha256: "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de" url: "https://pub.dev" source: hosted - version: "1.1.10+1" + version: "1.1.18" vector_graphics_codec: dependency: transitive description: name: vector_graphics_codec - sha256: f3247e7ab0ec77dc759263e68394990edc608fb2b480b80db8aa86ed09279e33 + sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146" url: "https://pub.dev" source: hosted - version: "1.1.10+1" + version: "1.1.13" vector_graphics_compiler: dependency: transitive description: name: vector_graphics_compiler - sha256: "18489bdd8850de3dd7ca8a34e0c446f719ec63e2bab2e7a8cc66a9028dd76c5a" + sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad" url: "https://pub.dev" source: hosted - version: "1.1.10+1" + version: "1.1.16" vector_math: dependency: transitive description: @@ -1753,42 +1777,42 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.3.1" wakelock_plus: dependency: "direct main" description: name: wakelock_plus - sha256: bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484 + sha256: "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e" url: "https://pub.dev" source: hosted - version: "1.2.8" + version: "1.2.10" wakelock_plus_platform_interface: dependency: transitive description: name: wakelock_plus_platform_interface - sha256: "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16" + sha256: "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" watcher: dependency: transitive description: name: watcher - sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" web: dependency: transitive description: name: web - sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" web_socket: dependency: transitive description: @@ -1801,34 +1825,34 @@ packages: dependency: transitive description: name: web_socket_channel - sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" + sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" webdriver: dependency: transitive description: name: webdriver - sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e" + sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.4" win32: dependency: transitive description: name: win32 - sha256: "015002c060f1ae9f41a818f2d5640389cc05283e368be19dc8d77cecb43c40c9" + sha256: b89e6e24d1454e149ab20fbb225af58660f0c0bf4475544650700d8e2da54aef url: "https://pub.dev" source: hosted - version: "5.5.3" + version: "5.11.0" win32_registry: dependency: transitive description: name: win32_registry - sha256: "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6" + sha256: "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae" url: "https://pub.dev" source: hosted - version: "1.1.4" + version: "2.1.0" window_to_front: dependency: transitive description: @@ -1841,10 +1865,10 @@ packages: dependency: transitive description: name: xdg_directories - sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.1.0" xml: dependency: transitive description: @@ -1857,18 +1881,18 @@ packages: dependency: transitive description: name: xxh3 - sha256: a92b30944a9aeb4e3d4f3c3d4ddb3c7816ca73475cd603682c4f8149690f56d7 + sha256: "399a0438f5d426785723c99da6b16e136f4953fb1e9db0bf270bd41dd4619916" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.2.0" yaml: dependency: transitive description: name: yaml - sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.3" sdks: - dart: ">=3.5.0 <4.0.0" - flutter: ">=3.24.5" + dart: ">=3.7.0 <4.0.0" + flutter: ">=3.29.1" diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index 0b925b9162..6d214ef40b 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -6,93 +6,78 @@ version: 1.129.0+187 environment: sdk: '>=3.3.0 <4.0.0' - flutter: 3.24.5 + flutter: 3.29.1 -isar_version: &isar_version 3.1.8 # define the version to be used +isar_version: &isar_version 3.1.8 dependencies: flutter: sdk: flutter - path_provider_ios: - photo_manager: ^3.6.1 - photo_manager_image_provider: ^2.2.0 - flutter_hooks: ^0.21.2 - hooks_riverpod: ^2.6.1 - riverpod_annotation: ^2.6.1 - cached_network_image: ^3.3.1 - flutter_cache_manager: ^3.3.1 - intl: ^0.19.0 + async: ^2.11.0 auto_route: ^9.2.0 - fluttertoast: ^8.2.4 - socket_io_client: ^2.0.3+1 - maplibre_gl: ^0.21.0 - geolocator: ^11.0.0 # used to move to current location in map view - flutter_udid: ^3.0.0 - flutter_svg: ^2.0.9 - package_info_plus: ^8.0.1 - url_launcher: ^6.2.4 - http: ^1.1.0 - cancellation_token_http: ^2.0.0 - easy_localization: ^3.0.7+1 - share_plus: ^10.0.0 - flutter_displaymode: ^0.6.0 - scrollable_positioned_list: ^0.3.8 - path: ^1.8.3 - path_provider: ^2.1.2 + background_downloader: ^8.5.5 + cached_network_image: ^3.4.1 + cancellation_token_http: ^2.1.0 collection: ^1.18.0 - http_parser: ^4.0.2 + connectivity_plus: ^6.1.3 + crop_image: ^1.0.16 + device_info_plus: ^11.3.3 + dynamic_color: ^1.7.0 + easy_image_viewer: ^1.5.1 + easy_localization: ^3.0.7+1 + file_picker: ^8.0.0+1 + flutter_cache_manager: ^3.4.1 + flutter_displaymode: ^0.6.0 + flutter_hooks: ^0.21.2 + flutter_local_notifications: ^17.2.1+2 + flutter_svg: ^2.0.17 + flutter_udid: ^3.0.0 flutter_web_auth_2: ^5.0.0-alpha.0 - easy_image_viewer: ^1.4.0 + fluttertoast: ^8.2.12 + geolocator: ^11.0.0 + hooks_riverpod: ^2.6.1 + http: ^1.3.0 + image_picker: ^1.1.2 + intl: ^0.19.0 + logging: ^1.3.0 + maplibre_gl: ^0.21.0 + network_info_plus: ^6.1.3 + octo_image: ^2.1.0 + package_info_plus: ^8.3.0 + path: ^1.9.1 + path_provider: ^2.1.5 + path_provider_foundation: ^2.4.1 + permission_handler: ^11.4.0 + photo_manager: ^3.6.4 + photo_manager_image_provider: ^2.2.0 + riverpod_annotation: ^2.6.1 + scrollable_positioned_list: ^0.3.8 + share_handler: ^0.0.22 + share_plus: ^10.1.4 + socket_io_client: ^2.0.3+1 + thumbhash: 0.1.0+1 + timezone: ^0.9.4 + url_launcher: ^6.3.1 + wakelock_plus: ^1.2.10 + + native_video_player: + git: + url: https://github.com/immich-app/native_video_player + ref: '5459d54' + openapi: + path: openapi isar: version: *isar_version hosted: https://pub.isar-community.dev/ isar_flutter_libs: # contains Isar Core version: *isar_version hosted: https://pub.isar-community.dev/ - permission_handler: ^11.2.0 - device_info_plus: ^11.0.0 - connectivity_plus: ^6.0.0 - wakelock_plus: ^1.1.4 - flutter_local_notifications: ^17.2.1+2 - timezone: ^0.9.2 - octo_image: ^2.0.0 - thumbhash: 0.1.0+1 - async: ^2.11.0 - dynamic_color: ^1.7.0 #package to apply system theme - background_downloader: ^8.5.5 - network_info_plus: ^6.1.1 - native_video_player: - git: - url: https://github.com/immich-app/native_video_player - ref: '5459d54' - #image editing packages - crop_image: ^1.0.13 - - openapi: - path: openapi - - # easy to remove packages: - image_picker: ^1.0.7 # only used to select user profile image from system gallery -> we can simply select an image from within immich? - logging: ^1.2.0 - file_picker: ^8.0.0+1 - share_handler: ^0.0.22 - -# This is uncommented in F-Droid build script -# Taken from https://github.com/Myzel394/locus/blob/445013d22ec1d759027d4303bd65b30c5c8588c8/pubspec.yaml#L105 dependency_overrides: - # TODO: remove once Isar is updated analyzer: ^6.0.0 - # TODO: remove once analyzer override is removed meta: ^1.11.0 - # TODO: remove once analyzer override is removed analyzer_plugin: ^0.11.3 -#f geolocator_android: -#f git: -#f url: https://github.com/Zverik/flutter-geolocator.git -#f ref: floss -#f path: geolocator_android dev_dependencies: flutter_test: @@ -100,8 +85,8 @@ dev_dependencies: flutter_lints: ^5.0.0 build_runner: ^2.4.8 auto_route_generator: ^9.0.0 - flutter_launcher_icons: ^0.14.0 - flutter_native_splash: ^2.3.9 + flutter_launcher_icons: ^0.14.3 + flutter_native_splash: ^2.4.5 isar_generator: version: *isar_version hosted: https://pub.isar-community.dev/ @@ -110,7 +95,7 @@ dev_dependencies: custom_lint: ^0.6.4 riverpod_lint: ^2.6.1 riverpod_generator: ^2.6.1 - mocktail: ^1.0.3 + mocktail: ^1.0.4 immich_mobile_immich_lint: path: './immich_lint' fake_async: ^1.3.1 @@ -145,8 +130,8 @@ flutter_launcher_icons: adaptive_icon_background: '#ffffff' adaptive_icon_foreground: 'assets/immich-logo-android-adaptive-icon.png' image_path_ios: 'assets/immich-logo-w-bg.png' - android: 'ic_launcher' # can specify file name here e.g. "ic_launcher" - ios: false # can specify file name here e.g. "My-Launcher-Icon + android: 'ic_launcher' + ios: false remove_alpha_ios: true analyzer: diff --git a/mobile/test/domain/service.mock.dart b/mobile/test/domain/service.mock.dart new file mode 100644 index 0000000000..53a173fc28 --- /dev/null +++ b/mobile/test/domain/service.mock.dart @@ -0,0 +1,7 @@ +import 'package:immich_mobile/domain/services/store.service.dart'; +import 'package:immich_mobile/domain/services/user.service.dart'; +import 'package:mocktail/mocktail.dart'; + +class MockStoreService extends Mock implements StoreService {} + +class MockUserService extends Mock implements UserService {} diff --git a/mobile/test/domain/services/user_service_test.dart b/mobile/test/domain/services/user_service_test.dart new file mode 100644 index 0000000000..512f5cb4a2 --- /dev/null +++ b/mobile/test/domain/services/user_service_test.dart @@ -0,0 +1,133 @@ +import 'dart:typed_data'; + +import 'package:flutter_test/flutter_test.dart'; +import 'package:immich_mobile/domain/interfaces/user.interface.dart'; +import 'package:immich_mobile/domain/interfaces/user_api.repository.dart'; +import 'package:immich_mobile/domain/models/store.model.dart'; +import 'package:immich_mobile/domain/services/store.service.dart'; +import 'package:immich_mobile/domain/services/user.service.dart'; +import 'package:mocktail/mocktail.dart'; + +import '../../fixtures/user.stub.dart'; +import '../../infrastructure/repository.mock.dart'; +import '../service.mock.dart'; + +void main() { + late UserService sut; + late IUserRepository mockUserRepo; + late IUserApiRepository mockUserApiRepo; + late StoreService mockStoreService; + + setUp(() { + mockUserRepo = MockUserRepository(); + mockUserApiRepo = MockUserApiRepository(); + mockStoreService = MockStoreService(); + sut = UserService( + userRepository: mockUserRepo, + userApiRepository: mockUserApiRepo, + storeService: mockStoreService, + ); + }); + + group('getMyUser', () { + test('should return user from store', () { + when(() => mockStoreService.get(StoreKey.currentUser)) + .thenReturn(UserStub.admin); + final result = sut.getMyUser(); + expect(result, UserStub.admin); + }); + + test('should handle user not found scenario', () { + when(() => mockStoreService.get(StoreKey.currentUser)) + .thenThrow(Exception('User not found')); + + expect(() => sut.getMyUser(), throwsA(isA())); + }); + }); + + group('tryGetMyUser', () { + test('should return user from store', () { + when(() => mockStoreService.tryGet(StoreKey.currentUser)) + .thenReturn(UserStub.admin); + final result = sut.tryGetMyUser(); + expect(result, UserStub.admin); + }); + + test('should return null if user not found', () { + when(() => mockStoreService.tryGet(StoreKey.currentUser)) + .thenReturn(null); + final result = sut.tryGetMyUser(); + expect(result, isNull); + }); + }); + + group('watchMyUser', () { + test('should return user stream from store', () { + when(() => mockStoreService.watch(StoreKey.currentUser)) + .thenAnswer((_) => Stream.value(UserStub.admin)); + final result = sut.watchMyUser(); + expect(result, emits(UserStub.admin)); + }); + + test('should return an empty stream if user not found', () { + when(() => mockStoreService.watch(StoreKey.currentUser)) + .thenAnswer((_) => const Stream.empty()); + final result = sut.watchMyUser(); + expect(result, emitsInOrder([])); + }); + }); + + group('refreshMyUser', () { + test('should return user from api and store it', () async { + when(() => mockUserApiRepo.getMyUser()) + .thenAnswer((_) async => UserStub.admin); + when(() => mockStoreService.put(StoreKey.currentUser, UserStub.admin)) + .thenAnswer((_) async => true); + when(() => mockUserRepo.update(UserStub.admin)) + .thenAnswer((_) async => UserStub.admin); + + final result = await sut.refreshMyUser(); + verify(() => mockStoreService.put(StoreKey.currentUser, UserStub.admin)) + .called(1); + verify(() => mockUserRepo.update(UserStub.admin)).called(1); + expect(result, UserStub.admin); + }); + + test('should return null if user not found', () async { + when(() => mockUserApiRepo.getMyUser()).thenAnswer((_) async => null); + + final result = await sut.refreshMyUser(); + verifyNever( + () => mockStoreService.put(StoreKey.currentUser, UserStub.admin), + ); + verifyNever(() => mockUserRepo.update(UserStub.admin)); + expect(result, isNull); + }); + }); + + group('createProfileImage', () { + test('should return profile image path', () async { + when( + () => mockUserApiRepo.createProfileImage( + name: 'profile.jpg', + data: Uint8List(0), + ), + ).thenAnswer((_) async => 'profile.jpg'); + + final result = await sut.createProfileImage('profile.jpg', Uint8List(0)); + expect(result, 'profile.jpg'); + }); + + test('should return null if profile image creation fails', () async { + when( + () => mockUserApiRepo.createProfileImage( + name: 'profile.jpg', + data: Uint8List(0), + ), + ).thenThrow(Exception('Failed to create profile image')); + + final result = await sut.createProfileImage('profile.jpg', Uint8List(0)); + expect(result, isNull); + }); + }); +} diff --git a/mobile/test/fixtures/album.stub.dart b/mobile/test/fixtures/album.stub.dart index e820f193d5..c6ea199c0f 100644 --- a/mobile/test/fixtures/album.stub.dart +++ b/mobile/test/fixtures/album.stub.dart @@ -1,4 +1,5 @@ import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart'; import 'asset.stub.dart'; import 'user.stub.dart'; @@ -26,7 +27,7 @@ final class AlbumStub { shared: true, activityEnabled: false, endDate: DateTime(2020), - )..sharedUsers.addAll([UserStub.admin]); + )..sharedUsers.addAll([User.fromDto(UserStub.admin)]); static final oneAsset = Album( name: "album-with-single-asset", @@ -53,7 +54,7 @@ final class AlbumStub { ) ..assets.addAll([AssetStub.image1, AssetStub.image2]) ..activityEnabled = true - ..owner.value = UserStub.admin; + ..owner.value = User.fromDto(UserStub.admin); static final create2020end2020Album = Album( name: "create2020update2020Album", diff --git a/mobile/test/fixtures/exif.stub.dart b/mobile/test/fixtures/exif.stub.dart new file mode 100644 index 0000000000..5ad9a41761 --- /dev/null +++ b/mobile/test/fixtures/exif.stub.dart @@ -0,0 +1,18 @@ +import 'package:immich_mobile/domain/models/exif.model.dart'; + +abstract final class ExifStub { + static final size = const ExifInfo(assetId: 1, fileSize: 1000); + + static final gps = const ExifInfo( + assetId: 2, + latitude: 20, + longitude: 20, + city: 'city', + state: 'state', + country: 'country', + ); + + static final rotated90CW = const ExifInfo(assetId: 3, orientation: "90"); + + static final rotated270CW = const ExifInfo(assetId: 4, orientation: "-90"); +} diff --git a/mobile/test/fixtures/user.stub.dart b/mobile/test/fixtures/user.stub.dart index 38524f782c..88b14dc02e 100644 --- a/mobile/test/fixtures/user.stub.dart +++ b/mobile/test/fixtures/user.stub.dart @@ -1,35 +1,35 @@ -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; -final class UserStub { +abstract final class UserStub { const UserStub._(); - static final admin = User( - id: "admin", - updatedAt: DateTime(2021), + static final admin = UserDto( + uid: "admin", email: "admin@test.com", name: "admin", - avatarColor: AvatarColorEnum.green, - profileImagePath: '', isAdmin: true, + updatedAt: DateTime(2021), + profileImagePath: null, + avatarColor: AvatarColor.green, ); - static final user1 = User( - id: "user1", - updatedAt: DateTime(2022), + static final user1 = UserDto( + uid: "user1", email: "user1@test.com", name: "user1", - avatarColor: AvatarColorEnum.red, - profileImagePath: '', isAdmin: false, + updatedAt: DateTime(2022), + profileImagePath: null, + avatarColor: AvatarColor.red, ); - static final user2 = User( - id: "user2", - updatedAt: DateTime(2023), + static final user2 = UserDto( + uid: "user2", email: "user2@test.com", name: "user2", - avatarColor: AvatarColorEnum.primary, - profileImagePath: '', isAdmin: false, + updatedAt: DateTime(2023), + profileImagePath: null, + avatarColor: AvatarColor.primary, ); } diff --git a/mobile/test/infrastructure/repositories/exif_repository_test.dart b/mobile/test/infrastructure/repositories/exif_repository_test.dart new file mode 100644 index 0000000000..e267d2dac4 --- /dev/null +++ b/mobile/test/infrastructure/repositories/exif_repository_test.dart @@ -0,0 +1,50 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:immich_mobile/domain/interfaces/exif.interface.dart'; +import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'; +import 'package:immich_mobile/infrastructure/repositories/exif.repository.dart'; +import 'package:isar/isar.dart'; + +import '../../fixtures/exif.stub.dart'; +import '../../test_utils.dart'; + +Future _populateExifTable(Isar db) async { + await db.writeTxn(() async { + await db.exifInfos.putAll([ + ExifInfo.fromDto(ExifStub.size), + ExifInfo.fromDto(ExifStub.gps), + ExifInfo.fromDto(ExifStub.rotated90CW), + ExifInfo.fromDto(ExifStub.rotated270CW), + ]); + }); +} + +void main() { + late Isar db; + late IExifInfoRepository sut; + + setUp(() async { + db = await TestUtils.initIsar(); + sut = IsarExifRepository(db); + }); + + group("Return with proper orientation", () { + setUp(() async { + await _populateExifTable(db); + }); + + test("isFlipped true for 90CW", () async { + final exif = await sut.get(ExifStub.rotated90CW.assetId!); + expect(exif!.isFlipped, true); + }); + + test("isFlipped true for 270CW", () async { + final exif = await sut.get(ExifStub.rotated270CW.assetId!); + expect(exif!.isFlipped, true); + }); + + test("isFlipped false for the original non-rotated image", () async { + final exif = await sut.get(ExifStub.size.assetId!); + expect(exif!.isFlipped, false); + }); + }); +} diff --git a/mobile/test/infrastructure/repositories/store_repository_test.dart b/mobile/test/infrastructure/repositories/store_repository_test.dart index 6fd3d3963a..16e0632d83 100644 --- a/mobile/test/infrastructure/repositories/store_repository_test.dart +++ b/mobile/test/infrastructure/repositories/store_repository_test.dart @@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:immich_mobile/domain/interfaces/store.interface.dart'; import 'package:immich_mobile/domain/models/store.model.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/infrastructure/entities/store.entity.dart'; import 'package:immich_mobile/infrastructure/repositories/store.repository.dart'; import 'package:isar/isar.dart'; @@ -86,7 +86,7 @@ void main() { }); test('converts user', () async { - User? user = await sut.tryGet(StoreKey.currentUser); + UserDto? user = await sut.tryGet(StoreKey.currentUser); expect(user, isNull); await sut.insert(StoreKey.currentUser, _kTestUser); user = await sut.tryGet(StoreKey.currentUser); diff --git a/mobile/test/infrastructure/repository.mock.dart b/mobile/test/infrastructure/repository.mock.dart index 3e33fdac0a..ccae209e4a 100644 --- a/mobile/test/infrastructure/repository.mock.dart +++ b/mobile/test/infrastructure/repository.mock.dart @@ -1,7 +1,14 @@ import 'package:immich_mobile/domain/interfaces/log.interface.dart'; import 'package:immich_mobile/domain/interfaces/store.interface.dart'; +import 'package:immich_mobile/domain/interfaces/user.interface.dart'; +import 'package:immich_mobile/domain/interfaces/user_api.repository.dart'; import 'package:mocktail/mocktail.dart'; class MockStoreRepository extends Mock implements IStoreRepository {} class MockLogRepository extends Mock implements ILogRepository {} + +class MockUserRepository extends Mock implements IUserRepository {} + +// API Repos +class MockUserApiRepository extends Mock implements IUserApiRepository {} diff --git a/mobile/test/modules/activity/activities_page_test.dart b/mobile/test/modules/activity/activities_page_test.dart index 6b20692bcd..cf9238d205 100644 --- a/mobile/test/modules/activity/activities_page_test.dart +++ b/mobile/test/modules/activity/activities_page_test.dart @@ -9,7 +9,7 @@ import 'package:immich_mobile/domain/services/store.service.dart'; import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart'; import 'package:immich_mobile/infrastructure/repositories/store.repository.dart'; import 'package:immich_mobile/models/activities/activity.model.dart'; import 'package:immich_mobile/pages/common/activities.page.dart'; @@ -96,7 +96,7 @@ void main() { await db.writeTxn(() async { await db.clear(); // Save all assets - await db.users.put(UserStub.admin); + await db.users.put(User.fromDto(UserStub.admin)); await db.assets.putAll([AssetStub.image1, AssetStub.image2]); await db.albums.put(AlbumStub.twoAsset); await AlbumStub.twoAsset.owner.save(); diff --git a/mobile/test/modules/shared/shared_mocks.dart b/mobile/test/modules/shared/shared_mocks.dart index 013232da3e..f50fde7040 100644 --- a/mobile/test/modules/shared/shared_mocks.dart +++ b/mobile/test/modules/shared/shared_mocks.dart @@ -1,13 +1,13 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/providers/user.provider.dart'; import 'package:mocktail/mocktail.dart'; -class MockCurrentUserProvider extends StateNotifier +class MockCurrentUserProvider extends StateNotifier with Mock implements CurrentUserProvider { MockCurrentUserProvider() : super(null); @override - set state(User? user) => super.state = user; + set state(UserDto? user) => super.state = user; } diff --git a/mobile/test/modules/shared/sync_service_test.dart b/mobile/test/modules/shared/sync_service_test.dart index a58de21613..f74c815997 100644 --- a/mobile/test/modules/shared/sync_service_test.dart +++ b/mobile/test/modules/shared/sync_service_test.dart @@ -1,19 +1,21 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:immich_mobile/domain/interfaces/user.interface.dart'; import 'package:immich_mobile/domain/models/store.model.dart'; +import 'package:immich_mobile/domain/models/user.model.dart'; import 'package:immich_mobile/domain/services/log.service.dart'; import 'package:immich_mobile/domain/services/store.service.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/etag.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/infrastructure/repositories/log.repository.dart'; import 'package:immich_mobile/infrastructure/repositories/store.repository.dart'; import 'package:immich_mobile/interfaces/asset.interface.dart'; -import 'package:immich_mobile/interfaces/user.interface.dart'; +import 'package:immich_mobile/interfaces/partner_api.interface.dart'; import 'package:immich_mobile/services/sync.service.dart'; import 'package:mocktail/mocktail.dart'; +import '../../infrastructure/repository.mock.dart'; import '../../repository.mocks.dart'; import '../../service.mocks.dart'; import '../../test_utils.dart'; @@ -56,8 +58,13 @@ void main() { final MockAlbumMediaRepository albumMediaRepository = MockAlbumMediaRepository(); final MockAlbumApiRepository albumApiRepository = MockAlbumApiRepository(); - final owner = User( - id: "1", + final MockPartnerApiRepository partnerApiRepository = + MockPartnerApiRepository(); + final MockUserApiRepository userApiRepository = MockUserApiRepository(); + final MockPartnerRepository partnerRepository = MockPartnerRepository(); + + final owner = UserDto( + uid: "1", updatedAt: DateTime.now(), email: "a@b.c", name: "first last", @@ -92,21 +99,24 @@ void main() { albumRepository, assetRepository, exifInfoRepository, + partnerRepository, userRepository, + StoreService.I, eTagRepository, + partnerApiRepository, + userApiRepository, ); - when(() => eTagRepository.get(owner.isarId)) - .thenAnswer((_) async => ETag(id: owner.id, time: DateTime.now())); + when(() => eTagRepository.get(owner.id)) + .thenAnswer((_) async => ETag(id: owner.uid, time: DateTime.now())); when(() => eTagRepository.deleteByIds(["1"])).thenAnswer((_) async {}); when(() => eTagRepository.upsertAll(any())).thenAnswer((_) async {}); - when(() => userRepository.me()).thenAnswer((_) async => owner); - when(() => userRepository.getAll(sortBy: UserSort.id)) - .thenAnswer((_) async => [owner]); - when(() => userRepository.getAllAccessible()) + when(() => partnerRepository.getSharedWith()).thenAnswer((_) async => []); + when(() => userRepository.getAll(sortBy: SortUserBy.id)) .thenAnswer((_) async => [owner]); + when(() => userRepository.getAll()).thenAnswer((_) async => [owner]); when( () => assetRepository.getAll( - ownerId: owner.isarId, + ownerId: owner.id, sortBy: AssetSort.checksum, ), ).thenAnswer((_) async => initialAssets); @@ -122,6 +132,10 @@ void main() { when(() => assetRepository.transaction(any())).thenAnswer( (call) => (call.positionalArguments.first as Function).call(), ); + when(() => userApiRepository.getAll()).thenAnswer((_) async => [owner]); + registerFallbackValue(Direction.sharedByMe); + when(() => partnerApiRepository.getAll(any())) + .thenAnswer((_) async => []); }); test('test inserting existing assets', () async { final List remoteAssets = [ @@ -133,7 +147,6 @@ void main() { users: [owner], getChangedAssets: _failDiff, loadAssets: (u, d) => remoteAssets, - refreshUsers: () => [owner], ); expect(c1, isFalse); verifyNever(() => assetRepository.updateAll(any())); @@ -152,7 +165,6 @@ void main() { users: [owner], getChangedAssets: _failDiff, loadAssets: (u, d) => remoteAssets, - refreshUsers: () => [owner], ); expect(c1, isTrue); final updatedAsset = initialAssets[3].updatedCopy(remoteAssets[3]); @@ -175,12 +187,11 @@ void main() { users: [owner], getChangedAssets: _failDiff, loadAssets: (u, d) => remoteAssets, - refreshUsers: () => [owner], ); expect(c1, isTrue); when( () => assetRepository.getAll( - ownerId: owner.isarId, + ownerId: owner.id, sortBy: AssetSort.checksum, ), ).thenAnswer((_) async => remoteAssets); @@ -188,13 +199,12 @@ void main() { users: [owner], getChangedAssets: _failDiff, loadAssets: (u, d) => remoteAssets, - refreshUsers: () => [owner], ); expect(c2, isFalse); final currentState = [...remoteAssets]; when( () => assetRepository.getAll( - ownerId: owner.isarId, + ownerId: owner.id, sortBy: AssetSort.checksum, ), ).thenAnswer((_) async => currentState); @@ -203,7 +213,6 @@ void main() { users: [owner], getChangedAssets: _failDiff, loadAssets: (u, d) => remoteAssets, - refreshUsers: () => [owner], ); expect(c3, isTrue); remoteAssets.add(makeAsset(checksum: "k", remoteId: "2-1e")); @@ -212,7 +221,6 @@ void main() { users: [owner], getChangedAssets: _failDiff, loadAssets: (u, d) => remoteAssets, - refreshUsers: () => [owner], ); expect(c4, isTrue); }); @@ -243,7 +251,6 @@ void main() { users: [owner], getChangedAssets: (user, since) async => (toUpsert, toDelete), loadAssets: (user, date) => throw Exception(), - refreshUsers: () => throw Exception(), ); expect(c, isTrue); verify(() => assetRepository.updateAll(expected)); @@ -252,7 +259,7 @@ void main() { } Future<(List?, List?)> _failDiff( - List user, + List user, DateTime time, ) => Future.value((null, null)); diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart index 7443db2815..e4e99ffcb8 100644 --- a/mobile/test/repository.mocks.dart +++ b/mobile/test/repository.mocks.dart @@ -9,15 +9,14 @@ import 'package:immich_mobile/interfaces/auth_api.interface.dart'; import 'package:immich_mobile/interfaces/backup_album.interface.dart'; import 'package:immich_mobile/interfaces/etag.interface.dart'; import 'package:immich_mobile/interfaces/file_media.interface.dart'; -import 'package:immich_mobile/interfaces/user.interface.dart'; +import 'package:immich_mobile/interfaces/partner_api.interface.dart'; +import 'package:immich_mobile/interfaces/partner.interface.dart'; import 'package:mocktail/mocktail.dart'; class MockAlbumRepository extends Mock implements IAlbumRepository {} class MockAssetRepository extends Mock implements IAssetRepository {} -class MockUserRepository extends Mock implements IUserRepository {} - class MockBackupRepository extends Mock implements IBackupAlbumRepository {} class MockExifInfoRepository extends Mock implements IExifInfoRepository {} @@ -35,3 +34,7 @@ class MockAlbumApiRepository extends Mock implements IAlbumApiRepository {} class MockAuthApiRepository extends Mock implements IAuthApiRepository {} class MockAuthRepository extends Mock implements IAuthRepository {} + +class MockPartnerApiRepository extends Mock implements IPartnerApiRepository {} + +class MockPartnerRepository extends Mock implements IPartnerRepository {} diff --git a/mobile/test/service.mocks.dart b/mobile/test/service.mocks.dart index cc9d657e9e..33c325b105 100644 --- a/mobile/test/service.mocks.dart +++ b/mobile/test/service.mocks.dart @@ -3,14 +3,11 @@ import 'package:immich_mobile/services/entity.service.dart'; import 'package:immich_mobile/services/hash.service.dart'; import 'package:immich_mobile/services/network.service.dart'; import 'package:immich_mobile/services/sync.service.dart'; -import 'package:immich_mobile/services/user.service.dart'; import 'package:mocktail/mocktail.dart'; import 'package:openapi/api.dart'; class MockApiService extends Mock implements ApiService {} -class MockUserService extends Mock implements UserService {} - class MockSyncService extends Mock implements SyncService {} class MockHashService extends Mock implements HashService {} diff --git a/mobile/test/services/album.service_test.dart b/mobile/test/services/album.service_test.dart index 983b355dcb..993456ad99 100644 --- a/mobile/test/services/album.service_test.dart +++ b/mobile/test/services/album.service_test.dart @@ -3,6 +3,7 @@ import 'package:immich_mobile/entities/backup_album.entity.dart'; import 'package:immich_mobile/services/album.service.dart'; import 'package:mocktail/mocktail.dart'; +import '../domain/service.mock.dart'; import '../fixtures/album.stub.dart'; import '../fixtures/asset.stub.dart'; import '../fixtures/user.stub.dart'; @@ -38,7 +39,6 @@ void main() { ); sut = AlbumService( - userService, syncService, entityService, albumRepository, @@ -84,7 +84,7 @@ void main() { group('refreshRemoteAlbums', () { test('is working', () async { - when(() => userService.getUsersFromServer()).thenAnswer((_) async => []); + when(() => syncService.getUsersFromServer()).thenAnswer((_) async => []); when(() => syncService.syncUsersFromServer(any())) .thenAnswer((_) async => true); when(() => albumApiRepository.getAll(shared: true)) @@ -102,7 +102,7 @@ void main() { ).thenAnswer((_) async => true); final result = await sut.refreshRemoteAlbums(); expect(result, true); - verify(() => userService.getUsersFromServer()).called(1); + verify(() => syncService.getUsersFromServer()).called(1); verify(() => syncService.syncUsersFromServer([])).called(1); verify(() => albumApiRepository.getAll(shared: true)).called(1); verify(() => albumApiRepository.getAll(shared: null)).called(1); @@ -146,7 +146,7 @@ void main() { () => albumApiRepository.create( "name", assetIds: [AssetStub.image1.remoteId!], - sharedUserIds: [UserStub.user1.id], + sharedUserIds: [UserStub.user1.uid], ), ).called(1); verify( @@ -204,7 +204,7 @@ void main() { when( () => albumRepository.addUsers( AlbumStub.emptyAlbum, - AlbumStub.emptyAlbum.sharedUsers.toList(), + AlbumStub.emptyAlbum.sharedUsers.map((u) => u.toDto()).toList(), ), ).thenAnswer((_) async => AlbumStub.emptyAlbum); @@ -214,7 +214,7 @@ void main() { final result = await sut.addUsers( AlbumStub.emptyAlbum, - [UserStub.user2.id], + [UserStub.user2.uid], ); expect(result, true); diff --git a/mobile/test/services/entity.service_test.dart b/mobile/test/services/entity.service_test.dart index 8c8b49a7e0..fd99a4faee 100644 --- a/mobile/test/services/entity.service_test.dart +++ b/mobile/test/services/entity.service_test.dart @@ -1,9 +1,12 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:immich_mobile/entities/album.entity.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart'; import 'package:immich_mobile/services/entity.service.dart'; import 'package:mocktail/mocktail.dart'; + import '../fixtures/asset.stub.dart'; import '../fixtures/user.stub.dart'; +import '../infrastructure/repository.mock.dart'; import '../repository.mocks.dart'; void main() { @@ -33,25 +36,32 @@ void main() { ) ..remoteThumbnailAssetId = AssetStub.image1.remoteId ..assets.addAll([AssetStub.image1, AssetStub.image1]) - ..owner.value = UserStub.user1 - ..sharedUsers.addAll([UserStub.admin, UserStub.admin]); + ..owner.value = User.fromDto(UserStub.user1) + ..sharedUsers.addAll( + [User.fromDto(UserStub.admin), User.fromDto(UserStub.admin)], + ); - when(() => userRepository.get(album.ownerId!)) + when(() => userRepository.get(any())) + .thenAnswer((_) async => UserStub.admin); + when(() => userRepository.getByUserId(any())) .thenAnswer((_) async => UserStub.admin); when(() => assetRepository.getByRemoteId(AssetStub.image1.remoteId!)) .thenAnswer((_) async => AssetStub.image1); - when(() => userRepository.getByIds(any())) + when(() => userRepository.getByUserIds(any())) .thenAnswer((_) async => [UserStub.user1, UserStub.user2]); when(() => assetRepository.getAllByRemoteId(any())) .thenAnswer((_) async => [AssetStub.image1, AssetStub.image2]); await sut.fillAlbumWithDatabaseEntities(album); - expect(album.owner.value, UserStub.admin); + expect(album.owner.value?.toDto(), UserStub.admin); expect(album.thumbnail.value, AssetStub.image1); - expect(album.remoteUsers.toSet(), {UserStub.user1, UserStub.user2}); + expect( + album.remoteUsers.map((u) => u.toDto()).toSet(), + {UserStub.user1, UserStub.user2}, + ); expect(album.remoteAssets.toSet(), {AssetStub.image1, AssetStub.image2}); }); diff --git a/mobile/test/test_utils.dart b/mobile/test/test_utils.dart index 19b2d6e705..a5a89a2440 100644 --- a/mobile/test/test_utils.dart +++ b/mobile/test/test_utils.dart @@ -12,10 +12,10 @@ import 'package:immich_mobile/entities/backup_album.entity.dart'; import 'package:immich_mobile/entities/duplicated_asset.entity.dart'; import 'package:immich_mobile/entities/etag.entity.dart'; import 'package:immich_mobile/entities/ios_device_asset.entity.dart'; -import 'package:immich_mobile/entities/user.entity.dart'; import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'; import 'package:immich_mobile/infrastructure/entities/log.entity.dart'; import 'package:immich_mobile/infrastructure/entities/store.entity.dart'; +import 'package:immich_mobile/infrastructure/entities/user.entity.dart'; import 'package:isar/isar.dart'; import 'package:mocktail/mocktail.dart'; diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json index d503e565df..49c6c6ef30 100644 --- a/open-api/immich-openapi-specs.json +++ b/open-api/immich-openapi-specs.json @@ -9918,7 +9918,8 @@ "tag-cleanup", "user-cleanup", "memory-cleanup", - "memory-create" + "memory-create", + "backup-database" ], "type": "string" }, diff --git a/open-api/typescript-sdk/package-lock.json b/open-api/typescript-sdk/package-lock.json index 37c8519bbe..149c1ed2ce 100644 --- a/open-api/typescript-sdk/package-lock.json +++ b/open-api/typescript-sdk/package-lock.json @@ -12,7 +12,7 @@ "@oazapfts/runtime": "^1.0.2" }, "devDependencies": { - "@types/node": "^22.13.5", + "@types/node": "^22.13.9", "typescript": "^5.3.3" } }, @@ -23,9 +23,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.13.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.8.tgz", - "integrity": "sha512-G3EfaZS+iOGYWLLRCEAXdWK9my08oHNZ+FHluRiggIYJPOXzhOiDgpVCUHaUvyIC5/fj7C/p637jdzC666AOKQ==", + "version": "22.13.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz", + "integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==", "dev": true, "license": "MIT", "dependencies": { diff --git a/open-api/typescript-sdk/package.json b/open-api/typescript-sdk/package.json index dfc4e63b0a..b3fef2a87e 100644 --- a/open-api/typescript-sdk/package.json +++ b/open-api/typescript-sdk/package.json @@ -19,7 +19,7 @@ "@oazapfts/runtime": "^1.0.2" }, "devDependencies": { - "@types/node": "^22.13.5", + "@types/node": "^22.13.9", "typescript": "^5.3.3" }, "repository": { diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts index 85f80eec99..4c058371f4 100644 --- a/open-api/typescript-sdk/src/fetch-client.ts +++ b/open-api/typescript-sdk/src/fetch-client.ts @@ -3580,7 +3580,8 @@ export enum ManualJobName { TagCleanup = "tag-cleanup", UserCleanup = "user-cleanup", MemoryCleanup = "memory-cleanup", - MemoryCreate = "memory-create" + MemoryCreate = "memory-create", + BackupDatabase = "backup-database" } export enum JobName { ThumbnailGeneration = "thumbnailGeneration", diff --git a/server/Dockerfile b/server/Dockerfile index f46ea8d0e3..83e750a3f9 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,5 +1,5 @@ # dev build -FROM ghcr.io/immich-app/base-server-dev:20250304@sha256:bc8d0c8d5c6d00625d01c84785435383651a9d57cb6cd1b1430cf0bcb58e4a80 AS dev +FROM ghcr.io/immich-app/base-server-dev:20250311@sha256:dd270c9fb535ea4d216241d6984e20ef4b4bc3514658a045e5a1c3821aa44507 AS dev RUN apt-get install --no-install-recommends -yqq tini WORKDIR /usr/src/app @@ -42,7 +42,7 @@ RUN npm run build # prod build -FROM ghcr.io/immich-app/base-server-prod:20250218@sha256:c5980c358dc94b62cac2086edaa1fd1ae855340a0d8e386fd92bc527d8aaadaa +FROM ghcr.io/immich-app/base-server-prod:20250311@sha256:8c96b3df2161806c9dd6032356ca04c28d374057462b3964c8e8d3cc35c035ee WORKDIR /usr/src/app ENV NODE_ENV=production \ diff --git a/server/package-lock.json b/server/package-lock.json index 22b66318cd..fbb997da59 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -17,7 +17,6 @@ "@nestjs/platform-socket.io": "^11.0.4", "@nestjs/schedule": "^5.0.0", "@nestjs/swagger": "^11.0.2", - "@nestjs/typeorm": "^11.0.0", "@nestjs/websockets": "^11.0.4", "@opentelemetry/auto-instrumentations-node": "^0.56.0", "@opentelemetry/context-async-hooks": "^1.24.0", @@ -89,7 +88,7 @@ "@types/lodash": "^4.14.197", "@types/mock-fs": "^4.13.1", "@types/multer": "^1.4.7", - "@types/node": "^22.13.5", + "@types/node": "^22.13.9", "@types/nodemailer": "^6.4.14", "@types/picomatch": "^3.0.0", "@types/pngjs": "^6.0.5", @@ -2920,19 +2919,6 @@ } } }, - "node_modules/@nestjs/typeorm": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@nestjs/typeorm/-/typeorm-11.0.0.tgz", - "integrity": "sha512-SOeUQl70Lb2OfhGkvnh4KXWlsd+zA08RuuQgT7kKbzivngxzSo1Oc7Usu5VxCxACQC9wc2l9esOHILSJeK7rJA==", - "license": "MIT", - "peerDependencies": { - "@nestjs/common": "^10.0.0 || ^11.0.0", - "@nestjs/core": "^10.0.0 || ^11.0.0", - "reflect-metadata": "^0.1.13 || ^0.2.0", - "rxjs": "^7.2.0", - "typeorm": "^0.3.0" - } - }, "node_modules/@nestjs/websockets": { "version": "11.0.11", "resolved": "https://registry.npmjs.org/@nestjs/websockets/-/websockets-11.0.11.tgz", @@ -5830,9 +5816,9 @@ } }, "node_modules/@types/node": { - "version": "22.13.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.9.tgz", - "integrity": "sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==", + "version": "22.13.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz", + "integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==", "license": "MIT", "dependencies": { "undici-types": "~6.20.0" diff --git a/server/package.json b/server/package.json index 34a35d0402..bc12bc67a0 100644 --- a/server/package.json +++ b/server/package.json @@ -43,7 +43,6 @@ "@nestjs/platform-socket.io": "^11.0.4", "@nestjs/schedule": "^5.0.0", "@nestjs/swagger": "^11.0.2", - "@nestjs/typeorm": "^11.0.0", "@nestjs/websockets": "^11.0.4", "@opentelemetry/auto-instrumentations-node": "^0.56.0", "@opentelemetry/context-async-hooks": "^1.24.0", @@ -115,7 +114,7 @@ "@types/lodash": "^4.14.197", "@types/mock-fs": "^4.13.1", "@types/multer": "^1.4.7", - "@types/node": "^22.13.5", + "@types/node": "^22.13.9", "@types/nodemailer": "^6.4.14", "@types/picomatch": "^3.0.0", "@types/pngjs": "^6.0.5", diff --git a/server/src/database.ts b/server/src/database.ts index e899200579..9caa0c196e 100644 --- a/server/src/database.ts +++ b/server/src/database.ts @@ -92,6 +92,17 @@ export type AuthSession = { id: string; }; +export type Partner = { + sharedById: string; + sharedBy: User; + sharedWithId: string; + sharedWith: User; + createdAt: Date; + updatedAt: Date; + updateId: string; + inTimeline: boolean; +}; + export const columns = { ackEpoch: (columnName: 'createdAt' | 'updatedAt' | 'deletedAt') => sql.raw(`extract(epoch from "${columnName}")::text`).as('ackEpoch'), diff --git a/server/src/dtos/user.dto.ts b/server/src/dtos/user.dto.ts index 03895aa880..5b7784aa3d 100644 --- a/server/src/dtos/user.dto.ts +++ b/server/src/dtos/user.dto.ts @@ -1,6 +1,7 @@ import { ApiProperty } from '@nestjs/swagger'; import { Transform } from 'class-transformer'; import { IsBoolean, IsEmail, IsNotEmpty, IsNumber, IsPositive, IsString } from 'class-validator'; +import { User } from 'src/database'; import { UserMetadataEntity } from 'src/entities/user-metadata.entity'; import { UserEntity } from 'src/entities/user.entity'; import { UserAvatarColor, UserMetadataKey, UserStatus } from 'src/enum'; @@ -52,6 +53,17 @@ export const mapUser = (entity: UserEntity): UserResponseDto => { }; }; +export const mapDatabaseUser = (user: User): UserResponseDto => { + return { + id: user.id, + email: user.email, + name: user.name, + profileImagePath: user.profileImagePath, + avatarColor: getPreferences(user.email, []).avatar.color, + profileChangedAt: user.profileChangedAt, + }; +}; + export class UserAdminSearchDto { @ValidateBoolean({ optional: true }) withDeleted?: boolean; diff --git a/server/src/entities/partner.entity.ts b/server/src/entities/partner.entity.ts index 877330a8e7..5326757736 100644 --- a/server/src/entities/partner.entity.ts +++ b/server/src/entities/partner.entity.ts @@ -10,6 +10,7 @@ import { UpdateDateColumn, } from 'typeorm'; +/** @deprecated delete after coming up with a migration workflow for kysely */ @Entity('partners') export class PartnerEntity { @PrimaryColumn('uuid') diff --git a/server/src/enum.ts b/server/src/enum.ts index 55e435a70b..6ebd1906f7 100644 --- a/server/src/enum.ts +++ b/server/src/enum.ts @@ -237,6 +237,7 @@ export enum ManualJobName { USER_CLEANUP = 'user-cleanup', MEMORY_CLEANUP = 'memory-cleanup', MEMORY_CREATE = 'memory-create', + BACKUP_DATABASE = 'backup-database', } export enum AssetPathType { diff --git a/server/src/repositories/notification.repository.spec.ts b/server/src/repositories/notification.repository.spec.ts index 6253697087..6d17501d03 100644 --- a/server/src/repositories/notification.repository.spec.ts +++ b/server/src/repositories/notification.repository.spec.ts @@ -1,11 +1,12 @@ +import { LoggingRepository } from 'src/repositories/logging.repository'; import { EmailRenderRequest, EmailTemplate, NotificationRepository } from 'src/repositories/notification.repository'; -import { newFakeLoggingRepository } from 'test/repositories/logger.repository.mock'; +import { automock } from 'test/utils'; describe(NotificationRepository.name, () => { let sut: NotificationRepository; beforeEach(() => { - sut = new NotificationRepository(newFakeLoggingRepository()); + sut = new NotificationRepository(automock(LoggingRepository, { args: [, { getEnv: () => ({}) }], strict: false })); }); describe('renderEmail', () => { diff --git a/server/src/repositories/partner.repository.ts b/server/src/repositories/partner.repository.ts index f799ff56f2..8877185d31 100644 --- a/server/src/repositories/partner.repository.ts +++ b/server/src/repositories/partner.repository.ts @@ -1,10 +1,10 @@ import { Injectable } from '@nestjs/common'; -import { ExpressionBuilder, Insertable, JoinBuilder, Kysely, Updateable } from 'kysely'; +import { ExpressionBuilder, Insertable, Kysely, Updateable } from 'kysely'; import { jsonObjectFrom } from 'kysely/helpers/postgres'; import { InjectKysely } from 'nestjs-kysely'; -import { DB, Partners, Users } from 'src/db'; +import { columns, Partner } from 'src/database'; +import { DB, Partners } from 'src/db'; import { DummyValue, GenerateSql } from 'src/decorators'; -import { PartnerEntity } from 'src/entities/partner.entity'; export interface PartnerIds { sharedById: string; @@ -16,23 +16,18 @@ export enum PartnerDirection { SharedWith = 'shared-with', } -const columns = ['id', 'name', 'email', 'profileImagePath', 'profileChangedAt'] as const; - -const onSharedBy = (join: JoinBuilder) => - join.onRef('partners.sharedById', '=', 'sharedBy.id').on('sharedBy.deletedAt', 'is', null); - -const onSharedWith = (join: JoinBuilder) => - join.onRef('partners.sharedWithId', '=', 'sharedWith.id').on('sharedWith.deletedAt', 'is', null); - const withSharedBy = (eb: ExpressionBuilder) => { return jsonObjectFrom( - eb.selectFrom('users as sharedBy').select(columns).whereRef('sharedBy.id', '=', 'partners.sharedById'), + eb.selectFrom('users as sharedBy').select(columns.userDto).whereRef('sharedBy.id', '=', 'partners.sharedById'), ).as('sharedBy'); }; const withSharedWith = (eb: ExpressionBuilder) => { return jsonObjectFrom( - eb.selectFrom('users as sharedWith').select(columns).whereRef('sharedWith.id', '=', 'partners.sharedWithId'), + eb + .selectFrom('users as sharedWith') + .select(columns.userDto) + .whereRef('sharedWith.id', '=', 'partners.sharedWithId'), ).as('sharedWith'); }; @@ -41,45 +36,33 @@ export class PartnerRepository { constructor(@InjectKysely() private db: Kysely) {} @GenerateSql({ params: [DummyValue.UUID] }) - getAll(userId: string): Promise { - return this.db - .selectFrom('partners') - .innerJoin('users as sharedBy', onSharedBy) - .innerJoin('users as sharedWith', onSharedWith) - .selectAll('partners') - .select(withSharedBy) - .select(withSharedWith) + getAll(userId: string) { + return this.builder() .where((eb) => eb.or([eb('sharedWithId', '=', userId), eb('sharedById', '=', userId)])) - .execute() as Promise; + .execute(); } @GenerateSql({ params: [{ sharedWithId: DummyValue.UUID, sharedById: DummyValue.UUID }] }) - get({ sharedWithId, sharedById }: PartnerIds): Promise { - return this.db - .selectFrom('partners') - .innerJoin('users as sharedBy', onSharedBy) - .innerJoin('users as sharedWith', onSharedWith) - .selectAll('partners') - .select(withSharedBy) - .select(withSharedWith) + get({ sharedWithId, sharedById }: PartnerIds) { + return this.builder() .where('sharedWithId', '=', sharedWithId) .where('sharedById', '=', sharedById) - .executeTakeFirst() as unknown as Promise; + .executeTakeFirst() as Promise; } @GenerateSql({ params: [{ sharedWithId: DummyValue.UUID, sharedById: DummyValue.UUID }] }) - create(values: Insertable): Promise { + create(values: Insertable) { return this.db .insertInto('partners') .values(values) .returningAll() .returning(withSharedBy) .returning(withSharedWith) - .executeTakeFirstOrThrow() as unknown as Promise; + .executeTakeFirstOrThrow() as Promise; } @GenerateSql({ params: [{ sharedWithId: DummyValue.UUID, sharedById: DummyValue.UUID }, { inTimeline: true }] }) - update({ sharedWithId, sharedById }: PartnerIds, values: Updateable): Promise { + update({ sharedWithId, sharedById }: PartnerIds, values: Updateable) { return this.db .updateTable('partners') .set(values) @@ -88,15 +71,29 @@ export class PartnerRepository { .returningAll() .returning(withSharedBy) .returning(withSharedWith) - .executeTakeFirstOrThrow() as unknown as Promise; + .executeTakeFirstOrThrow() as Promise; } @GenerateSql({ params: [{ sharedWithId: DummyValue.UUID, sharedById: DummyValue.UUID }] }) - async remove({ sharedWithId, sharedById }: PartnerIds): Promise { + async remove({ sharedWithId, sharedById }: PartnerIds) { await this.db .deleteFrom('partners') .where('sharedWithId', '=', sharedWithId) .where('sharedById', '=', sharedById) .execute(); } + + private builder() { + return this.db + .selectFrom('partners') + .innerJoin('users as sharedBy', (join) => + join.onRef('partners.sharedById', '=', 'sharedBy.id').on('sharedBy.deletedAt', 'is', null), + ) + .innerJoin('users as sharedWith', (join) => + join.onRef('partners.sharedWithId', '=', 'sharedWith.id').on('sharedWith.deletedAt', 'is', null), + ) + .selectAll('partners') + .select(withSharedBy) + .select(withSharedWith); + } } diff --git a/server/src/repositories/storage.repository.spec.ts b/server/src/repositories/storage.repository.spec.ts index 93b21a7f9b..85ff4a746f 100644 --- a/server/src/repositories/storage.repository.spec.ts +++ b/server/src/repositories/storage.repository.spec.ts @@ -1,7 +1,8 @@ import mockfs from 'mock-fs'; import { CrawlOptionsDto } from 'src/dtos/library.dto'; +import { LoggingRepository } from 'src/repositories/logging.repository'; import { StorageRepository } from 'src/repositories/storage.repository'; -import { newFakeLoggingRepository } from 'test/repositories/logger.repository.mock'; +import { automock } from 'test/utils'; interface Test { test: string; @@ -182,7 +183,7 @@ describe(StorageRepository.name, () => { let sut: StorageRepository; beforeEach(() => { - sut = new StorageRepository(newFakeLoggingRepository()); + sut = new StorageRepository(automock(LoggingRepository, { args: [, { getEnv: () => ({}) }], strict: false })); }); afterEach(() => { diff --git a/server/src/services/activity.service.spec.ts b/server/src/services/activity.service.spec.ts index 368c8f2575..1e5bb3b505 100644 --- a/server/src/services/activity.service.spec.ts +++ b/server/src/services/activity.service.spec.ts @@ -146,6 +146,7 @@ describe(ActivityService.name, () => { const activity = factory.activity(); mocks.access.activity.checkOwnerAccess.mockResolvedValue(new Set([activity.id])); + mocks.activity.delete.mockResolvedValue(); await sut.delete(factory.auth(), activity.id); @@ -156,6 +157,7 @@ describe(ActivityService.name, () => { const activity = factory.activity(); mocks.access.activity.checkAlbumOwnerAccess.mockResolvedValue(new Set([activity.id])); + mocks.activity.delete.mockResolvedValue(); await sut.delete(factory.auth(), activity.id); diff --git a/server/src/services/album.service.spec.ts b/server/src/services/album.service.spec.ts index 832ed59dd5..62d1326cab 100644 --- a/server/src/services/album.service.spec.ts +++ b/server/src/services/album.service.spec.ts @@ -347,6 +347,7 @@ describe(AlbumService.name, () => { it('should remove a shared user from an owned album', async () => { mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.sharedWithUser.id])); mocks.album.getById.mockResolvedValue(albumStub.sharedWithUser); + mocks.albumUser.delete.mockResolvedValue(); await expect( sut.removeUser(authStub.admin, albumStub.sharedWithUser.id, userStub.user1.id), @@ -376,6 +377,7 @@ describe(AlbumService.name, () => { it('should allow a shared user to remove themselves', async () => { mocks.album.getById.mockResolvedValue(albumStub.sharedWithUser); + mocks.albumUser.delete.mockResolvedValue(); await sut.removeUser(authStub.user1, albumStub.sharedWithUser.id, authStub.user1.user.id); @@ -388,6 +390,7 @@ describe(AlbumService.name, () => { it('should allow a shared user to remove themselves using "me"', async () => { mocks.album.getById.mockResolvedValue(albumStub.sharedWithUser); + mocks.albumUser.delete.mockResolvedValue(); await sut.removeUser(authStub.user1, albumStub.sharedWithUser.id, 'me'); @@ -422,6 +425,8 @@ describe(AlbumService.name, () => { describe('updateUser', () => { it('should update user role', async () => { mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.sharedWithAdmin.id])); + mocks.albumUser.update.mockResolvedValue(null as any); + await sut.updateUser(authStub.user1, albumStub.sharedWithAdmin.id, userStub.admin.id, { role: AlbumUserRole.EDITOR, }); diff --git a/server/src/services/api-key.service.spec.ts b/server/src/services/api-key.service.spec.ts index 53266b493e..0a89c04b0d 100644 --- a/server/src/services/api-key.service.spec.ts +++ b/server/src/services/api-key.service.spec.ts @@ -67,6 +67,8 @@ describe(ApiKeyService.name, () => { const id = newUuid(); const auth = factory.auth(); + mocks.apiKey.getById.mockResolvedValue(void 0); + await expect(sut.update(auth, id, { name: 'New Name' })).rejects.toBeInstanceOf(BadRequestException); expect(mocks.apiKey.update).not.toHaveBeenCalledWith(id); @@ -91,6 +93,8 @@ describe(ApiKeyService.name, () => { const auth = factory.auth(); const id = newUuid(); + mocks.apiKey.getById.mockResolvedValue(void 0); + await expect(sut.delete(auth, id)).rejects.toBeInstanceOf(BadRequestException); expect(mocks.apiKey.delete).not.toHaveBeenCalledWith(id); @@ -101,6 +105,7 @@ describe(ApiKeyService.name, () => { const apiKey = factory.apiKey({ userId: auth.user.id }); mocks.apiKey.getById.mockResolvedValue(apiKey); + mocks.apiKey.delete.mockResolvedValue(); await sut.delete(auth, apiKey.id); @@ -113,6 +118,8 @@ describe(ApiKeyService.name, () => { const auth = factory.auth(); const id = newUuid(); + mocks.apiKey.getById.mockResolvedValue(void 0); + await expect(sut.getById(auth, id)).rejects.toBeInstanceOf(BadRequestException); expect(mocks.apiKey.getById).toHaveBeenCalledWith(auth.user.id, id); diff --git a/server/src/services/asset.service.spec.ts b/server/src/services/asset.service.spec.ts index 9286008581..5e7e2d79d0 100755 --- a/server/src/services/asset.service.spec.ts +++ b/server/src/services/asset.service.spec.ts @@ -9,7 +9,6 @@ import { AssetService } from 'src/services/asset.service'; import { assetStub } from 'test/fixtures/asset.stub'; import { authStub } from 'test/fixtures/auth.stub'; import { faceStub } from 'test/fixtures/face.stub'; -import { partnerStub } from 'test/fixtures/partner.stub'; import { userStub } from 'test/fixtures/user.stub'; import { factory } from 'test/small.factory'; import { makeStream, newTestService, ServiceMocks } from 'test/utils'; @@ -88,13 +87,16 @@ describe(AssetService.name, () => { }); it('should get memories with partners with inTimeline enabled', async () => { - mocks.partner.getAll.mockResolvedValue([partnerStub.user1ToAdmin1]); + const partner = factory.partner(); + const auth = factory.auth({ id: partner.sharedWithId }); + + mocks.partner.getAll.mockResolvedValue([partner]); mocks.asset.getByDayOfYear.mockResolvedValue([]); - await sut.getMemoryLane(authStub.admin, { day: 15, month: 1 }); + await sut.getMemoryLane(auth, { day: 15, month: 1 }); expect(mocks.asset.getByDayOfYear.mock.calls).toEqual([ - [[authStub.admin.user.id, userStub.user1.id], { day: 15, month: 1 }], + [[auth.user.id, partner.sharedById], { day: 15, month: 1 }], ]); }); }); @@ -127,23 +129,36 @@ describe(AssetService.name, () => { describe('getRandom', () => { it('should get own random assets', async () => { + mocks.partner.getAll.mockResolvedValue([]); mocks.asset.getRandom.mockResolvedValue([assetStub.image]); + await sut.getRandom(authStub.admin, 1); + expect(mocks.asset.getRandom).toHaveBeenCalledWith([authStub.admin.user.id], 1); }); it('should not include partner assets if not in timeline', async () => { + const partner = factory.partner({ inTimeline: false }); + const auth = factory.auth({ id: partner.sharedWithId }); + mocks.asset.getRandom.mockResolvedValue([assetStub.image]); - mocks.partner.getAll.mockResolvedValue([{ ...partnerStub.user1ToAdmin1, inTimeline: false }]); - await sut.getRandom(authStub.admin, 1); - expect(mocks.asset.getRandom).toHaveBeenCalledWith([authStub.admin.user.id], 1); + mocks.partner.getAll.mockResolvedValue([partner]); + + await sut.getRandom(auth, 1); + + expect(mocks.asset.getRandom).toHaveBeenCalledWith([auth.user.id], 1); }); it('should include partner assets if in timeline', async () => { + const partner = factory.partner({ inTimeline: true }); + const auth = factory.auth({ id: partner.sharedWithId }); + mocks.asset.getRandom.mockResolvedValue([assetStub.image]); - mocks.partner.getAll.mockResolvedValue([partnerStub.user1ToAdmin1]); - await sut.getRandom(authStub.admin, 1); - expect(mocks.asset.getRandom).toHaveBeenCalledWith([userStub.admin.id, userStub.user1.id], 1); + mocks.partner.getAll.mockResolvedValue([partner]); + + await sut.getRandom(auth, 1); + + expect(mocks.asset.getRandom).toHaveBeenCalledWith([auth.user.id, partner.sharedById], 1); }); }); @@ -151,7 +166,9 @@ describe(AssetService.name, () => { it('should allow owner access', async () => { mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id])); mocks.asset.getById.mockResolvedValue(assetStub.image); + await sut.get(authStub.admin, assetStub.image.id); + expect(mocks.access.asset.checkOwnerAccess).toHaveBeenCalledWith( authStub.admin.user.id, new Set([assetStub.image.id]), @@ -161,7 +178,9 @@ describe(AssetService.name, () => { it('should allow shared link access', async () => { mocks.access.asset.checkSharedLinkAccess.mockResolvedValue(new Set([assetStub.image.id])); mocks.asset.getById.mockResolvedValue(assetStub.image); + await sut.get(authStub.adminSharedLink, assetStub.image.id); + expect(mocks.access.asset.checkSharedLinkAccess).toHaveBeenCalledWith( authStub.adminSharedLink.sharedLink?.id, new Set([assetStub.image.id]), @@ -188,7 +207,9 @@ describe(AssetService.name, () => { it('should allow partner sharing access', async () => { mocks.access.asset.checkPartnerAccess.mockResolvedValue(new Set([assetStub.image.id])); mocks.asset.getById.mockResolvedValue(assetStub.image); + await sut.get(authStub.admin, assetStub.image.id); + expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith( authStub.admin.user.id, new Set([assetStub.image.id]), @@ -198,7 +219,9 @@ describe(AssetService.name, () => { it('should allow shared album access', async () => { mocks.access.asset.checkAlbumAccess.mockResolvedValue(new Set([assetStub.image.id])); mocks.asset.getById.mockResolvedValue(assetStub.image); + await sut.get(authStub.admin, assetStub.image.id); + expect(mocks.access.asset.checkAlbumAccess).toHaveBeenCalledWith( authStub.admin.user.id, new Set([assetStub.image.id]), @@ -207,17 +230,20 @@ describe(AssetService.name, () => { it('should throw an error for no access', async () => { await expect(sut.get(authStub.admin, assetStub.image.id)).rejects.toBeInstanceOf(BadRequestException); + expect(mocks.asset.getById).not.toHaveBeenCalled(); }); it('should throw an error for an invalid shared link', async () => { await expect(sut.get(authStub.adminSharedLink, assetStub.image.id)).rejects.toBeInstanceOf(BadRequestException); + expect(mocks.access.asset.checkOwnerAccess).not.toHaveBeenCalled(); expect(mocks.asset.getById).not.toHaveBeenCalled(); }); it('should throw an error if the asset could not be found', async () => { mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id])); + await expect(sut.get(authStub.admin, assetStub.image.id)).rejects.toBeInstanceOf(BadRequestException); }); }); @@ -227,6 +253,7 @@ describe(AssetService.name, () => { await expect(sut.update(authStub.admin, 'asset-1', { isArchived: false })).rejects.toBeInstanceOf( BadRequestException, ); + expect(mocks.asset.update).not.toHaveBeenCalled(); }); @@ -256,6 +283,7 @@ describe(AssetService.name, () => { mocks.asset.update.mockResolvedValueOnce(assetStub.image); await sut.update(authStub.admin, 'asset-1', { rating: 3 }); + expect(mocks.asset.upsertExif).toHaveBeenCalledWith({ assetId: 'asset-1', rating: 3 }); }); @@ -398,12 +426,15 @@ describe(AssetService.name, () => { it('should update all assets', async () => { mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2'])); + await sut.updateAll(authStub.admin, { ids: ['asset-1', 'asset-2'], isArchived: true }); + expect(mocks.asset.updateAll).toHaveBeenCalledWith(['asset-1', 'asset-2'], { isArchived: true }); }); it('should not update Assets table if no relevant fields are provided', async () => { mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1'])); + await sut.updateAll(authStub.admin, { ids: ['asset-1'], latitude: 0, @@ -418,6 +449,7 @@ describe(AssetService.name, () => { it('should update Assets table if isArchived field is provided', async () => { mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1'])); + await sut.updateAll(authStub.admin, { ids: ['asset-1'], latitude: 0, @@ -531,6 +563,7 @@ describe(AssetService.name, () => { }); it('should update stack primary asset if deleted asset was primary asset in a stack', async () => { + mocks.stack.update.mockResolvedValue(factory.stack() as unknown as any); mocks.asset.getById.mockResolvedValue(assetStub.primaryImage as AssetEntity); await sut.handleAssetDeletion({ id: assetStub.primaryImage.id, deleteOnDisk: true }); @@ -542,6 +575,7 @@ describe(AssetService.name, () => { }); it('should delete the entire stack if deleted asset was the primary asset and the stack would only contain one asset afterwards', async () => { + mocks.stack.delete.mockResolvedValue(); mocks.asset.getById.mockResolvedValue({ ...assetStub.primaryImage, stack: { ...assetStub.primaryImage.stack, assets: assetStub.primaryImage.stack!.assets.slice(0, 2) }, @@ -619,25 +653,33 @@ describe(AssetService.name, () => { describe('run', () => { it('should run the refresh faces job', async () => { mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1'])); + await sut.run(authStub.admin, { assetIds: ['asset-1'], name: AssetJobName.REFRESH_FACES }); + expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.FACE_DETECTION, data: { id: 'asset-1' } }]); }); it('should run the refresh metadata job', async () => { mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1'])); + await sut.run(authStub.admin, { assetIds: ['asset-1'], name: AssetJobName.REFRESH_METADATA }); + expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.METADATA_EXTRACTION, data: { id: 'asset-1' } }]); }); it('should run the refresh thumbnails job', async () => { mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1'])); + await sut.run(authStub.admin, { assetIds: ['asset-1'], name: AssetJobName.REGENERATE_THUMBNAIL }); + expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.GENERATE_THUMBNAILS, data: { id: 'asset-1' } }]); }); it('should run the transcode video', async () => { mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1'])); + await sut.run(authStub.admin, { assetIds: ['asset-1'], name: AssetJobName.TRANSCODE_VIDEO }); + expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.VIDEO_CONVERSION, data: { id: 'asset-1' } }]); }); }); diff --git a/server/src/services/audit.service.spec.ts b/server/src/services/audit.service.spec.ts index f5e588cdd0..6ef139f506 100644 --- a/server/src/services/audit.service.spec.ts +++ b/server/src/services/audit.service.spec.ts @@ -18,7 +18,10 @@ describe(AuditService.name, () => { describe('handleCleanup', () => { it('should delete old audit entries', async () => { + mocks.audit.removeBefore.mockResolvedValue(); + await expect(sut.handleCleanup()).resolves.toBe(JobStatus.SUCCESS); + expect(mocks.audit.removeBefore).toHaveBeenCalledWith(expect.any(Date)); }); }); diff --git a/server/src/services/auth.service.spec.ts b/server/src/services/auth.service.spec.ts index 2a3d905275..b1bd3332bf 100644 --- a/server/src/services/auth.service.spec.ts +++ b/server/src/services/auth.service.spec.ts @@ -65,7 +65,10 @@ describe('AuthService', () => { describe('onBootstrap', () => { it('should init the repo', () => { + mocks.oauth.init.mockResolvedValue(); + sut.onBootstrap(); + expect(mocks.oauth.init).toHaveBeenCalled(); }); }); @@ -73,24 +76,30 @@ describe('AuthService', () => { describe('login', () => { it('should throw an error if password login is disabled', async () => { mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.disabled); + await expect(sut.login(fixtures.login, loginDetails)).rejects.toBeInstanceOf(UnauthorizedException); }); it('should check the user exists', async () => { mocks.user.getByEmail.mockResolvedValue(void 0); + await expect(sut.login(fixtures.login, loginDetails)).rejects.toBeInstanceOf(UnauthorizedException); + expect(mocks.user.getByEmail).toHaveBeenCalledTimes(1); }); it('should check the user has a password', async () => { mocks.user.getByEmail.mockResolvedValue({} as UserEntity); + await expect(sut.login(fixtures.login, loginDetails)).rejects.toBeInstanceOf(UnauthorizedException); + expect(mocks.user.getByEmail).toHaveBeenCalledTimes(1); }); it('should successfully log the user in', async () => { mocks.user.getByEmail.mockResolvedValue(userStub.user1); mocks.session.create.mockResolvedValue(sessionStub.valid); + await expect(sut.login(fixtures.login, loginDetails)).resolves.toEqual({ accessToken: 'cmFuZG9tLWJ5dGVz', userId: 'user-id', @@ -100,6 +109,7 @@ describe('AuthService', () => { isAdmin: false, shouldChangePassword: false, }); + expect(mocks.user.getByEmail).toHaveBeenCalledTimes(1); }); }); @@ -159,8 +169,10 @@ describe('AuthService', () => { describe('logout', () => { it('should return the end session endpoint', async () => { + const auth = factory.auth(); + mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.enabled); - const auth = { user: { id: '123' } } as AuthDto; + await expect(sut.logout(auth, AuthType.OAUTH)).resolves.toEqual({ successful: true, redirectUri: 'http://end-session-endpoint', @@ -168,7 +180,7 @@ describe('AuthService', () => { }); it('should return the default redirect', async () => { - const auth = { user: { id: '123' } } as AuthDto; + const auth = factory.auth(); await expect(sut.logout(auth, AuthType.PASSWORD)).resolves.toEqual({ successful: true, @@ -178,6 +190,7 @@ describe('AuthService', () => { it('should delete the access token', async () => { const auth = { user: { id: '123' }, session: { id: 'token123' } } as AuthDto; + mocks.session.delete.mockResolvedValue(); await expect(sut.logout(auth, AuthType.PASSWORD)).resolves.toEqual({ successful: true, @@ -203,7 +216,9 @@ describe('AuthService', () => { it('should only allow one admin', async () => { mocks.user.getAdmin.mockResolvedValue({} as UserEntity); + await expect(sut.adminSignUp(dto)).rejects.toBeInstanceOf(BadRequestException); + expect(mocks.user.getAdmin).toHaveBeenCalled(); }); @@ -215,6 +230,7 @@ describe('AuthService', () => { createdAt: new Date('2021-01-01'), metadata: [] as UserMetadataEntity[], } as UserEntity); + await expect(sut.adminSignUp(dto)).resolves.toMatchObject({ avatarColor: expect.any(String), id: 'admin', @@ -222,6 +238,7 @@ describe('AuthService', () => { email: 'test@immich.com', name: 'immich admin', }); + expect(mocks.user.getAdmin).toHaveBeenCalled(); expect(mocks.user.create).toHaveBeenCalled(); }); @@ -241,6 +258,7 @@ describe('AuthService', () => { it('should validate using authorization header', async () => { mocks.user.get.mockResolvedValue(userStub.user1); mocks.session.getByToken.mockResolvedValue(sessionStub.valid as any); + await expect( sut.authenticate({ headers: { authorization: 'Bearer auth_token' }, @@ -256,6 +274,8 @@ describe('AuthService', () => { describe('validate - shared key', () => { it('should not accept a non-existent key', async () => { + mocks.sharedLink.getByKey.mockResolvedValue(void 0); + await expect( sut.authenticate({ headers: { 'x-immich-share-key': 'key' }, @@ -267,6 +287,7 @@ describe('AuthService', () => { it('should not accept an expired key', async () => { mocks.sharedLink.getByKey.mockResolvedValue(sharedLinkStub.expired); + await expect( sut.authenticate({ headers: { 'x-immich-share-key': 'key' }, @@ -278,6 +299,7 @@ describe('AuthService', () => { it('should not accept a key on a non-shared route', async () => { mocks.sharedLink.getByKey.mockResolvedValue(sharedLinkStub.valid); + await expect( sut.authenticate({ headers: { 'x-immich-share-key': 'key' }, @@ -290,6 +312,7 @@ describe('AuthService', () => { it('should not accept a key without a user', async () => { mocks.sharedLink.getByKey.mockResolvedValue(sharedLinkStub.expired); mocks.user.get.mockResolvedValue(void 0); + await expect( sut.authenticate({ headers: { 'x-immich-share-key': 'key' }, @@ -302,6 +325,7 @@ describe('AuthService', () => { it('should accept a base64url key', async () => { mocks.sharedLink.getByKey.mockResolvedValue(sharedLinkStub.valid); mocks.user.get.mockResolvedValue(userStub.admin); + await expect( sut.authenticate({ headers: { 'x-immich-share-key': sharedLinkStub.valid.key.toString('base64url') }, @@ -318,6 +342,7 @@ describe('AuthService', () => { it('should accept a hex key', async () => { mocks.sharedLink.getByKey.mockResolvedValue(sharedLinkStub.valid); mocks.user.get.mockResolvedValue(userStub.admin); + await expect( sut.authenticate({ headers: { 'x-immich-share-key': sharedLinkStub.valid.key.toString('hex') }, @@ -335,6 +360,7 @@ describe('AuthService', () => { describe('validate - user token', () => { it('should throw if no token is found', async () => { mocks.session.getByToken.mockResolvedValue(void 0); + await expect( sut.authenticate({ headers: { 'x-immich-user-token': 'auth_token' }, @@ -346,6 +372,7 @@ describe('AuthService', () => { it('should return an auth dto', async () => { mocks.session.getByToken.mockResolvedValue(sessionStub.valid as any); + await expect( sut.authenticate({ headers: { cookie: 'immich_access_token=auth_token' }, @@ -360,6 +387,7 @@ describe('AuthService', () => { it('should throw if admin route and not an admin', async () => { mocks.session.getByToken.mockResolvedValue(sessionStub.valid as any); + await expect( sut.authenticate({ headers: { cookie: 'immich_access_token=auth_token' }, @@ -372,6 +400,7 @@ describe('AuthService', () => { it('should update when access time exceeds an hour', async () => { mocks.session.getByToken.mockResolvedValue(sessionStub.inactive as any); mocks.session.update.mockResolvedValue(sessionStub.valid); + await expect( sut.authenticate({ headers: { cookie: 'immich_access_token=auth_token' }, @@ -386,6 +415,7 @@ describe('AuthService', () => { describe('validate - api key', () => { it('should throw an error if no api key is found', async () => { mocks.apiKey.getKey.mockResolvedValue(void 0); + await expect( sut.authenticate({ headers: { 'x-api-key': 'auth_token' }, @@ -401,6 +431,7 @@ describe('AuthService', () => { const authApiKey = factory.authApiKey({ permissions: [] }); mocks.apiKey.getKey.mockResolvedValue({ ...authApiKey, user: authUser }); + await expect( sut.authenticate({ headers: { 'x-api-key': 'auth_token' }, @@ -442,6 +473,7 @@ describe('AuthService', () => { describe('authorize', () => { it('should fail if oauth is disabled', async () => { mocks.systemMetadata.get.mockResolvedValue({ oauth: { enabled: false } }); + await expect(sut.authorize({ redirectUri: 'https://demo.immich.app' })).rejects.toBeInstanceOf( BadRequestException, ); @@ -449,6 +481,7 @@ describe('AuthService', () => { it('should authorize the user', async () => { mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthWithMobileOverride); + await sut.authorize({ redirectUri: 'https://demo.immich.app' }); }); }); @@ -461,9 +494,11 @@ describe('AuthService', () => { it('should not allow auto registering', async () => { mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthEnabled); mocks.user.getByEmail.mockResolvedValue(void 0); + await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).rejects.toBeInstanceOf( BadRequestException, ); + expect(mocks.user.getByEmail).toHaveBeenCalledTimes(1); }); @@ -540,6 +575,7 @@ describe('AuthService', () => { mocks.session.create.mockResolvedValue(sessionStub.valid); await sut.callback({ url }, loginDetails); + expect(mocks.oauth.getProfile).toHaveBeenCalledWith(expect.objectContaining({}), url, 'http://mobile-redirect'); }); } @@ -549,6 +585,7 @@ describe('AuthService', () => { mocks.user.getByEmail.mockResolvedValue(void 0); mocks.user.getAdmin.mockResolvedValue(userStub.user1); mocks.user.create.mockResolvedValue(userStub.user1); + mocks.session.create.mockResolvedValue(factory.session()); await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).resolves.toEqual( oauthResponse, @@ -563,6 +600,7 @@ describe('AuthService', () => { mocks.user.getAdmin.mockResolvedValue(userStub.user1); mocks.user.create.mockResolvedValue(userStub.user1); mocks.oauth.getProfile.mockResolvedValue({ sub, email, immich_quota: 'abc' }); + mocks.session.create.mockResolvedValue(factory.session()); await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).resolves.toEqual( oauthResponse, @@ -577,6 +615,7 @@ describe('AuthService', () => { mocks.user.getAdmin.mockResolvedValue(userStub.user1); mocks.user.create.mockResolvedValue(userStub.user1); mocks.oauth.getProfile.mockResolvedValue({ sub, email, immich_quota: -5 }); + mocks.session.create.mockResolvedValue(factory.session()); await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).resolves.toEqual( oauthResponse, @@ -591,6 +630,7 @@ describe('AuthService', () => { mocks.user.getAdmin.mockResolvedValue(userStub.user1); mocks.user.create.mockResolvedValue(userStub.user1); mocks.oauth.getProfile.mockResolvedValue({ sub, email, immich_quota: 0 }); + mocks.session.create.mockResolvedValue(factory.session()); await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).resolves.toEqual( oauthResponse, @@ -611,6 +651,7 @@ describe('AuthService', () => { mocks.user.getAdmin.mockResolvedValue(userStub.user1); mocks.user.create.mockResolvedValue(userStub.user1); mocks.oauth.getProfile.mockResolvedValue({ sub, email, immich_quota: 5 }); + mocks.session.create.mockResolvedValue(factory.session()); await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).resolves.toEqual( oauthResponse, diff --git a/server/src/services/backup.service.spec.ts b/server/src/services/backup.service.spec.ts index 567859ac01..704087ab05 100644 --- a/server/src/services/backup.service.spec.ts +++ b/server/src/services/backup.service.spec.ts @@ -22,6 +22,7 @@ describe(BackupService.name, () => { describe('onBootstrapEvent', () => { it('should init cron job and handle config changes', async () => { mocks.database.tryLock.mockResolvedValue(true); + mocks.cron.create.mockResolvedValue(); await sut.onConfigInit({ newConfig: systemConfigStub.backupEnabled as SystemConfig }); @@ -47,10 +48,14 @@ describe(BackupService.name, () => { describe('onConfigUpdateEvent', () => { beforeEach(async () => { mocks.database.tryLock.mockResolvedValue(true); + mocks.cron.create.mockResolvedValue(); + await sut.onConfigInit({ newConfig: defaults }); }); it('should update cron job if backup is enabled', () => { + mocks.cron.update.mockResolvedValue(); + sut.onConfigUpdate({ oldConfig: defaults, newConfig: { diff --git a/server/src/services/cli.service.spec.ts b/server/src/services/cli.service.spec.ts index c585142cbf..ce591a7e62 100644 --- a/server/src/services/cli.service.spec.ts +++ b/server/src/services/cli.service.spec.ts @@ -31,6 +31,8 @@ describe(CliService.name, () => { it('should default to a random password', async () => { mocks.user.getAdmin.mockResolvedValue(userStub.admin); + mocks.user.update.mockResolvedValue(userStub.admin); + const ask = vitest.fn().mockImplementation(() => {}); const response = await sut.resetAdminPassword(ask); @@ -45,6 +47,8 @@ describe(CliService.name, () => { it('should use the supplied password', async () => { mocks.user.getAdmin.mockResolvedValue(userStub.admin); + mocks.user.update.mockResolvedValue(userStub.admin); + const ask = vitest.fn().mockResolvedValue('new-password'); const response = await sut.resetAdminPassword(ask); diff --git a/server/src/services/download.service.spec.ts b/server/src/services/download.service.spec.ts index 5139fbd58f..7646637093 100644 --- a/server/src/services/download.service.spec.ts +++ b/server/src/services/download.service.spec.ts @@ -173,6 +173,7 @@ describe(DownloadService.name, () => { it('should return a list of archives (assetIds)', async () => { const assetIds = ['asset-1', 'asset-2']; + mocks.user.getMetadata.mockResolvedValue([]); mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(assetIds)); mocks.downloadRepository.downloadAssetIds.mockReturnValue( makeStream([ @@ -187,6 +188,7 @@ describe(DownloadService.name, () => { }); it('should return a list of archives (albumId)', async () => { + mocks.user.getMetadata.mockResolvedValue([]); mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-1'])); mocks.downloadRepository.downloadAlbumId.mockReturnValue( makeStream([ @@ -202,6 +204,7 @@ describe(DownloadService.name, () => { }); it('should return a list of archives (userId)', async () => { + mocks.user.getMetadata.mockResolvedValue([]); mocks.downloadRepository.downloadUserId.mockReturnValue( makeStream([ { id: 'asset-1', livePhotoVideoId: null, size: 100_000 }, @@ -217,6 +220,7 @@ describe(DownloadService.name, () => { }); it('should split archives by size', async () => { + mocks.user.getMetadata.mockResolvedValue([]); mocks.downloadRepository.downloadUserId.mockReturnValue( makeStream([ { id: 'asset-1', livePhotoVideoId: null, size: 5000 }, @@ -244,13 +248,13 @@ describe(DownloadService.name, () => { const assetIds = ['asset-1', 'asset-2']; mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(assetIds)); + mocks.user.getMetadata.mockResolvedValue([]); mocks.downloadRepository.downloadAssetIds.mockReturnValue( makeStream([ { id: 'asset-1', livePhotoVideoId: 'asset-3', size: 5000 }, { id: 'asset-2', livePhotoVideoId: 'asset-4', size: 100_000 }, ]), ); - mocks.downloadRepository.downloadMotionAssetIds.mockReturnValue( makeStream([ { id: 'asset-3', livePhotoVideoId: null, size: 23_456, originalPath: '/path/to/file.mp4' }, @@ -271,11 +275,10 @@ describe(DownloadService.name, () => { const assetIds = ['asset-1']; mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(assetIds)); - + mocks.user.getMetadata.mockResolvedValue([]); mocks.downloadRepository.downloadAssetIds.mockReturnValue( makeStream([{ id: 'asset-1', livePhotoVideoId: 'asset-3', size: 5000 }]), ); - mocks.downloadRepository.downloadMotionAssetIds.mockReturnValue( makeStream([ { id: 'asset-2', livePhotoVideoId: null, size: 23_456, originalPath: 'upload/encoded-video/uuid-MP.mp4' }, diff --git a/server/src/services/job.service.spec.ts b/server/src/services/job.service.spec.ts index 42010d598c..134a86b69f 100644 --- a/server/src/services/job.service.spec.ts +++ b/server/src/services/job.service.spec.ts @@ -195,6 +195,14 @@ describe(JobService.name, () => { expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_FACIAL_RECOGNITION, data: { force: false } }); }); + it('should handle a start backup database command', async () => { + mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false }); + + await sut.handleCommand(QueueName.BACKUP_DATABASE, { command: JobCommand.START, force: false }); + + expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.BACKUP_DATABASE, data: { force: false } }); + }); + it('should throw a bad request when an invalid queue is used', async () => { mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false }); diff --git a/server/src/services/job.service.ts b/server/src/services/job.service.ts index 342aec7a7a..2f180edd40 100644 --- a/server/src/services/job.service.ts +++ b/server/src/services/job.service.ts @@ -39,6 +39,10 @@ const asJobItem = (dto: JobCreateDto): JobItem => { return { name: JobName.MEMORIES_CREATE }; } + case ManualJobName.BACKUP_DATABASE: { + return { name: JobName.BACKUP_DATABASE }; + } + default: { throw new BadRequestException('Invalid job name'); } diff --git a/server/src/services/library.service.spec.ts b/server/src/services/library.service.spec.ts index 5d6dfb21f5..aef02b7244 100644 --- a/server/src/services/library.service.spec.ts +++ b/server/src/services/library.service.spec.ts @@ -36,6 +36,9 @@ describe(LibraryService.name, () => { describe('onConfigInit', () => { it('should init cron job and handle config changes', async () => { + mocks.cron.create.mockResolvedValue(); + mocks.cron.update.mockResolvedValue(); + await sut.onConfigInit({ newConfig: defaults }); expect(mocks.cron.create).toHaveBeenCalled(); @@ -65,6 +68,7 @@ describe(LibraryService.name, () => { mocks.library.get.mockImplementation((id) => Promise.resolve([library1, library2].find((library) => library.id === id)), ); + mocks.cron.create.mockResolvedValue(); await sut.onConfigInit({ newConfig: systemConfigStub.libraryWatchEnabled as SystemConfig }); @@ -74,6 +78,8 @@ describe(LibraryService.name, () => { }); it('should not initialize watcher when watching is disabled', async () => { + mocks.cron.create.mockResolvedValue(); + await sut.onConfigInit({ newConfig: systemConfigStub.libraryWatchDisabled as SystemConfig }); expect(mocks.storage.watch).not.toHaveBeenCalled(); @@ -99,6 +105,8 @@ describe(LibraryService.name, () => { describe('onConfigUpdateEvent', () => { beforeEach(async () => { mocks.database.tryLock.mockResolvedValue(true); + mocks.cron.create.mockResolvedValue(); + await sut.onConfigInit({ newConfig: defaults }); }); @@ -111,6 +119,9 @@ describe(LibraryService.name, () => { it('should update cron job and enable watching', async () => { mocks.library.getAll.mockResolvedValue([]); + mocks.cron.create.mockResolvedValue(); + mocks.cron.update.mockResolvedValue(); + await sut.onConfigUpdate({ newConfig: systemConfigStub.libraryScanAndWatch as SystemConfig, oldConfig: defaults, @@ -125,6 +136,9 @@ describe(LibraryService.name, () => { it('should update cron job and disable watching', async () => { mocks.library.getAll.mockResolvedValue([]); + mocks.cron.create.mockResolvedValue(); + mocks.cron.update.mockResolvedValue(); + await sut.onConfigUpdate({ newConfig: systemConfigStub.libraryScanAndWatch as SystemConfig, oldConfig: defaults, @@ -620,6 +634,7 @@ describe(LibraryService.name, () => { const mockClose = vitest.fn(); mocks.storage.watch.mockImplementation(makeMockWatcher({ close: mockClose })); + mocks.cron.create.mockResolvedValue(); await sut.onConfigInit({ newConfig: systemConfigStub.libraryWatchEnabled as SystemConfig }); await sut.delete(library.id); @@ -765,6 +780,7 @@ describe(LibraryService.name, () => { mocks.library.create.mockResolvedValue(library); mocks.library.get.mockResolvedValue(library); mocks.library.getAll.mockResolvedValue([]); + mocks.cron.create.mockResolvedValue(); await sut.onConfigInit({ newConfig: systemConfigStub.libraryWatchEnabled as SystemConfig }); await sut.create({ ownerId: authStub.admin.user.id, importPaths: library.importPaths }); @@ -832,6 +848,7 @@ describe(LibraryService.name, () => { describe('update', () => { beforeEach(async () => { mocks.library.getAll.mockResolvedValue([]); + mocks.cron.create.mockResolvedValue(); await sut.onConfigInit({ newConfig: systemConfigStub.libraryWatchEnabled as SystemConfig }); }); @@ -878,6 +895,8 @@ describe(LibraryService.name, () => { describe('watching disabled', () => { beforeEach(async () => { + mocks.cron.create.mockResolvedValue(); + await sut.onConfigInit({ newConfig: systemConfigStub.libraryWatchDisabled as SystemConfig }); }); @@ -895,6 +914,8 @@ describe(LibraryService.name, () => { describe('watching enabled', () => { beforeEach(async () => { mocks.library.getAll.mockResolvedValue([]); + mocks.cron.create.mockResolvedValue(); + await sut.onConfigInit({ newConfig: systemConfigStub.libraryWatchEnabled as SystemConfig }); }); @@ -1067,6 +1088,7 @@ describe(LibraryService.name, () => { const mockClose = vitest.fn(); mocks.storage.watch.mockImplementation(makeMockWatcher({ close: mockClose })); + mocks.cron.create.mockResolvedValue(); await sut.onConfigInit({ newConfig: systemConfigStub.libraryWatchEnabled as SystemConfig }); await sut.onShutdown(); diff --git a/server/src/services/map.service.spec.ts b/server/src/services/map.service.spec.ts index e86ad92976..95750f5590 100644 --- a/server/src/services/map.service.spec.ts +++ b/server/src/services/map.service.spec.ts @@ -2,7 +2,7 @@ import { MapService } from 'src/services/map.service'; import { albumStub } from 'test/fixtures/album.stub'; import { assetStub } from 'test/fixtures/asset.stub'; import { authStub } from 'test/fixtures/auth.stub'; -import { partnerStub } from 'test/fixtures/partner.stub'; +import { factory } from 'test/small.factory'; import { newTestService, ServiceMocks } from 'test/utils'; describe(MapService.name, () => { @@ -34,6 +34,9 @@ describe(MapService.name, () => { }); it('should include partner assets', async () => { + const partner = factory.partner(); + const auth = factory.auth({ id: partner.sharedWithId }); + const asset = assetStub.withLocation; const marker = { id: asset.id, @@ -43,13 +46,13 @@ describe(MapService.name, () => { state: asset.exifInfo!.state, country: asset.exifInfo!.country, }; - mocks.partner.getAll.mockResolvedValue([partnerStub.adminToUser1]); + mocks.partner.getAll.mockResolvedValue([partner]); mocks.map.getMapMarkers.mockResolvedValue([marker]); - const markers = await sut.getMapMarkers(authStub.user1, { withPartners: true }); + const markers = await sut.getMapMarkers(auth, { withPartners: true }); expect(mocks.map.getMapMarkers).toHaveBeenCalledWith( - [authStub.user1.user.id, partnerStub.adminToUser1.sharedById], + [auth.user.id, partner.sharedById], expect.arrayContaining([]), { withPartners: true }, ); diff --git a/server/src/services/memory.service.spec.ts b/server/src/services/memory.service.spec.ts index 6af300c164..22a4199572 100644 --- a/server/src/services/memory.service.spec.ts +++ b/server/src/services/memory.service.spec.ts @@ -33,6 +33,8 @@ describe(MemoryService.name, () => { }); it('should map ', async () => { + mocks.memory.search.mockResolvedValue([]); + await expect(sut.search(factory.auth(), {})).resolves.toEqual([]); }); }); @@ -46,6 +48,7 @@ describe(MemoryService.name, () => { const [memoryId] = newUuids(); mocks.access.memory.checkOwnerAccess.mockResolvedValue(new Set([memoryId])); + mocks.memory.get.mockResolvedValue(void 0); await expect(sut.get(factory.auth(), memoryId)).rejects.toBeInstanceOf(BadRequestException); }); @@ -159,6 +162,7 @@ describe(MemoryService.name, () => { const memoryId = newUuid(); mocks.access.memory.checkOwnerAccess.mockResolvedValue(new Set([memoryId])); + mocks.memory.delete.mockResolvedValue(); await expect(sut.remove(factory.auth(), memoryId)).resolves.toBeUndefined(); @@ -183,6 +187,7 @@ describe(MemoryService.name, () => { mocks.access.memory.checkOwnerAccess.mockResolvedValue(new Set([memory.id])); mocks.memory.get.mockResolvedValue(memory); + mocks.memory.getAssetIds.mockResolvedValue(new Set()); await expect(sut.addAssets(factory.auth(), memory.id, { ids: [assetId] })).resolves.toEqual([ { error: 'no_permission', id: assetId, success: false }, @@ -213,6 +218,9 @@ describe(MemoryService.name, () => { mocks.access.memory.checkOwnerAccess.mockResolvedValue(new Set([memory.id])); mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetId])); mocks.memory.get.mockResolvedValue(memory); + mocks.memory.update.mockResolvedValue(memory); + mocks.memory.getAssetIds.mockResolvedValue(new Set()); + mocks.memory.addAssetIds.mockResolvedValue(); await expect(sut.addAssets(factory.auth(), memory.id, { ids: [assetId] })).resolves.toEqual([ { id: assetId, success: true }, @@ -233,6 +241,7 @@ describe(MemoryService.name, () => { it('should skip assets not in the memory', async () => { mocks.access.memory.checkOwnerAccess.mockResolvedValue(new Set(['memory1'])); + mocks.memory.getAssetIds.mockResolvedValue(new Set()); await expect(sut.removeAssets(factory.auth(), 'memory1', { ids: ['not-found'] })).resolves.toEqual([ { error: 'not_found', id: 'not-found', success: false }, @@ -242,15 +251,20 @@ describe(MemoryService.name, () => { }); it('should remove assets', async () => { - mocks.access.memory.checkOwnerAccess.mockResolvedValue(new Set(['memory1'])); - mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset1'])); - mocks.memory.getAssetIds.mockResolvedValue(new Set(['asset1'])); + const memory = factory.memory(); + const asset = factory.asset(); - await expect(sut.removeAssets(factory.auth(), 'memory1', { ids: ['asset1'] })).resolves.toEqual([ - { id: 'asset1', success: true }, + mocks.access.memory.checkOwnerAccess.mockResolvedValue(new Set([memory.id])); + mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([asset.id])); + mocks.memory.getAssetIds.mockResolvedValue(new Set([asset.id])); + mocks.memory.removeAssetIds.mockResolvedValue(); + mocks.memory.update.mockResolvedValue(memory); + + await expect(sut.removeAssets(factory.auth(), memory.id, { ids: [asset.id] })).resolves.toEqual([ + { id: asset.id, success: true }, ]); - expect(mocks.memory.removeAssetIds).toHaveBeenCalledWith('memory1', ['asset1']); + expect(mocks.memory.removeAssetIds).toHaveBeenCalledWith(memory.id, [asset.id]); }); }); }); diff --git a/server/src/services/metadata.service.spec.ts b/server/src/services/metadata.service.spec.ts index e505a88605..229b63f20e 100644 --- a/server/src/services/metadata.service.spec.ts +++ b/server/src/services/metadata.service.spec.ts @@ -52,6 +52,10 @@ describe(MetadataService.name, () => { describe('onBootstrapEvent', () => { it('should pause and resume queue during init', async () => { + mocks.job.pause.mockResolvedValue(); + mocks.map.init.mockResolvedValue(); + mocks.job.resume.mockResolvedValue(); + await sut.onBootstrap(); expect(mocks.job.pause).toHaveBeenCalledTimes(1); diff --git a/server/src/services/notification.service.spec.ts b/server/src/services/notification.service.spec.ts index 038ab1180c..0deb3805e5 100644 --- a/server/src/services/notification.service.spec.ts +++ b/server/src/services/notification.service.spec.ts @@ -260,6 +260,7 @@ describe(NotificationService.name, () => { mocks.user.get.mockResolvedValue(userStub.admin); mocks.notification.verifySmtp.mockResolvedValue(true); mocks.notification.renderEmail.mockResolvedValue({ html: '', text: '' }); + mocks.notification.sendEmail.mockResolvedValue({ messageId: 'message-1', response: '' }); await expect(sut.sendTestEmail('', configs.smtpTransport.notifications.smtp)).resolves.not.toThrow(); expect(mocks.notification.renderEmail).toHaveBeenCalledWith({ @@ -279,6 +280,7 @@ describe(NotificationService.name, () => { mocks.notification.verifySmtp.mockResolvedValue(true); mocks.notification.renderEmail.mockResolvedValue({ html: '', text: '' }); mocks.systemMetadata.get.mockResolvedValue({ server: { externalDomain: 'https://demo.immich.app' } }); + mocks.notification.sendEmail.mockResolvedValue({ messageId: 'message-1', response: '' }); await expect(sut.sendTestEmail('', configs.smtpTransport.notifications.smtp)).resolves.not.toThrow(); expect(mocks.notification.renderEmail).toHaveBeenCalledWith({ @@ -297,6 +299,7 @@ describe(NotificationService.name, () => { mocks.user.get.mockResolvedValue(userStub.admin); mocks.notification.verifySmtp.mockResolvedValue(true); mocks.notification.renderEmail.mockResolvedValue({ html: '', text: '' }); + mocks.notification.sendEmail.mockResolvedValue({ messageId: 'message-1', response: '' }); await expect( sut.sendTestEmail('', { ...configs.smtpTransport.notifications.smtp, replyTo: 'demo@immich.app' }), diff --git a/server/src/services/partner.service.spec.ts b/server/src/services/partner.service.spec.ts index 9c29afaeaa..6c3460666e 100644 --- a/server/src/services/partner.service.spec.ts +++ b/server/src/services/partner.service.spec.ts @@ -1,8 +1,7 @@ import { BadRequestException } from '@nestjs/common'; import { PartnerDirection } from 'src/repositories/partner.repository'; import { PartnerService } from 'src/services/partner.service'; -import { authStub } from 'test/fixtures/auth.stub'; -import { partnerStub } from 'test/fixtures/partner.stub'; +import { factory } from 'test/small.factory'; import { newTestService, ServiceMocks } from 'test/utils'; describe(PartnerService.name, () => { @@ -19,35 +18,58 @@ describe(PartnerService.name, () => { describe('search', () => { it("should return a list of partners with whom I've shared my library", async () => { - mocks.partner.getAll.mockResolvedValue([partnerStub.adminToUser1, partnerStub.user1ToAdmin1]); - await expect(sut.search(authStub.user1, { direction: PartnerDirection.SharedBy })).resolves.toBeDefined(); - expect(mocks.partner.getAll).toHaveBeenCalledWith(authStub.user1.user.id); + const user1 = factory.user(); + const user2 = factory.user(); + const sharedWithUser2 = factory.partner({ sharedBy: user1, sharedWith: user2 }); + const sharedWithUser1 = factory.partner({ sharedBy: user2, sharedWith: user1 }); + const auth = factory.auth({ id: user1.id }); + + mocks.partner.getAll.mockResolvedValue([sharedWithUser1, sharedWithUser2]); + + await expect(sut.search(auth, { direction: PartnerDirection.SharedBy })).resolves.toBeDefined(); + expect(mocks.partner.getAll).toHaveBeenCalledWith(user1.id); }); it('should return a list of partners who have shared their libraries with me', async () => { - mocks.partner.getAll.mockResolvedValue([partnerStub.adminToUser1, partnerStub.user1ToAdmin1]); - await expect(sut.search(authStub.user1, { direction: PartnerDirection.SharedWith })).resolves.toBeDefined(); - expect(mocks.partner.getAll).toHaveBeenCalledWith(authStub.user1.user.id); + const user1 = factory.user(); + const user2 = factory.user(); + const sharedWithUser2 = factory.partner({ sharedBy: user1, sharedWith: user2 }); + const sharedWithUser1 = factory.partner({ sharedBy: user2, sharedWith: user1 }); + const auth = factory.auth({ id: user1.id }); + + mocks.partner.getAll.mockResolvedValue([sharedWithUser1, sharedWithUser2]); + await expect(sut.search(auth, { direction: PartnerDirection.SharedWith })).resolves.toBeDefined(); + expect(mocks.partner.getAll).toHaveBeenCalledWith(user1.id); }); }); describe('create', () => { it('should create a new partner', async () => { - mocks.partner.get.mockResolvedValue(void 0); - mocks.partner.create.mockResolvedValue(partnerStub.adminToUser1); + const user1 = factory.user(); + const user2 = factory.user(); + const partner = factory.partner({ sharedBy: user1, sharedWith: user2 }); + const auth = factory.auth({ id: user1.id }); - await expect(sut.create(authStub.admin, authStub.user1.user.id)).resolves.toBeDefined(); + mocks.partner.get.mockResolvedValue(void 0); + mocks.partner.create.mockResolvedValue(partner); + + await expect(sut.create(auth, user2.id)).resolves.toBeDefined(); expect(mocks.partner.create).toHaveBeenCalledWith({ - sharedById: authStub.admin.user.id, - sharedWithId: authStub.user1.user.id, + sharedById: partner.sharedById, + sharedWithId: partner.sharedWithId, }); }); it('should throw an error when the partner already exists', async () => { - mocks.partner.get.mockResolvedValue(partnerStub.adminToUser1); + const user1 = factory.user(); + const user2 = factory.user(); + const partner = factory.partner({ sharedBy: user1, sharedWith: user2 }); + const auth = factory.auth({ id: user1.id }); - await expect(sut.create(authStub.admin, authStub.user1.user.id)).rejects.toBeInstanceOf(BadRequestException); + mocks.partner.get.mockResolvedValue(partner); + + await expect(sut.create(auth, user2.id)).rejects.toBeInstanceOf(BadRequestException); expect(mocks.partner.create).not.toHaveBeenCalled(); }); @@ -55,17 +77,25 @@ describe(PartnerService.name, () => { describe('remove', () => { it('should remove a partner', async () => { - mocks.partner.get.mockResolvedValue(partnerStub.adminToUser1); + const user1 = factory.user(); + const user2 = factory.user(); + const partner = factory.partner({ sharedBy: user1, sharedWith: user2 }); + const auth = factory.auth({ id: user1.id }); - await sut.remove(authStub.admin, authStub.user1.user.id); + mocks.partner.get.mockResolvedValue(partner); - expect(mocks.partner.remove).toHaveBeenCalledWith(partnerStub.adminToUser1); + await sut.remove(auth, user2.id); + + expect(mocks.partner.remove).toHaveBeenCalledWith({ sharedById: user1.id, sharedWithId: user2.id }); }); it('should throw an error when the partner does not exist', async () => { + const user2 = factory.user(); + const auth = factory.auth(); + mocks.partner.get.mockResolvedValue(void 0); - await expect(sut.remove(authStub.admin, authStub.user1.user.id)).rejects.toBeInstanceOf(BadRequestException); + await expect(sut.remove(auth, user2.id)).rejects.toBeInstanceOf(BadRequestException); expect(mocks.partner.remove).not.toHaveBeenCalled(); }); @@ -73,18 +103,24 @@ describe(PartnerService.name, () => { describe('update', () => { it('should require access', async () => { - await expect(sut.update(authStub.admin, 'shared-by-id', { inTimeline: false })).rejects.toBeInstanceOf( - BadRequestException, - ); + const user2 = factory.user(); + const auth = factory.auth(); + + await expect(sut.update(auth, user2.id, { inTimeline: false })).rejects.toBeInstanceOf(BadRequestException); }); it('should update partner', async () => { - mocks.access.partner.checkUpdateAccess.mockResolvedValue(new Set(['shared-by-id'])); - mocks.partner.update.mockResolvedValue(partnerStub.adminToUser1); + const user1 = factory.user(); + const user2 = factory.user(); + const partner = factory.partner({ sharedBy: user1, sharedWith: user2 }); + const auth = factory.auth({ id: user1.id }); - await expect(sut.update(authStub.admin, 'shared-by-id', { inTimeline: true })).resolves.toBeDefined(); + mocks.access.partner.checkUpdateAccess.mockResolvedValue(new Set([user2.id])); + mocks.partner.update.mockResolvedValue(partner); + + await expect(sut.update(auth, user2.id, { inTimeline: true })).resolves.toBeDefined(); expect(mocks.partner.update).toHaveBeenCalledWith( - { sharedById: 'shared-by-id', sharedWithId: authStub.admin.user.id }, + { sharedById: user2.id, sharedWithId: user1.id }, { inTimeline: true }, ); }); diff --git a/server/src/services/partner.service.ts b/server/src/services/partner.service.ts index 32b3ae3d3f..28ceab470e 100644 --- a/server/src/services/partner.service.ts +++ b/server/src/services/partner.service.ts @@ -1,8 +1,8 @@ import { BadRequestException, Injectable } from '@nestjs/common'; +import { Partner } from 'src/database'; import { AuthDto } from 'src/dtos/auth.dto'; import { PartnerResponseDto, PartnerSearchDto, UpdatePartnerDto } from 'src/dtos/partner.dto'; -import { mapUser } from 'src/dtos/user.dto'; -import { PartnerEntity } from 'src/entities/partner.entity'; +import { mapDatabaseUser } from 'src/dtos/user.dto'; import { Permission } from 'src/enum'; import { PartnerDirection, PartnerIds } from 'src/repositories/partner.repository'; import { BaseService } from 'src/services/base.service'; @@ -27,14 +27,14 @@ export class PartnerService extends BaseService { throw new BadRequestException('Partner not found'); } - await this.partnerRepository.remove(partner); + await this.partnerRepository.remove(partnerId); } async search(auth: AuthDto, { direction }: PartnerSearchDto): Promise { const partners = await this.partnerRepository.getAll(auth.user.id); const key = direction === PartnerDirection.SharedBy ? 'sharedById' : 'sharedWithId'; return partners - .filter((partner) => partner.sharedBy && partner.sharedWith) // Filter out soft deleted users + .filter((partner): partner is Partner => !!(partner.sharedBy && partner.sharedWith)) // Filter out soft deleted users .filter((partner) => partner[key] === auth.user.id) .map((partner) => this.mapPartner(partner, direction)); } @@ -47,14 +47,12 @@ export class PartnerService extends BaseService { return this.mapPartner(entity, PartnerDirection.SharedWith); } - private mapPartner(partner: PartnerEntity, direction: PartnerDirection): PartnerResponseDto { + private mapPartner(partner: Partner, direction: PartnerDirection): PartnerResponseDto { // this is opposite to return the non-me user of the "partner" - const user = mapUser( + const user = mapDatabaseUser( direction === PartnerDirection.SharedBy ? partner.sharedWith : partner.sharedBy, ) as PartnerResponseDto; - user.inTimeline = partner.inTimeline; - - return user; + return { ...user, inTimeline: partner.inTimeline }; } } diff --git a/server/src/services/person.service.spec.ts b/server/src/services/person.service.spec.ts index 8a8cb254fa..073cf71247 100644 --- a/server/src/services/person.service.spec.ts +++ b/server/src/services/person.service.spec.ts @@ -324,6 +324,10 @@ describe(PersonService.name, () => { mocks.person.getFacesByIds.mockResolvedValue([faceStub.face1]); mocks.person.reassignFace.mockResolvedValue(1); mocks.person.getRandomFace.mockResolvedValue(faceStub.primaryFace1); + mocks.person.refreshFaces.mockResolvedValue(); + mocks.person.reassignFace.mockResolvedValue(5); + mocks.person.update.mockResolvedValue(personStub.noName); + await expect( sut.reassignFaces(authStub.admin, personStub.noName.id, { data: [{ personId: personStub.withName.id, assetId: assetStub.image.id }], @@ -515,6 +519,7 @@ describe(PersonService.name, () => { hasNextPage: false, }); mocks.person.getAllWithoutFaces.mockResolvedValue([personStub.randomPerson]); + mocks.person.deleteFaces.mockResolvedValue(); await sut.handleQueueDetectFaces({ force: true }); @@ -633,6 +638,7 @@ describe(PersonService.name, () => { mocks.person.getAll.mockReturnValue(makeStream()); mocks.person.getAllFaces.mockReturnValue(makeStream([faceStub.face1])); mocks.person.getAllWithoutFaces.mockResolvedValue([]); + mocks.person.unassignFaces.mockResolvedValue(); await sut.handleQueueRecognizeFaces({ force: true, nightly: true }); @@ -679,6 +685,7 @@ describe(PersonService.name, () => { mocks.person.getAll.mockReturnValue(makeStream([faceStub.face1.person, personStub.randomPerson])); mocks.person.getAllFaces.mockReturnValue(makeStream([faceStub.face1])); mocks.person.getAllWithoutFaces.mockResolvedValue([personStub.randomPerson]); + mocks.person.unassignFaces.mockResolvedValue(); await sut.handleQueueRecognizeFaces({ force: true }); @@ -757,6 +764,7 @@ describe(PersonService.name, () => { mocks.machineLearning.detectFaces.mockResolvedValue(detectFaceMock); mocks.search.searchFaces.mockResolvedValue([{ ...faceStub.face1, distance: 0.7 }]); mocks.asset.getByIds.mockResolvedValue([assetStub.image]); + mocks.person.refreshFaces.mockResolvedValue(); await sut.handleDetectFaces({ id: assetStub.image.id }); @@ -784,6 +792,7 @@ describe(PersonService.name, () => { it('should add new face and delete an existing face not among the new detected faces', async () => { mocks.machineLearning.detectFaces.mockResolvedValue(detectFaceMock); mocks.asset.getByIds.mockResolvedValue([{ ...assetStub.image, faces: [faceStub.primaryFace1] }]); + mocks.person.refreshFaces.mockResolvedValue(); await sut.handleDetectFaces({ id: assetStub.image.id }); @@ -799,6 +808,7 @@ describe(PersonService.name, () => { it('should add embedding to matching metadata face', async () => { mocks.machineLearning.detectFaces.mockResolvedValue(detectFaceMock); mocks.asset.getByIds.mockResolvedValue([{ ...assetStub.image, faces: [faceStub.fromExif1] }]); + mocks.person.refreshFaces.mockResolvedValue(); await sut.handleDetectFaces({ id: assetStub.image.id }); @@ -1006,6 +1016,7 @@ describe(PersonService.name, () => { mocks.person.getById.mockResolvedValue({ ...personStub.primaryPerson, faceAssetId: faceStub.middle.assetId }); mocks.person.getFaceByIdWithAssets.mockResolvedValue(faceStub.middle); mocks.asset.getById.mockResolvedValue(assetStub.primaryImage); + mocks.media.generateThumbnail.mockResolvedValue(); await sut.handleGeneratePersonThumbnail({ id: personStub.primaryPerson.id }); @@ -1038,6 +1049,7 @@ describe(PersonService.name, () => { mocks.person.getById.mockResolvedValue({ ...personStub.primaryPerson, faceAssetId: faceStub.start.assetId }); mocks.person.getFaceByIdWithAssets.mockResolvedValue(faceStub.start); mocks.asset.getById.mockResolvedValue(assetStub.image); + mocks.media.generateThumbnail.mockResolvedValue(); await sut.handleGeneratePersonThumbnail({ id: personStub.primaryPerson.id }); @@ -1063,7 +1075,9 @@ describe(PersonService.name, () => { it('should generate a thumbnail without overflowing', async () => { mocks.person.getById.mockResolvedValue({ ...personStub.primaryPerson, faceAssetId: faceStub.end.assetId }); mocks.person.getFaceByIdWithAssets.mockResolvedValue(faceStub.end); + mocks.person.update.mockResolvedValue(personStub.primaryPerson); mocks.asset.getById.mockResolvedValue(assetStub.primaryImage); + mocks.media.generateThumbnail.mockResolvedValue(); await sut.handleGeneratePersonThumbnail({ id: personStub.primaryPerson.id }); diff --git a/server/src/services/search.service.spec.ts b/server/src/services/search.service.spec.ts index 34f4c7b39f..79f3a77ebe 100644 --- a/server/src/services/search.service.spec.ts +++ b/server/src/services/search.service.spec.ts @@ -57,6 +57,8 @@ describe(SearchService.name, () => { describe('getSearchSuggestions', () => { it('should return search suggestions for country', async () => { mocks.search.getCountries.mockResolvedValue(['USA']); + mocks.partner.getAll.mockResolvedValue([]); + await expect( sut.getSearchSuggestions(authStub.user1, { includeNull: false, type: SearchSuggestionType.COUNTRY }), ).resolves.toEqual(['USA']); @@ -65,6 +67,8 @@ describe(SearchService.name, () => { it('should return search suggestions for country (including null)', async () => { mocks.search.getCountries.mockResolvedValue(['USA']); + mocks.partner.getAll.mockResolvedValue([]); + await expect( sut.getSearchSuggestions(authStub.user1, { includeNull: true, type: SearchSuggestionType.COUNTRY }), ).resolves.toEqual(['USA', null]); @@ -73,6 +77,8 @@ describe(SearchService.name, () => { it('should return search suggestions for state', async () => { mocks.search.getStates.mockResolvedValue(['California']); + mocks.partner.getAll.mockResolvedValue([]); + await expect( sut.getSearchSuggestions(authStub.user1, { includeNull: false, type: SearchSuggestionType.STATE }), ).resolves.toEqual(['California']); @@ -81,6 +87,8 @@ describe(SearchService.name, () => { it('should return search suggestions for state (including null)', async () => { mocks.search.getStates.mockResolvedValue(['California']); + mocks.partner.getAll.mockResolvedValue([]); + await expect( sut.getSearchSuggestions(authStub.user1, { includeNull: true, type: SearchSuggestionType.STATE }), ).resolves.toEqual(['California', null]); @@ -89,6 +97,8 @@ describe(SearchService.name, () => { it('should return search suggestions for city', async () => { mocks.search.getCities.mockResolvedValue(['Denver']); + mocks.partner.getAll.mockResolvedValue([]); + await expect( sut.getSearchSuggestions(authStub.user1, { includeNull: false, type: SearchSuggestionType.CITY }), ).resolves.toEqual(['Denver']); @@ -97,6 +107,8 @@ describe(SearchService.name, () => { it('should return search suggestions for city (including null)', async () => { mocks.search.getCities.mockResolvedValue(['Denver']); + mocks.partner.getAll.mockResolvedValue([]); + await expect( sut.getSearchSuggestions(authStub.user1, { includeNull: true, type: SearchSuggestionType.CITY }), ).resolves.toEqual(['Denver', null]); @@ -105,6 +117,8 @@ describe(SearchService.name, () => { it('should return search suggestions for camera make', async () => { mocks.search.getCameraMakes.mockResolvedValue(['Nikon']); + mocks.partner.getAll.mockResolvedValue([]); + await expect( sut.getSearchSuggestions(authStub.user1, { includeNull: false, type: SearchSuggestionType.CAMERA_MAKE }), ).resolves.toEqual(['Nikon']); @@ -113,6 +127,8 @@ describe(SearchService.name, () => { it('should return search suggestions for camera make (including null)', async () => { mocks.search.getCameraMakes.mockResolvedValue(['Nikon']); + mocks.partner.getAll.mockResolvedValue([]); + await expect( sut.getSearchSuggestions(authStub.user1, { includeNull: true, type: SearchSuggestionType.CAMERA_MAKE }), ).resolves.toEqual(['Nikon', null]); @@ -121,6 +137,8 @@ describe(SearchService.name, () => { it('should return search suggestions for camera model', async () => { mocks.search.getCameraModels.mockResolvedValue(['Fujifilm X100VI']); + mocks.partner.getAll.mockResolvedValue([]); + await expect( sut.getSearchSuggestions(authStub.user1, { includeNull: false, type: SearchSuggestionType.CAMERA_MODEL }), ).resolves.toEqual(['Fujifilm X100VI']); @@ -129,6 +147,8 @@ describe(SearchService.name, () => { it('should return search suggestions for camera model (including null)', async () => { mocks.search.getCameraModels.mockResolvedValue(['Fujifilm X100VI']); + mocks.partner.getAll.mockResolvedValue([]); + await expect( sut.getSearchSuggestions(authStub.user1, { includeNull: true, type: SearchSuggestionType.CAMERA_MODEL }), ).resolves.toEqual(['Fujifilm X100VI', null]); diff --git a/server/src/services/session.service.spec.ts b/server/src/services/session.service.spec.ts index 96a1dacf64..3d1b09a39d 100644 --- a/server/src/services/session.service.spec.ts +++ b/server/src/services/session.service.spec.ts @@ -36,6 +36,7 @@ describe('SessionService', () => { updateId: 'uuid-v7', }, ]); + mocks.session.delete.mockResolvedValue(); await expect(sut.handleCleanup()).resolves.toEqual(JobStatus.SUCCESS); expect(mocks.session.delete).toHaveBeenCalledWith('123'); @@ -71,6 +72,7 @@ describe('SessionService', () => { describe('logoutDevices', () => { it('should logout all devices', async () => { mocks.session.getByUserId.mockResolvedValue([sessionStub.inactive, sessionStub.valid] as any[]); + mocks.session.delete.mockResolvedValue(); await sut.deleteAll(authStub.user1); @@ -83,6 +85,7 @@ describe('SessionService', () => { describe('logoutDevice', () => { it('should logout the device', async () => { mocks.access.authDevice.checkOwnerAccess.mockResolvedValue(new Set(['token-1'])); + mocks.session.delete.mockResolvedValue(); await sut.delete(authStub.user1, 'token-1'); diff --git a/server/src/services/shared-link.service.spec.ts b/server/src/services/shared-link.service.spec.ts index 4d6cdee6cb..557fdd5780 100644 --- a/server/src/services/shared-link.service.spec.ts +++ b/server/src/services/shared-link.service.spec.ts @@ -71,7 +71,10 @@ describe(SharedLinkService.name, () => { describe('get', () => { it('should throw an error for an invalid shared link', async () => { + mocks.sharedLink.get.mockResolvedValue(void 0); + await expect(sut.get(authStub.user1, 'missing-id')).rejects.toBeInstanceOf(BadRequestException); + expect(mocks.sharedLink.get).toHaveBeenCalledWith(authStub.user1.user.id, 'missing-id'); expect(mocks.sharedLink.update).not.toHaveBeenCalled(); }); @@ -194,7 +197,10 @@ describe(SharedLinkService.name, () => { describe('update', () => { it('should throw an error for an invalid shared link', async () => { + mocks.sharedLink.get.mockResolvedValue(void 0); + await expect(sut.update(authStub.user1, 'missing-id', {})).rejects.toBeInstanceOf(BadRequestException); + expect(mocks.sharedLink.get).toHaveBeenCalledWith(authStub.user1.user.id, 'missing-id'); expect(mocks.sharedLink.update).not.toHaveBeenCalled(); }); @@ -214,14 +220,20 @@ describe(SharedLinkService.name, () => { describe('remove', () => { it('should throw an error for an invalid shared link', async () => { + mocks.sharedLink.get.mockResolvedValue(void 0); + await expect(sut.remove(authStub.user1, 'missing-id')).rejects.toBeInstanceOf(BadRequestException); + expect(mocks.sharedLink.get).toHaveBeenCalledWith(authStub.user1.user.id, 'missing-id'); expect(mocks.sharedLink.update).not.toHaveBeenCalled(); }); it('should remove a key', async () => { mocks.sharedLink.get.mockResolvedValue(sharedLinkStub.valid); + mocks.sharedLink.remove.mockResolvedValue(); + await sut.remove(authStub.user1, sharedLinkStub.valid.id); + expect(mocks.sharedLink.get).toHaveBeenCalledWith(authStub.user1.user.id, sharedLinkStub.valid.id); expect(mocks.sharedLink.remove).toHaveBeenCalledWith(sharedLinkStub.valid); }); @@ -238,6 +250,7 @@ describe(SharedLinkService.name, () => { it('should add assets to a shared link', async () => { mocks.sharedLink.get.mockResolvedValue(_.cloneDeep(sharedLinkStub.individual)); mocks.sharedLink.create.mockResolvedValue(sharedLinkStub.individual); + mocks.sharedLink.update.mockResolvedValue(sharedLinkStub.individual); mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-3'])); await expect( @@ -268,6 +281,7 @@ describe(SharedLinkService.name, () => { it('should remove assets from a shared link', async () => { mocks.sharedLink.get.mockResolvedValue(_.cloneDeep(sharedLinkStub.individual)); mocks.sharedLink.create.mockResolvedValue(sharedLinkStub.individual); + mocks.sharedLink.update.mockResolvedValue(sharedLinkStub.individual); await expect( sut.removeAssets(authStub.admin, 'link-1', { assetIds: [assetStub.image.id, 'asset-2'] }), diff --git a/server/src/services/stack.service.spec.ts b/server/src/services/stack.service.spec.ts index 5fbc0e185d..f6da8bcac7 100644 --- a/server/src/services/stack.service.spec.ts +++ b/server/src/services/stack.service.spec.ts @@ -155,6 +155,7 @@ describe(StackService.name, () => { it('should delete stack', async () => { mocks.access.stack.checkOwnerAccess.mockResolvedValue(new Set(['stack-id'])); + mocks.stack.delete.mockResolvedValue(); await sut.delete(authStub.admin, 'stack-id'); @@ -176,6 +177,7 @@ describe(StackService.name, () => { it('should delete all stacks', async () => { mocks.access.stack.checkOwnerAccess.mockResolvedValue(new Set(['stack-id'])); + mocks.stack.deleteAll.mockResolvedValue(); await sut.deleteAll(authStub.admin, { ids: ['stack-id'] }); diff --git a/server/src/services/storage-template.service.spec.ts b/server/src/services/storage-template.service.spec.ts index 1133d25db4..6bfabe2e8c 100644 --- a/server/src/services/storage-template.service.spec.ts +++ b/server/src/services/storage-template.service.spec.ts @@ -93,7 +93,9 @@ describe(StorageTemplateService.name, () => { describe('handleMigrationSingle', () => { it('should skip when storage template is disabled', async () => { mocks.systemMetadata.get.mockResolvedValue({ storageTemplate: { enabled: false } }); + await expect(sut.handleMigrationSingle({ id: testAsset.id })).resolves.toBe(JobStatus.SKIPPED); + expect(mocks.asset.getByIds).not.toHaveBeenCalled(); expect(mocks.storage.checkFileExists).not.toHaveBeenCalled(); expect(mocks.storage.rename).not.toHaveBeenCalled(); diff --git a/server/src/services/sync.service.spec.ts b/server/src/services/sync.service.spec.ts index d5e53c83a2..27a54b2b58 100644 --- a/server/src/services/sync.service.spec.ts +++ b/server/src/services/sync.service.spec.ts @@ -3,7 +3,7 @@ import { AssetEntity } from 'src/entities/asset.entity'; import { SyncService } from 'src/services/sync.service'; import { assetStub } from 'test/fixtures/asset.stub'; import { authStub } from 'test/fixtures/auth.stub'; -import { partnerStub } from 'test/fixtures/partner.stub'; +import { factory } from 'test/small.factory'; import { newTestService, ServiceMocks } from 'test/utils'; const untilDate = new Date(2024); @@ -38,10 +38,15 @@ describe(SyncService.name, () => { describe('getChangesForDeltaSync', () => { it('should return a response requiring a full sync when partners are out of sync', async () => { - mocks.partner.getAll.mockResolvedValue([partnerStub.adminToUser1]); + const partner = factory.partner(); + const auth = factory.auth({ id: partner.sharedWithId }); + + mocks.partner.getAll.mockResolvedValue([partner]); + await expect( - sut.getDeltaSync(authStub.user1, { updatedAfter: new Date(), userIds: [authStub.user1.user.id] }), + sut.getDeltaSync(authStub.user1, { updatedAfter: new Date(), userIds: [auth.user.id] }), ).resolves.toEqual({ needsFullSync: true, upserted: [], deleted: [] }); + expect(mocks.asset.getChangedDeltaSync).toHaveBeenCalledTimes(0); expect(mocks.audit.getAfter).toHaveBeenCalledTimes(0); }); diff --git a/server/src/services/tag.service.spec.ts b/server/src/services/tag.service.spec.ts index 22d7747d0d..70507ab433 100644 --- a/server/src/services/tag.service.spec.ts +++ b/server/src/services/tag.service.spec.ts @@ -87,9 +87,12 @@ describe(TagService.name, () => { it('should create a new tag with optional color', async () => { mocks.tag.create.mockResolvedValue(tagStub.colorCreate); + mocks.tag.getByValue.mockResolvedValue(void 0); + await expect(sut.create(authStub.admin, { name: 'tag-1', color: '#000000' })).resolves.toEqual( tagResponseStub.color1, ); + expect(mocks.tag.create).toHaveBeenCalledWith({ userId: authStub.admin.user.id, value: 'tag-1', @@ -168,6 +171,8 @@ describe(TagService.name, () => { it('should remove a tag', async () => { mocks.tag.get.mockResolvedValue(tagStub.tag); + mocks.tag.delete.mockResolvedValue(); + await sut.remove(authStub.admin, 'tag-1'); expect(mocks.tag.delete).toHaveBeenCalledWith('tag-1'); }); @@ -223,6 +228,7 @@ describe(TagService.name, () => { it('should accept accept ids that are new and reject the rest', async () => { mocks.tag.get.mockResolvedValue(tagStub.tag); mocks.tag.getAssetIds.mockResolvedValue(new Set(['asset-1'])); + mocks.tag.addAssetIds.mockResolvedValue(); mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-2'])); await expect( @@ -242,6 +248,8 @@ describe(TagService.name, () => { describe('removeAssets', () => { it('should throw an error for an invalid id', async () => { mocks.tag.getAssetIds.mockResolvedValue(new Set()); + mocks.tag.removeAssetIds.mockResolvedValue(); + await expect(sut.removeAssets(authStub.admin, 'tag-1', { ids: ['asset-1'] })).resolves.toEqual([ { id: 'asset-1', success: false, error: 'not_found' }, ]); @@ -250,6 +258,7 @@ describe(TagService.name, () => { it('should accept accept ids that are tagged and reject the rest', async () => { mocks.tag.get.mockResolvedValue(tagStub.tag); mocks.tag.getAssetIds.mockResolvedValue(new Set(['asset-1'])); + mocks.tag.removeAssetIds.mockResolvedValue(); await expect( sut.removeAssets(authStub.admin, 'tag-1', { @@ -267,7 +276,10 @@ describe(TagService.name, () => { describe('handleTagCleanup', () => { it('should delete empty tags', async () => { + mocks.tag.deleteEmptyTags.mockResolvedValue(); + await expect(sut.handleTagCleanup()).resolves.toBe(JobStatus.SUCCESS); + expect(mocks.tag.deleteEmptyTags).toHaveBeenCalled(); }); }); diff --git a/server/src/services/timeline.service.spec.ts b/server/src/services/timeline.service.spec.ts index 749633998b..1c2c422433 100644 --- a/server/src/services/timeline.service.spec.ts +++ b/server/src/services/timeline.service.spec.ts @@ -70,6 +70,7 @@ describe(TimelineService.name, () => { it('should include partner shared assets', async () => { mocks.asset.getTimeBucket.mockResolvedValue([assetStub.image]); + mocks.partner.getAll.mockResolvedValue([]); await expect( sut.getTimeBucket(authStub.admin, { diff --git a/server/src/services/trash.service.spec.ts b/server/src/services/trash.service.spec.ts index e7eccd374c..b3bee90815 100644 --- a/server/src/services/trash.service.spec.ts +++ b/server/src/services/trash.service.spec.ts @@ -39,6 +39,7 @@ describe(TrashService.name, () => { it('should restore a batch of assets', async () => { mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset1', 'asset2'])); + mocks.trash.restoreAll.mockResolvedValue(0); await sut.restoreAssets(authStub.user1, { ids: ['asset1', 'asset2'] }); diff --git a/server/src/services/version.service.spec.ts b/server/src/services/version.service.spec.ts index 500478e9e7..a83d9f85b6 100644 --- a/server/src/services/version.service.spec.ts +++ b/server/src/services/version.service.spec.ts @@ -4,6 +4,7 @@ import { serverVersion } from 'src/constants'; import { ImmichEnvironment, JobName, JobStatus, SystemMetadataKey } from 'src/enum'; import { VersionService } from 'src/services/version.service'; import { mockEnvData } from 'test/repositories/config.repository.mock'; +import { factory } from 'test/small.factory'; import { newTestService, ServiceMocks } from 'test/utils'; const mockRelease = (version: string) => ({ @@ -30,7 +31,12 @@ describe(VersionService.name, () => { describe('onBootstrap', () => { it('should record a new version', async () => { + mocks.versionHistory.getAll.mockResolvedValue([]); + mocks.versionHistory.getLatest.mockResolvedValue(void 0); + mocks.versionHistory.create.mockResolvedValue(factory.versionHistory()); + await expect(sut.onBootstrap()).resolves.toBeUndefined(); + expect(mocks.versionHistory.create).toHaveBeenCalledWith({ version: expect.any(String) }); }); diff --git a/server/test/factory.ts b/server/test/factory.ts index 66c2fbb50c..520119fc3e 100644 --- a/server/test/factory.ts +++ b/server/test/factory.ts @@ -34,9 +34,9 @@ import { TrashRepository } from 'src/repositories/trash.repository'; import { UserRepository } from 'src/repositories/user.repository'; import { VersionHistoryRepository } from 'src/repositories/version-history.repository'; import { ViewRepository } from 'src/repositories/view-repository'; -import { newLoggingRepositoryMock } from 'test/repositories/logger.repository.mock'; import { newTelemetryRepositoryMock } from 'test/repositories/telemetry.repository.mock'; import { newUuid } from 'test/small.factory'; +import { automock } from 'test/utils'; class CustomWritable extends Writable { private data = ''; @@ -213,7 +213,7 @@ export class TestContext { view: ViewRepository; private constructor(public db: Kysely) { - const logger = newLoggingRepositoryMock() as unknown as LoggingRepository; + const logger = automock(LoggingRepository, { args: [, { getEnv: () => ({}) }], strict: false }); const config = new ConfigRepository(); this.access = new AccessRepository(this.db); diff --git a/server/test/fixtures/partner.stub.ts b/server/test/fixtures/partner.stub.ts deleted file mode 100644 index 4e5643bc1c..0000000000 --- a/server/test/fixtures/partner.stub.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { PartnerEntity } from 'src/entities/partner.entity'; -import { userStub } from 'test/fixtures/user.stub'; - -export const partnerStub = { - adminToUser1: Object.freeze({ - createdAt: new Date('2023-02-23T05:06:29.716Z'), - updatedAt: new Date('2023-02-23T05:06:29.716Z'), - sharedById: userStub.admin.id, - sharedBy: userStub.admin, - sharedWith: userStub.user1, - sharedWithId: userStub.user1.id, - inTimeline: true, - }), - user1ToAdmin1: Object.freeze({ - createdAt: new Date('2023-02-23T05:06:29.716Z'), - updatedAt: new Date('2023-02-23T05:06:29.716Z'), - sharedBy: userStub.user1, - sharedById: userStub.user1.id, - sharedWithId: userStub.admin.id, - sharedWith: userStub.admin, - inTimeline: true, - }), -}; diff --git a/server/test/medium/specs/metadata.service.spec.ts b/server/test/medium/specs/metadata.service.spec.ts index aefb518c18..28f2c9f64f 100644 --- a/server/test/medium/specs/metadata.service.spec.ts +++ b/server/test/medium/specs/metadata.service.spec.ts @@ -3,12 +3,14 @@ import { writeFile } from 'node:fs/promises'; import { tmpdir } from 'node:os'; import { join } from 'node:path'; import { AssetEntity } from 'src/entities/asset.entity'; +import { LoggingRepository } from 'src/repositories/logging.repository'; import { MetadataRepository } from 'src/repositories/metadata.repository'; import { MetadataService } from 'src/services/metadata.service'; -import { newFakeLoggingRepository } from 'test/repositories/logger.repository.mock'; -import { newRandomImage, newTestService, ServiceMocks } from 'test/utils'; +import { automock, newRandomImage, newTestService, ServiceMocks } from 'test/utils'; -const metadataRepository = new MetadataRepository(newFakeLoggingRepository()); +const metadataRepository = new MetadataRepository( + automock(LoggingRepository, { args: [, { getEnv: () => ({}) }], strict: false }), +); const createTestFile = async (exifData: Record) => { const data = newRandomImage(); diff --git a/server/test/repositories/activity.repository.mock.ts b/server/test/repositories/activity.repository.mock.ts deleted file mode 100644 index 81208b7232..0000000000 --- a/server/test/repositories/activity.repository.mock.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { ActivityRepository } from 'src/repositories/activity.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newActivityRepositoryMock = (): Mocked> => { - return { - search: vitest.fn(), - create: vitest.fn(), - delete: vitest.fn(), - getStatistics: vitest.fn(), - }; -}; diff --git a/server/test/repositories/album-user.repository.mock.ts b/server/test/repositories/album-user.repository.mock.ts deleted file mode 100644 index e3225661a4..0000000000 --- a/server/test/repositories/album-user.repository.mock.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { AlbumUserRepository } from 'src/repositories/album-user.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked } from 'vitest'; - -export const newAlbumUserRepositoryMock = (): Mocked> => { - return { - create: vitest.fn(), - delete: vitest.fn(), - update: vitest.fn(), - }; -}; diff --git a/server/test/repositories/album.repository.mock.ts b/server/test/repositories/album.repository.mock.ts deleted file mode 100644 index 7a1ae68a52..0000000000 --- a/server/test/repositories/album.repository.mock.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { AlbumRepository } from 'src/repositories/album.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newAlbumRepositoryMock = (): Mocked> => { - return { - getById: vitest.fn(), - getByAssetId: vitest.fn(), - getMetadataForIds: vitest.fn(), - getOwned: vitest.fn(), - getShared: vitest.fn(), - getNotShared: vitest.fn(), - restoreAll: vitest.fn(), - softDeleteAll: vitest.fn(), - deleteAll: vitest.fn(), - addAssetIds: vitest.fn(), - removeAsset: vitest.fn(), - removeAssetIds: vitest.fn(), - getAssetIds: vitest.fn(), - create: vitest.fn(), - update: vitest.fn(), - delete: vitest.fn(), - updateThumbnails: vitest.fn(), - }; -}; diff --git a/server/test/repositories/api-key.repository.mock.ts b/server/test/repositories/api-key.repository.mock.ts deleted file mode 100644 index e8ae0bf8e2..0000000000 --- a/server/test/repositories/api-key.repository.mock.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { ApiKeyRepository } from 'src/repositories/api-key.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newKeyRepositoryMock = (): Mocked> => { - return { - create: vitest.fn(), - update: vitest.fn(), - delete: vitest.fn(), - getKey: vitest.fn(), - getById: vitest.fn(), - getByUserId: vitest.fn(), - }; -}; diff --git a/server/test/repositories/audit.repository.mock.ts b/server/test/repositories/audit.repository.mock.ts deleted file mode 100644 index a76079f45d..0000000000 --- a/server/test/repositories/audit.repository.mock.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { AuditRepository } from 'src/repositories/audit.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newAuditRepositoryMock = (): Mocked> => { - return { - getAfter: vitest.fn(), - removeBefore: vitest.fn(), - }; -}; diff --git a/server/test/repositories/cron.repository.mock.ts b/server/test/repositories/cron.repository.mock.ts deleted file mode 100644 index 5b74bd3cf5..0000000000 --- a/server/test/repositories/cron.repository.mock.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { CronRepository } from 'src/repositories/cron.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newCronRepositoryMock = (): Mocked> => { - return { - create: vitest.fn(), - update: vitest.fn(), - }; -}; diff --git a/server/test/repositories/download.repository.mock.ts b/server/test/repositories/download.repository.mock.ts deleted file mode 100644 index 50824c4f3d..0000000000 --- a/server/test/repositories/download.repository.mock.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { DownloadRepository } from 'src/repositories/download.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newDownloadRepositoryMock = (): Mocked> => { - return { - downloadAssetIds: vitest.fn(), - downloadMotionAssetIds: vitest.fn(), - downloadAlbumId: vitest.fn(), - downloadUserId: vitest.fn(), - }; -}; diff --git a/server/test/repositories/event.repository.mock.ts b/server/test/repositories/event.repository.mock.ts deleted file mode 100644 index a253e93671..0000000000 --- a/server/test/repositories/event.repository.mock.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { EventRepository } from 'src/repositories/event.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newEventRepositoryMock = (): Mocked> => { - return { - setup: vitest.fn(), - emit: vitest.fn() as any, - clientSend: vitest.fn() as any, - clientBroadcast: vitest.fn() as any, - serverSend: vitest.fn(), - afterInit: vitest.fn(), - handleConnection: vitest.fn(), - handleDisconnect: vitest.fn(), - setAuthFn: vitest.fn(), - }; -}; diff --git a/server/test/repositories/library.repository.mock.ts b/server/test/repositories/library.repository.mock.ts deleted file mode 100644 index 23013e1f30..0000000000 --- a/server/test/repositories/library.repository.mock.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { LibraryRepository } from 'src/repositories/library.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newLibraryRepositoryMock = (): Mocked> => { - return { - get: vitest.fn(), - create: vitest.fn(), - delete: vitest.fn(), - softDelete: vitest.fn(), - update: vitest.fn(), - getStatistics: vitest.fn(), - getAllDeleted: vitest.fn(), - getAll: vitest.fn(), - streamAssetIds: vitest.fn(), - }; -}; diff --git a/server/test/repositories/logger.repository.mock.ts b/server/test/repositories/logger.repository.mock.ts deleted file mode 100644 index 7257d375f1..0000000000 --- a/server/test/repositories/logger.repository.mock.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { LoggingRepository } from 'src/repositories/logging.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newLoggingRepositoryMock = (): Mocked> => { - return { - setLogLevel: vitest.fn(), - setContext: vitest.fn(), - setAppName: vitest.fn(), - isLevelEnabled: vitest.fn(), - verbose: vitest.fn(), - verboseFn: vitest.fn(), - debug: vitest.fn(), - debugFn: vitest.fn(), - log: vitest.fn(), - warn: vitest.fn(), - error: vitest.fn(), - fatal: vitest.fn(), - }; -}; - -export const newFakeLoggingRepository = () => - newLoggingRepositoryMock() as RepositoryInterface as LoggingRepository; diff --git a/server/test/repositories/machine-learning.repository.mock.ts b/server/test/repositories/machine-learning.repository.mock.ts deleted file mode 100644 index 229e8f92ec..0000000000 --- a/server/test/repositories/machine-learning.repository.mock.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { MachineLearningRepository } from 'src/repositories/machine-learning.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newMachineLearningRepositoryMock = (): Mocked> => { - return { - encodeImage: vitest.fn(), - encodeText: vitest.fn(), - detectFaces: vitest.fn(), - }; -}; diff --git a/server/test/repositories/map.repository.mock.ts b/server/test/repositories/map.repository.mock.ts deleted file mode 100644 index 9e7df32252..0000000000 --- a/server/test/repositories/map.repository.mock.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { MapRepository } from 'src/repositories/map.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked } from 'vitest'; - -export const newMapRepositoryMock = (): Mocked> => { - return { - init: vitest.fn(), - reverseGeocode: vitest.fn(), - getMapMarkers: vitest.fn(), - }; -}; diff --git a/server/test/repositories/memory.repository.mock.ts b/server/test/repositories/memory.repository.mock.ts deleted file mode 100644 index c3a6d774f0..0000000000 --- a/server/test/repositories/memory.repository.mock.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { MemoryRepository } from 'src/repositories/memory.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newMemoryRepositoryMock = (): Mocked> => { - return { - search: vitest.fn().mockResolvedValue([]), - get: vitest.fn(), - create: vitest.fn(), - update: vitest.fn(), - delete: vitest.fn(), - getAssetIds: vitest.fn().mockResolvedValue(new Set()), - addAssetIds: vitest.fn(), - removeAssetIds: vitest.fn(), - cleanup: vitest.fn(), - }; -}; diff --git a/server/test/repositories/move.repository.mock.ts b/server/test/repositories/move.repository.mock.ts deleted file mode 100644 index 88dfa29d4f..0000000000 --- a/server/test/repositories/move.repository.mock.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { MoveRepository } from 'src/repositories/move.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newMoveRepositoryMock = (): Mocked> => { - return { - create: vitest.fn(), - getByEntity: vitest.fn(), - update: vitest.fn(), - delete: vitest.fn(), - cleanMoveHistory: vitest.fn(), - cleanMoveHistorySingle: vitest.fn(), - }; -}; diff --git a/server/test/repositories/notification.repository.mock.ts b/server/test/repositories/notification.repository.mock.ts deleted file mode 100644 index 3aa7f63cf2..0000000000 --- a/server/test/repositories/notification.repository.mock.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { NotificationRepository } from 'src/repositories/notification.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked } from 'vitest'; - -export const newNotificationRepositoryMock = (): Mocked> => { - return { - renderEmail: vitest.fn(), - sendEmail: vitest.fn().mockResolvedValue({ messageId: 'message-1' }), - verifySmtp: vitest.fn(), - }; -}; diff --git a/server/test/repositories/oauth.repository.mock.ts b/server/test/repositories/oauth.repository.mock.ts deleted file mode 100644 index 64777fa671..0000000000 --- a/server/test/repositories/oauth.repository.mock.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { OAuthRepository } from 'src/repositories/oauth.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked } from 'vitest'; - -export const newOAuthRepositoryMock = (): Mocked> => { - return { - init: vitest.fn(), - authorize: vitest.fn(), - getLogoutEndpoint: vitest.fn(), - getProfile: vitest.fn(), - }; -}; diff --git a/server/test/repositories/partner.repository.mock.ts b/server/test/repositories/partner.repository.mock.ts deleted file mode 100644 index 6f9d4a36be..0000000000 --- a/server/test/repositories/partner.repository.mock.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { PartnerRepository } from 'src/repositories/partner.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newPartnerRepositoryMock = (): Mocked> => { - return { - create: vitest.fn(), - remove: vitest.fn(), - getAll: vitest.fn().mockResolvedValue([]), - get: vitest.fn(), - update: vitest.fn(), - }; -}; diff --git a/server/test/repositories/person.repository.mock.ts b/server/test/repositories/person.repository.mock.ts deleted file mode 100644 index c8a4253edc..0000000000 --- a/server/test/repositories/person.repository.mock.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { PersonRepository } from 'src/repositories/person.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newPersonRepositoryMock = (): Mocked> => { - return { - getById: vitest.fn(), - getAll: vitest.fn(), - getAllForUser: vitest.fn(), - getAllWithoutFaces: vitest.fn(), - - getByName: vitest.fn(), - getDistinctNames: vitest.fn(), - - create: vitest.fn(), - createAll: vitest.fn(), - update: vitest.fn(), - updateAll: vitest.fn(), - delete: vitest.fn(), - deleteFaces: vitest.fn(), - - getStatistics: vitest.fn(), - getAllFaces: vitest.fn(), - getFacesByIds: vitest.fn(), - getRandomFace: vitest.fn(), - - reassignFaces: vitest.fn(), - unassignFaces: vitest.fn(), - refreshFaces: vitest.fn(), - getFaces: vitest.fn(), - reassignFace: vitest.fn(), - getFaceById: vitest.fn(), - getFaceByIdWithAssets: vitest.fn(), - getNumberOfPeople: vitest.fn(), - getLatestFaceDate: vitest.fn(), - - createAssetFace: vitest.fn(), - deleteAssetFace: vitest.fn(), - softDeleteAssetFaces: vitest.fn(), - }; -}; diff --git a/server/test/repositories/process.repository.mock.ts b/server/test/repositories/process.repository.mock.ts deleted file mode 100644 index f78975310b..0000000000 --- a/server/test/repositories/process.repository.mock.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { ProcessRepository } from 'src/repositories/process.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newProcessRepositoryMock = (): Mocked> => { - return { - spawn: vitest.fn(), - }; -}; diff --git a/server/test/repositories/search.repository.mock.ts b/server/test/repositories/search.repository.mock.ts deleted file mode 100644 index 520bf23b3e..0000000000 --- a/server/test/repositories/search.repository.mock.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { SearchRepository } from 'src/repositories/search.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newSearchRepositoryMock = (): Mocked> => { - return { - searchMetadata: vitest.fn(), - searchSmart: vitest.fn(), - searchDuplicates: vitest.fn(), - searchFaces: vitest.fn(), - searchRandom: vitest.fn(), - upsert: vitest.fn(), - searchPlaces: vitest.fn(), - getAssetsByCity: vitest.fn(), - deleteAllSearchEmbeddings: vitest.fn(), - getDimensionSize: vitest.fn(), - setDimensionSize: vitest.fn(), - getCameraMakes: vitest.fn(), - getCameraModels: vitest.fn(), - getCities: vitest.fn(), - getCountries: vitest.fn(), - getStates: vitest.fn(), - }; -}; diff --git a/server/test/repositories/server-info.repository.mock.ts b/server/test/repositories/server-info.repository.mock.ts deleted file mode 100644 index 49f955b283..0000000000 --- a/server/test/repositories/server-info.repository.mock.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { ServerInfoRepository } from 'src/repositories/server-info.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newServerInfoRepositoryMock = (): Mocked> => { - return { - getGitHubRelease: vitest.fn(), - getBuildVersions: vitest.fn(), - }; -}; diff --git a/server/test/repositories/session.repository.mock.ts b/server/test/repositories/session.repository.mock.ts deleted file mode 100644 index b519b07e36..0000000000 --- a/server/test/repositories/session.repository.mock.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { SessionRepository } from 'src/repositories/session.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newSessionRepositoryMock = (): Mocked> => { - return { - search: vitest.fn(), - create: vitest.fn() as any, - update: vitest.fn() as any, - delete: vitest.fn(), - getByToken: vitest.fn(), - getByUserId: vitest.fn(), - }; -}; diff --git a/server/test/repositories/shared-link.repository.mock.ts b/server/test/repositories/shared-link.repository.mock.ts deleted file mode 100644 index 66044b9eed..0000000000 --- a/server/test/repositories/shared-link.repository.mock.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { SharedLinkRepository } from 'src/repositories/shared-link.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newSharedLinkRepositoryMock = (): Mocked> => { - return { - getAll: vitest.fn(), - get: vitest.fn(), - getByKey: vitest.fn(), - create: vitest.fn(), - remove: vitest.fn(), - update: vitest.fn(), - }; -}; diff --git a/server/test/repositories/stack.repository.mock.ts b/server/test/repositories/stack.repository.mock.ts deleted file mode 100644 index 74fef6f4b1..0000000000 --- a/server/test/repositories/stack.repository.mock.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { StackRepository } from 'src/repositories/stack.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newStackRepositoryMock = (): Mocked> => { - return { - search: vitest.fn(), - create: vitest.fn(), - update: vitest.fn(), - delete: vitest.fn(), - getById: vitest.fn(), - deleteAll: vitest.fn(), - }; -}; diff --git a/server/test/repositories/sync.repository.mock.ts b/server/test/repositories/sync.repository.mock.ts deleted file mode 100644 index c7fb154db7..0000000000 --- a/server/test/repositories/sync.repository.mock.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { SyncRepository } from 'src/repositories/sync.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newSyncRepositoryMock = (): Mocked> => { - return { - getCheckpoints: vitest.fn(), - upsertCheckpoints: vitest.fn(), - deleteCheckpoints: vitest.fn(), - getUserUpserts: vitest.fn(), - getUserDeletes: vitest.fn(), - getPartnerUpserts: vitest.fn(), - getPartnerDeletes: vitest.fn(), - getPartnerAssetsUpserts: vitest.fn(), - getPartnerAssetDeletes: vitest.fn(), - getAssetDeletes: vitest.fn(), - getAssetUpserts: vitest.fn(), - getAssetExifsUpserts: vitest.fn(), - getPartnerAssetExifsUpserts: vitest.fn(), - }; -}; diff --git a/server/test/repositories/tag.repository.mock.ts b/server/test/repositories/tag.repository.mock.ts deleted file mode 100644 index b6313ca798..0000000000 --- a/server/test/repositories/tag.repository.mock.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { TagRepository } from 'src/repositories/tag.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newTagRepositoryMock = (): Mocked> => { - return { - getAll: vitest.fn(), - getByValue: vitest.fn(), - upsertValue: vitest.fn(), - replaceAssetTags: vitest.fn(), - - get: vitest.fn(), - create: vitest.fn(), - update: vitest.fn(), - delete: vitest.fn(), - - getAssetIds: vitest.fn(), - addAssetIds: vitest.fn(), - removeAssetIds: vitest.fn(), - upsertAssetIds: vitest.fn(), - deleteEmptyTags: vitest.fn(), - }; -}; diff --git a/server/test/repositories/trash.repository.mock.ts b/server/test/repositories/trash.repository.mock.ts deleted file mode 100644 index b42867213a..0000000000 --- a/server/test/repositories/trash.repository.mock.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { TrashRepository } from 'src/repositories/trash.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newTrashRepositoryMock = (): Mocked> => { - return { - empty: vitest.fn(), - restore: vitest.fn(), - restoreAll: vitest.fn(), - getDeletedIds: vitest.fn(), - }; -}; diff --git a/server/test/repositories/user.repository.mock.ts b/server/test/repositories/user.repository.mock.ts deleted file mode 100644 index 2dc6b9eec2..0000000000 --- a/server/test/repositories/user.repository.mock.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { UserRepository } from 'src/repositories/user.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newUserRepositoryMock = (): Mocked> => { - return { - get: vitest.fn(), - getMetadata: vitest.fn().mockResolvedValue([]), - getAdmin: vitest.fn(), - getByEmail: vitest.fn(), - getByStorageLabel: vitest.fn(), - getByOAuthId: vitest.fn(), - getUserStats: vitest.fn(), - getList: vitest.fn(), - create: vitest.fn(), - update: vitest.fn(), - delete: vitest.fn(), - restore: vitest.fn(), - getDeletedUsers: vitest.fn(), - hasAdmin: vitest.fn(), - updateUsage: vitest.fn(), - syncUsage: vitest.fn(), - upsertMetadata: vitest.fn(), - deleteMetadata: vitest.fn(), - }; -}; diff --git a/server/test/repositories/version-history.repository.mock.ts b/server/test/repositories/version-history.repository.mock.ts deleted file mode 100644 index 98a9166487..0000000000 --- a/server/test/repositories/version-history.repository.mock.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { VersionHistoryRepository } from 'src/repositories/version-history.repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newVersionHistoryRepositoryMock = (): Mocked> => { - return { - getAll: vitest.fn().mockResolvedValue([]), - getLatest: vitest.fn(), - create: vitest.fn(), - }; -}; diff --git a/server/test/repositories/view.repository.mock.ts b/server/test/repositories/view.repository.mock.ts deleted file mode 100644 index 057d7ee28a..0000000000 --- a/server/test/repositories/view.repository.mock.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { ViewRepository } from 'src/repositories/view-repository'; -import { RepositoryInterface } from 'src/types'; -import { Mocked, vitest } from 'vitest'; - -export const newViewRepositoryMock = (): Mocked> => { - return { - getAssetsByOriginalPath: vitest.fn(), - getUniqueOriginalPaths: vitest.fn(), - }; -}; diff --git a/server/test/small.factory.ts b/server/test/small.factory.ts index d7b710eb7d..1faedf311a 100644 --- a/server/test/small.factory.ts +++ b/server/test/small.factory.ts @@ -1,5 +1,5 @@ import { randomUUID } from 'node:crypto'; -import { ApiKey, Asset, AuthApiKey, AuthUser, Library, User } from 'src/database'; +import { ApiKey, Asset, AuthApiKey, AuthUser, Library, Partner, User } from 'src/database'; import { AuthDto } from 'src/dtos/auth.dto'; import { OnThisDayData } from 'src/entities/memory.entity'; import { AssetStatus, AssetType, MemoryType, Permission } from 'src/enum'; @@ -42,6 +42,40 @@ const authUserFactory = (authUser: Partial = {}) => ({ ...authUser, }); +const partnerFactory = (partner: Partial = {}) => { + const sharedBy = userFactory(partner.sharedBy || {}); + const sharedWith = userFactory(partner.sharedWith || {}); + + return { + sharedById: sharedBy.id, + sharedBy, + sharedWithId: sharedWith.id, + sharedWith, + createdAt: newDate(), + updatedAt: newDate(), + updateId: newUpdateId(), + inTimeline: true, + ...partner, + }; +}; + +const sessionFactory = () => ({ + id: newUuid(), + createdAt: newDate(), + updatedAt: newDate(), + updateId: newUpdateId(), + deviceOS: 'android', + deviceType: 'mobile', + token: 'abc123', + userId: newUuid(), +}); + +const stackFactory = () => ({ + id: newUuid(), + ownerId: newUuid(), + primaryAssetId: newUuid(), +}); + const userFactory = (user: Partial = {}) => ({ id: newUuid(), name: 'Test User', @@ -145,6 +179,12 @@ const memoryFactory = (memory: Partial = {}) => ({ ...memory, }); +const versionHistoryFactory = () => ({ + id: newUuid(), + createdAt: newDate(), + version: '1.123.45', +}); + export const factory = { activity: activityFactory, apiKey: apiKeyFactory, @@ -154,5 +194,9 @@ export const factory = { authUser: authUserFactory, library: libraryFactory, memory: memoryFactory, + partner: partnerFactory, + session: sessionFactory, + stack: stackFactory, user: userFactory, + versionHistory: versionHistoryFactory, }; diff --git a/server/test/utils.ts b/server/test/utils.ts index a4a06f91d3..988d4cd97e 100644 --- a/server/test/utils.ts +++ b/server/test/utils.ts @@ -1,3 +1,4 @@ +import { ClassConstructor } from 'class-transformer'; import { Kysely, sql } from 'kysely'; import { PostgresJSDialect } from 'kysely-postgres-js'; import { ChildProcessWithoutNullStreams } from 'node:child_process'; @@ -50,48 +51,59 @@ import { ViewRepository } from 'src/repositories/view-repository'; import { BaseService } from 'src/services/base.service'; import { RepositoryInterface } from 'src/types'; import { IAccessRepositoryMock, newAccessRepositoryMock } from 'test/repositories/access.repository.mock'; -import { newActivityRepositoryMock } from 'test/repositories/activity.repository.mock'; -import { newAlbumUserRepositoryMock } from 'test/repositories/album-user.repository.mock'; -import { newAlbumRepositoryMock } from 'test/repositories/album.repository.mock'; -import { newKeyRepositoryMock } from 'test/repositories/api-key.repository.mock'; import { newAssetRepositoryMock } from 'test/repositories/asset.repository.mock'; -import { newAuditRepositoryMock } from 'test/repositories/audit.repository.mock'; import { newConfigRepositoryMock } from 'test/repositories/config.repository.mock'; -import { newCronRepositoryMock } from 'test/repositories/cron.repository.mock'; import { newCryptoRepositoryMock } from 'test/repositories/crypto.repository.mock'; import { newDatabaseRepositoryMock } from 'test/repositories/database.repository.mock'; -import { newDownloadRepositoryMock } from 'test/repositories/download.repository.mock'; -import { newEventRepositoryMock } from 'test/repositories/event.repository.mock'; import { newJobRepositoryMock } from 'test/repositories/job.repository.mock'; -import { newLibraryRepositoryMock } from 'test/repositories/library.repository.mock'; -import { newLoggingRepositoryMock } from 'test/repositories/logger.repository.mock'; -import { newMachineLearningRepositoryMock } from 'test/repositories/machine-learning.repository.mock'; -import { newMapRepositoryMock } from 'test/repositories/map.repository.mock'; import { newMediaRepositoryMock } from 'test/repositories/media.repository.mock'; -import { newMemoryRepositoryMock } from 'test/repositories/memory.repository.mock'; import { newMetadataRepositoryMock } from 'test/repositories/metadata.repository.mock'; -import { newMoveRepositoryMock } from 'test/repositories/move.repository.mock'; -import { newNotificationRepositoryMock } from 'test/repositories/notification.repository.mock'; -import { newOAuthRepositoryMock } from 'test/repositories/oauth.repository.mock'; -import { newPartnerRepositoryMock } from 'test/repositories/partner.repository.mock'; -import { newPersonRepositoryMock } from 'test/repositories/person.repository.mock'; -import { newProcessRepositoryMock } from 'test/repositories/process.repository.mock'; -import { newSearchRepositoryMock } from 'test/repositories/search.repository.mock'; -import { newServerInfoRepositoryMock } from 'test/repositories/server-info.repository.mock'; -import { newSessionRepositoryMock } from 'test/repositories/session.repository.mock'; -import { newSharedLinkRepositoryMock } from 'test/repositories/shared-link.repository.mock'; -import { newStackRepositoryMock } from 'test/repositories/stack.repository.mock'; import { newStorageRepositoryMock } from 'test/repositories/storage.repository.mock'; -import { newSyncRepositoryMock } from 'test/repositories/sync.repository.mock'; import { newSystemMetadataRepositoryMock } from 'test/repositories/system-metadata.repository.mock'; -import { newTagRepositoryMock } from 'test/repositories/tag.repository.mock'; import { ITelemetryRepositoryMock, newTelemetryRepositoryMock } from 'test/repositories/telemetry.repository.mock'; -import { newTrashRepositoryMock } from 'test/repositories/trash.repository.mock'; -import { newUserRepositoryMock } from 'test/repositories/user.repository.mock'; -import { newVersionHistoryRepositoryMock } from 'test/repositories/version-history.repository.mock'; -import { newViewRepositoryMock } from 'test/repositories/view.repository.mock'; import { Readable } from 'typeorm/platform/PlatformTools'; -import { Mocked, vitest } from 'vitest'; +import { assert, Mocked, vitest } from 'vitest'; + +const mockFn = (label: string, { strict }: { strict: boolean }) => { + const message = `Called a mock function without a mock implementation (${label})`; + return vitest.fn().mockImplementation(() => { + if (strict) { + assert.fail(message); + } else { + // console.warn(message); + } + }); +}; + +export const automock = ( + Dependency: ClassConstructor, + options?: { + args?: ConstructorParameters>; + strict?: boolean; + }, +): Mocked => { + const mock: Record = {}; + const strict = options?.strict ?? true; + const args = options?.args ?? []; + + const instance = new Dependency(...args); + for (const property of Object.getOwnPropertyNames(Dependency.prototype)) { + if (property === 'constructor') { + continue; + } + + const label = `${Dependency.name}.${property}`; + // console.log(`Automocking ${label}`); + + const target = instance[property as keyof T]; + if (typeof target === 'function') { + mock[property] = mockFn(label, { strict }); + continue; + } + } + + return mock as Mocked; +}; export type ServiceOverrides = { access: AccessRepository; @@ -153,48 +165,52 @@ export const newTestService = ( Service: Constructor, overrides: Partial = {}, ) => { + const loggerMock = { setContext: () => {} }; + const configMock = { getEnv: () => ({}) }; + const mocks: ServiceMocks = { access: newAccessRepositoryMock(), - logger: newLoggingRepositoryMock(), - cron: newCronRepositoryMock(), + logger: automock(LoggingRepository, { args: [, configMock], strict: false }), + cron: automock(CronRepository, { args: [, loggerMock] }), crypto: newCryptoRepositoryMock(), - activity: newActivityRepositoryMock(), - audit: newAuditRepositoryMock(), - album: newAlbumRepositoryMock(), - albumUser: newAlbumUserRepositoryMock(), + activity: automock(ActivityRepository), + audit: automock(AuditRepository), + album: automock(AlbumRepository, { strict: false }), + albumUser: automock(AlbumUserRepository), asset: newAssetRepositoryMock(), config: newConfigRepositoryMock(), database: newDatabaseRepositoryMock(), - downloadRepository: newDownloadRepositoryMock(), - event: newEventRepositoryMock(), + downloadRepository: automock(DownloadRepository, { strict: false }), + event: automock(EventRepository, { args: [, , loggerMock], strict: false }), job: newJobRepositoryMock(), - apiKey: newKeyRepositoryMock(), - library: newLibraryRepositoryMock(), - machineLearning: newMachineLearningRepositoryMock(), - map: newMapRepositoryMock(), + apiKey: automock(ApiKeyRepository), + library: automock(LibraryRepository, { strict: false }), + machineLearning: automock(MachineLearningRepository, { args: [loggerMock], strict: false }), + map: automock(MapRepository, { args: [undefined, undefined, { setContext: () => {} }] }), media: newMediaRepositoryMock(), - memory: newMemoryRepositoryMock(), + memory: automock(MemoryRepository), metadata: newMetadataRepositoryMock(), - move: newMoveRepositoryMock(), - notification: newNotificationRepositoryMock(), - oauth: newOAuthRepositoryMock(), - partner: newPartnerRepositoryMock(), - person: newPersonRepositoryMock(), - process: newProcessRepositoryMock(), - search: newSearchRepositoryMock(), - serverInfo: newServerInfoRepositoryMock(), - session: newSessionRepositoryMock(), - sharedLink: newSharedLinkRepositoryMock(), - stack: newStackRepositoryMock(), + move: automock(MoveRepository, { strict: false }), + notification: automock(NotificationRepository, { args: [loggerMock] }), + oauth: automock(OAuthRepository, { args: [loggerMock] }), + partner: automock(PartnerRepository, { strict: false }), + person: automock(PersonRepository, { strict: false }), + process: automock(ProcessRepository, { args: [loggerMock] }), + search: automock(SearchRepository, { args: [loggerMock], strict: false }), + serverInfo: automock(ServerInfoRepository, { args: [, loggerMock], strict: false }), + session: automock(SessionRepository), + sharedLink: automock(SharedLinkRepository), + stack: automock(StackRepository), storage: newStorageRepositoryMock(), - sync: newSyncRepositoryMock(), + sync: automock(SyncRepository), systemMetadata: newSystemMetadataRepositoryMock(), - tag: newTagRepositoryMock(), + // systemMetadata: automock(SystemMetadataRepository, { strict: false }), + tag: automock(TagRepository, { args: [, loggerMock], strict: false }), telemetry: newTelemetryRepositoryMock(), - trash: newTrashRepositoryMock(), - user: newUserRepositoryMock(), - versionHistory: newVersionHistoryRepositoryMock(), - view: newViewRepositoryMock(), + trash: automock(TrashRepository), + user: automock(UserRepository, { strict: false }), + versionHistory: automock(VersionHistoryRepository), + view: automock(ViewRepository), }; const sut = new Service( diff --git a/server/test/vitest.config.mjs b/server/test/vitest.config.mjs index 92fc027d40..071e4886f2 100644 --- a/server/test/vitest.config.mjs +++ b/server/test/vitest.config.mjs @@ -2,6 +2,9 @@ import swc from 'unplugin-swc'; import tsconfigPaths from 'vite-tsconfig-paths'; import { defineConfig } from 'vitest/config'; +// Set the timezone to UTC to avoid timezone issues during testing +process.env.TZ = 'UTC'; + export default defineConfig({ test: { root: './', diff --git a/web/package-lock.json b/web/package-lock.json index d9d457f0f0..6b2a0e9bfb 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@formatjs/icu-messageformat-parser": "^2.9.8", "@immich/sdk": "file:../open-api/typescript-sdk", - "@immich/ui": "^0.17.0", + "@immich/ui": "^0.17.3", "@mapbox/mapbox-gl-rtl-text": "0.2.3", "@mdi/js": "^7.4.47", "@photo-sphere-viewer/core": "^5.11.5", @@ -87,7 +87,7 @@ "@oazapfts/runtime": "^1.0.2" }, "devDependencies": { - "@types/node": "^22.13.5", + "@types/node": "^22.13.9", "typescript": "^5.3.3" } }, @@ -794,9 +794,9 @@ } }, "node_modules/@faker-js/faker": { - "version": "9.5.1", - "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-9.5.1.tgz", - "integrity": "sha512-0fzMEDxkExR2cn731kpDaCCnBGBUOIXEi2S1N5l8Hltp6aPf4soTMJ+g4k8r2sI5oB+rpwIW8Uy/6jkwGpnWPg==", + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-9.6.0.tgz", + "integrity": "sha512-3vm4by+B5lvsFPSyep3ELWmZfE3kicDtmemVpuwl1yH7tqtnHdsA6hG8fbXedMVdkzgtvzWoRgjSB4Q+FHnZiw==", "dev": true, "funding": [ { @@ -1322,9 +1322,9 @@ "link": true }, "node_modules/@immich/ui": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/@immich/ui/-/ui-0.17.1.tgz", - "integrity": "sha512-VB8a4t09paza6QoUnGtOsFG/XcjBfRqSiPsG2eUKRIavlpBYuNB5INZXV/207EfWX9TVnQND7ZitdTi39bZDvg==", + "version": "0.17.3", + "resolved": "https://registry.npmjs.org/@immich/ui/-/ui-0.17.3.tgz", + "integrity": "sha512-oZ8lJCa/bC+HQYxi4Qi7syW4jWpyyGM4Mue55cvXCECj+292Mu4aOC6oDt7617vMPF7kPblE2A7CpGqJxy5T8g==", "license": "GNU Affero General Public License version 3", "dependencies": { "@mdi/js": "^7.4.47", @@ -2064,6 +2064,15 @@ "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz", "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==" }, + "node_modules/@sveltejs/acorn-typescript": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.5.tgz", + "integrity": "sha512-IwQk4yfwLdibDlrXVE04jTZYlLnwsTT2PIOQQGNLWfjavGifnk1JD1LcZjZaBTRcxZu2FfPfNLOE04DSu9lqtQ==", + "license": "MIT", + "peerDependencies": { + "acorn": "^8.9.0" + } + }, "node_modules/@sveltejs/adapter-static": { "version": "3.0.8", "resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-3.0.8.tgz", @@ -2093,9 +2102,9 @@ } }, "node_modules/@sveltejs/kit": { - "version": "2.17.3", - "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.17.3.tgz", - "integrity": "sha512-GcNaPDr0ti4O/TonPewkML2DG7UVXkSxPN3nPMlpmx0Rs4b2kVP4gymz98WEHlfzPXdd4uOOT1Js26DtieTNBQ==", + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.19.0.tgz", + "integrity": "sha512-UTx28Ad4sYsLU//gqkEo5aFOPFBRT2uXCmXTsURqhurDCvzkVwXruJgBcHDaMiK6RKKpYRteDUaXYqZyGPgCXQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2563,17 +2572,17 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.25.0.tgz", - "integrity": "sha512-VM7bpzAe7JO/BFf40pIT1lJqS/z1F8OaSsUB3rpFJucQA4cOSuH2RVVVkFULN+En0Djgr29/jb4EQnedUo95KA==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.26.0.tgz", + "integrity": "sha512-cLr1J6pe56zjKYajK6SSSre6nl1Gj6xDp1TY0trpgPzjVbgDwd09v2Ws37LABxzkicmUjhEeg/fAUjPJJB1v5Q==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.25.0", - "@typescript-eslint/type-utils": "8.25.0", - "@typescript-eslint/utils": "8.25.0", - "@typescript-eslint/visitor-keys": "8.25.0", + "@typescript-eslint/scope-manager": "8.26.0", + "@typescript-eslint/type-utils": "8.26.0", + "@typescript-eslint/utils": "8.26.0", + "@typescript-eslint/visitor-keys": "8.26.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -2589,148 +2598,20 @@ "peerDependencies": { "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.25.0.tgz", - "integrity": "sha512-d77dHgHWnxmXOPJuDWO4FDWADmGQkN5+tt6SFRZz/RtCWl4pHgFl3+WdYCn16+3teG09DY6XtEpf3gGD0a186g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/typescript-estree": "8.25.0", - "@typescript-eslint/utils": "8.25.0", - "debug": "^4.3.4", - "ts-api-utils": "^2.0.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.25.0.tgz", - "integrity": "sha512-ZPaiAKEZ6Blt/TPAx5Ot0EIB/yGtLI2EsGoY6F7XKklfMxYQyvtL+gT/UCqkMzO0BVFHLDlzvFqQzurYahxv9Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.25.0", - "@typescript-eslint/visitor-keys": "8.25.0", - "debug": "^4.3.4", - "fast-glob": "^3.3.2", - "is-glob": "^4.0.3", - "minimatch": "^9.0.4", - "semver": "^7.6.0", - "ts-api-utils": "^2.0.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "typescript": ">=4.8.4 <5.8.0" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.25.0.tgz", - "integrity": "sha512-syqRbrEv0J1wywiLsK60XzHnQe/kRViI3zwFALrNEgnntn1l24Ra2KvOAWwWbWZ1lBZxZljPDGOq967dsl6fkA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.25.0", - "@typescript-eslint/types": "8.25.0", - "@typescript-eslint/typescript-estree": "8.25.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.25.0.tgz", - "integrity": "sha512-ZPaiAKEZ6Blt/TPAx5Ot0EIB/yGtLI2EsGoY6F7XKklfMxYQyvtL+gT/UCqkMzO0BVFHLDlzvFqQzurYahxv9Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.25.0", - "@typescript-eslint/visitor-keys": "8.25.0", - "debug": "^4.3.4", - "fast-glob": "^3.3.2", - "is-glob": "^4.0.3", - "minimatch": "^9.0.4", - "semver": "^7.6.0", - "ts-api-utils": "^2.0.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "typescript": ">=4.8.4 <5.8.0" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.25.0.tgz", - "integrity": "sha512-4gbs64bnbSzu4FpgMiQ1A+D+urxkoJk/kqlDJ2W//5SygaEiAP2B4GoS7TEdxgwol2el03gckFV9lJ4QOMiiHg==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.26.0.tgz", + "integrity": "sha512-mNtXP9LTVBy14ZF3o7JG69gRPBK/2QWtQd0j0oH26HcY/foyJJau6pNUez7QrM5UHnSvwlQcJXKsk0I99B9pOA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.25.0", - "@typescript-eslint/types": "8.25.0", - "@typescript-eslint/typescript-estree": "8.25.0", - "@typescript-eslint/visitor-keys": "8.25.0", + "@typescript-eslint/scope-manager": "8.26.0", + "@typescript-eslint/types": "8.26.0", + "@typescript-eslint/typescript-estree": "8.26.0", + "@typescript-eslint/visitor-keys": "8.26.0", "debug": "^4.3.4" }, "engines": { @@ -2742,18 +2623,74 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, - "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.25.0.tgz", - "integrity": "sha512-ZPaiAKEZ6Blt/TPAx5Ot0EIB/yGtLI2EsGoY6F7XKklfMxYQyvtL+gT/UCqkMzO0BVFHLDlzvFqQzurYahxv9Q==", + "node_modules/@typescript-eslint/scope-manager": { + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.26.0.tgz", + "integrity": "sha512-E0ntLvsfPqnPwng8b8y4OGuzh/iIOm2z8U3S9zic2TeMLW61u5IH2Q1wu0oSTkfrSzwbDJIB/Lm8O3//8BWMPA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.25.0", - "@typescript-eslint/visitor-keys": "8.25.0", + "@typescript-eslint/types": "8.26.0", + "@typescript-eslint/visitor-keys": "8.26.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.26.0.tgz", + "integrity": "sha512-ruk0RNChLKz3zKGn2LwXuVoeBcUMh+jaqzN461uMMdxy5H9epZqIBtYj7UiPXRuOpaALXGbmRuZQhmwHhaS04Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/typescript-estree": "8.26.0", + "@typescript-eslint/utils": "8.26.0", + "debug": "^4.3.4", + "ts-api-utils": "^2.0.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.9.0" + } + }, + "node_modules/@typescript-eslint/types": { + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.26.0.tgz", + "integrity": "sha512-89B1eP3tnpr9A8L6PZlSjBvnJhWXtYfZhECqlBl1D9Lme9mHO6iWlsprBtVenQvY1HMhax1mWOjhtL3fh/u+pA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.26.0.tgz", + "integrity": "sha512-tiJ1Hvy/V/oMVRTbEOIeemA2XoylimlDQ03CgPPNaHYZbpsc78Hmngnt+WXZfJX1pjQ711V7g0H7cSJThGYfPQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.26.0", + "@typescript-eslint/visitor-keys": "8.26.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -2769,10 +2706,10 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, - "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": { + "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", @@ -2782,7 +2719,7 @@ "balanced-match": "^1.0.0" } }, - "node_modules/@typescript-eslint/parser/node_modules/minimatch": { + "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { "version": "9.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", @@ -2798,15 +2735,17 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.25.0.tgz", - "integrity": "sha512-6PPeiKIGbgStEyt4NNXa2ru5pMzQ8OYKO1hX1z53HMomrmiSB+R5FmChgQAP1ro8jMtNawz+TRQo/cSXrauTpg==", + "node_modules/@typescript-eslint/utils": { + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.26.0.tgz", + "integrity": "sha512-2L2tU3FVwhvU14LndnQCA2frYC8JnPDVKyQtWFPf8IYFMt/ykEN1bPolNhNbCVgOmdzTlWdusCTKA/9nKrf8Ig==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.25.0", - "@typescript-eslint/visitor-keys": "8.25.0" + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.26.0", + "@typescript-eslint/types": "8.26.0", + "@typescript-eslint/typescript-estree": "8.26.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2814,30 +2753,20 @@ "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/types": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.25.0.tgz", - "integrity": "sha512-+vUe0Zb4tkNgznQwicsvLUJgZIRs6ITeWSCclX1q85pR1iOiaj+4uZJIUp//Z27QWu5Cseiw3O3AR8hVpax7Aw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.25.0.tgz", - "integrity": "sha512-kCYXKAum9CecGVHGij7muybDfTS2sD3t0L4bJsEZLkyrXUImiCTq1M3LG2SRtOhiHFwMR9wAFplpT6XHYjTkwQ==", + "version": "8.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.26.0.tgz", + "integrity": "sha512-2z8JQJWAzPdDd51dRQ/oqIJxe99/hoLIqmf8RMCAJQtYDc535W/Jt2+RTP4bP0aKeBG1F65yjIZuczOXCmbWwg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.25.0", + "@typescript-eslint/types": "8.26.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -2862,9 +2791,9 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.0.7.tgz", - "integrity": "sha512-Av8WgBJLTrfLOer0uy3CxjlVuWK4CzcLBndW1Nm2vI+3hZ2ozHututkfc7Blu1u6waeQ7J8gzPK/AsBRnWA5mQ==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.0.8.tgz", + "integrity": "sha512-y7SAKsQirsEJ2F8bulBck4DoluhI2EEgTimHd6EEUgJBGKy9tC25cpywh1MH4FvDGoG2Unt7+asVd1kj4qOSAw==", "dev": true, "license": "MIT", "dependencies": { @@ -2885,8 +2814,8 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "@vitest/browser": "3.0.7", - "vitest": "3.0.7" + "@vitest/browser": "3.0.8", + "vitest": "3.0.8" }, "peerDependenciesMeta": { "@vitest/browser": { @@ -2913,14 +2842,14 @@ } }, "node_modules/@vitest/expect": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.0.7.tgz", - "integrity": "sha512-QP25f+YJhzPfHrHfYHtvRn+uvkCFCqFtW9CktfBxmB+25QqWsx7VB2As6f4GmwllHLDhXNHvqedwhvMmSnNmjw==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.0.8.tgz", + "integrity": "sha512-Xu6TTIavTvSSS6LZaA3EebWFr6tsoXPetOWNMOlc7LO88QVVBwq2oQWBoDiLCN6YTvNYsGSjqOO8CAdjom5DCQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "3.0.7", - "@vitest/utils": "3.0.7", + "@vitest/spy": "3.0.8", + "@vitest/utils": "3.0.8", "chai": "^5.2.0", "tinyrainbow": "^2.0.0" }, @@ -2929,13 +2858,13 @@ } }, "node_modules/@vitest/mocker": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.7.tgz", - "integrity": "sha512-qui+3BLz9Eonx4EAuR/i+QlCX6AUZ35taDQgwGkK/Tw6/WgwodSrjN1X2xf69IA/643ZX5zNKIn2svvtZDrs4w==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.8.tgz", + "integrity": "sha512-n3LjS7fcW1BCoF+zWZxG7/5XvuYH+lsFg+BDwwAz0arIwHQJFUEsKBQ0BLU49fCxuM/2HSeBPHQD8WjgrxMfow==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "3.0.7", + "@vitest/spy": "3.0.8", "estree-walker": "^3.0.3", "magic-string": "^0.30.17" }, @@ -2956,9 +2885,9 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.7.tgz", - "integrity": "sha512-CiRY0BViD/V8uwuEzz9Yapyao+M9M008/9oMOSQydwbwb+CMokEq3XVaF3XK/VWaOK0Jm9z7ENhybg70Gtxsmg==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.8.tgz", + "integrity": "sha512-BNqwbEyitFhzYMYHUVbIvepOyeQOSFA/NeJMIP9enMntkkxLgOcgABH6fjyXG85ipTgvero6noreavGIqfJcIg==", "dev": true, "license": "MIT", "dependencies": { @@ -2969,13 +2898,13 @@ } }, "node_modules/@vitest/runner": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.0.7.tgz", - "integrity": "sha512-WeEl38Z0S2ZcuRTeyYqaZtm4e26tq6ZFqh5y8YD9YxfWuu0OFiGFUbnxNynwLjNRHPsXyee2M9tV7YxOTPZl2g==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.0.8.tgz", + "integrity": "sha512-c7UUw6gEcOzI8fih+uaAXS5DwjlBaCJUo7KJ4VvJcjL95+DSR1kova2hFuRt3w41KZEFcOEiq098KkyrjXeM5w==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "3.0.7", + "@vitest/utils": "3.0.8", "pathe": "^2.0.3" }, "funding": { @@ -2983,13 +2912,13 @@ } }, "node_modules/@vitest/snapshot": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.7.tgz", - "integrity": "sha512-eqTUryJWQN0Rtf5yqCGTQWsCFOQe4eNz5Twsu21xYEcnFJtMU5XvmG0vgebhdLlrHQTSq5p8vWHJIeJQV8ovsA==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.8.tgz", + "integrity": "sha512-x8IlMGSEMugakInj44nUrLSILh/zy1f2/BgH0UeHpNyOocG18M9CWVIFBaXPt8TrqVZWmcPjwfG/ht5tnpba8A==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "3.0.7", + "@vitest/pretty-format": "3.0.8", "magic-string": "^0.30.17", "pathe": "^2.0.3" }, @@ -2998,9 +2927,9 @@ } }, "node_modules/@vitest/spy": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.0.7.tgz", - "integrity": "sha512-4T4WcsibB0B6hrKdAZTM37ekuyFZt2cGbEGd2+L0P8ov15J1/HUsUaqkXEQPNAWr4BtPPe1gI+FYfMHhEKfR8w==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.0.8.tgz", + "integrity": "sha512-MR+PzJa+22vFKYb934CejhR4BeRpMSoxkvNoDit68GQxRLSf11aT6CTj3XaqUU9rxgWJFnqicN/wxw6yBRkI1Q==", "dev": true, "license": "MIT", "dependencies": { @@ -3011,13 +2940,13 @@ } }, "node_modules/@vitest/utils": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.0.7.tgz", - "integrity": "sha512-xePVpCRfooFX3rANQjwoditoXgWb1MaFbzmGuPP59MK6i13mrnDw/yEIyJudLeW6/38mCNcwCiJIGmpDPibAIg==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.0.8.tgz", + "integrity": "sha512-nkBC3aEhfX2PdtQI/QwAWp8qZWwzASsU4Npbcd5RdMPBSSLCpkZp52P3xku3s3uA0HIEhGvEcF8rNkBsz9dQ4Q==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "3.0.7", + "@vitest/pretty-format": "3.0.8", "loupe": "^3.1.3", "tinyrainbow": "^2.0.0" }, @@ -3101,15 +3030,6 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/acorn-typescript": { - "version": "1.4.13", - "resolved": "https://registry.npmjs.org/acorn-typescript/-/acorn-typescript-1.4.13.tgz", - "integrity": "sha512-xsc9Xv0xlVfwp2o7sQ+GCQ1PgbkdcpWdTzrwXxO3xDMTAywVS3oXVOcOHuRjAPkS4P9b+yc/qNF15460v+jp4Q==", - "license": "MIT", - "peerDependencies": { - "acorn": ">=8.9.0" - } - }, "node_modules/acorn-walk": { "version": "8.3.4", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", @@ -4349,22 +4269,22 @@ } }, "node_modules/eslint-config-prettier": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.0.2.tgz", - "integrity": "sha512-1105/17ZIMjmCOJOPNfVdbXafLCLj3hPmkmB7dLgt7XsQ/zkxSuDerE/xgO3RxoHysR1N1whmquY0lSn2O0VLg==", + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.1.tgz", + "integrity": "sha512-4EQQr6wXwS+ZJSzaR5ZCrYgLxqvUjdXctaEtBqHcbkW944B1NQyO4qpdHQbXBONfwxXdkAY81HH4+LUfrg+zPw==", "dev": true, "license": "MIT", "bin": { - "eslint-config-prettier": "build/bin/cli.js" + "eslint-config-prettier": "bin/cli.js" }, "peerDependencies": { "eslint": ">=7.0.0" } }, "node_modules/eslint-plugin-svelte": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-svelte/-/eslint-plugin-svelte-3.0.2.tgz", - "integrity": "sha512-+0QglmWNryvXXxRQKzLF3i+AreTsueCw7PBb0nGVBq+F9HoYqAjQeJ/9N6vFAtjMjK3wgsETrLVyBKPdeufN6Q==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-svelte/-/eslint-plugin-svelte-3.0.3.tgz", + "integrity": "sha512-R7HSKkLN33P6WwYhVbO+5xPT0YIpO+YAZfWxow7I1IvjVgZOxuI7zReqxFL3B7F028u16Megx+hn8SEXDNcDvw==", "dev": true, "license": "MIT", "dependencies": { @@ -4377,10 +4297,10 @@ "postcss-load-config": "^3.1.4", "postcss-safe-parser": "^7.0.0", "semver": "^7.6.3", - "svelte-eslint-parser": "^1.0.0" + "svelte-eslint-parser": "^1.0.1" }, "engines": { - "node": "^18.20.4 || ^20.18.0 || >=22.10.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://github.com/sponsors/ota-meshi" @@ -7196,9 +7116,9 @@ } }, "node_modules/prettier": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.2.tgz", - "integrity": "sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz", + "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==", "dev": true, "license": "MIT", "bin": { @@ -8419,16 +8339,16 @@ } }, "node_modules/svelte": { - "version": "5.20.5", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.20.5.tgz", - "integrity": "sha512-dpu2lTPVsAAgZFKpF7A9741sBCdXGogfxFU4aQeVgun7GVNCSVheTzj0FsT7g9OsLhBaMX4lKLwVIvmzQGytmQ==", + "version": "5.22.6", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.22.6.tgz", + "integrity": "sha512-dxHyh3USJyayafSt5I5QD7KuoCM5ZGdIOtLQiKHEro7tymdh0jMcNkiSBVHW+LOA2jEqZEHhyfwN6/pCjx0Fug==", "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.3.0", "@jridgewell/sourcemap-codec": "^1.5.0", + "@sveltejs/acorn-typescript": "^1.0.5", "@types/estree": "^1.0.5", "acorn": "^8.12.1", - "acorn-typescript": "^1.4.13", "aria-query": "^5.3.1", "axobject-query": "^4.1.0", "clsx": "^2.1.1", @@ -8444,9 +8364,9 @@ } }, "node_modules/svelte-check": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-4.1.4.tgz", - "integrity": "sha512-v0j7yLbT29MezzaQJPEDwksybTE2Ups9rUxEXy92T06TiA0cbqcO8wAOwNUVkFW6B0hsYHA+oAX3BS8b/2oHtw==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-4.1.5.tgz", + "integrity": "sha512-Gb0T2IqBNe1tLB9EB1Qh+LOe+JB8wt2/rNBDGvkxQVvk8vNeAoG+vZgFB/3P5+zC7RWlyBlzm9dVjZFph/maIg==", "dev": true, "license": "MIT", "dependencies": { @@ -8468,9 +8388,9 @@ } }, "node_modules/svelte-check/node_modules/chokidar": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz", - "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", "dev": true, "license": "MIT", "dependencies": { @@ -8484,9 +8404,9 @@ } }, "node_modules/svelte-check/node_modules/fdir": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.2.tgz", - "integrity": "sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==", + "version": "6.4.3", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz", + "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==", "dev": true, "license": "MIT", "peerDependencies": { @@ -8514,13 +8434,13 @@ } }, "node_modules/svelte-check/node_modules/readdirp": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz", - "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", + "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", "dev": true, "license": "MIT", "engines": { - "node": ">= 14.16.0" + "node": ">= 14.18.0" }, "funding": { "type": "individual", @@ -8528,9 +8448,9 @@ } }, "node_modules/svelte-eslint-parser": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/svelte-eslint-parser/-/svelte-eslint-parser-1.0.0.tgz", - "integrity": "sha512-diZzpeeFhAxormeIhmRS4vXx98GG6T7Dq5y1a6qffqs/5MBrBqqDg8bj88iEohp6bvhU4MIABJmOTa0gXWcbSQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/svelte-eslint-parser/-/svelte-eslint-parser-1.0.1.tgz", + "integrity": "sha512-JjdEMXOJqy+dxeaElxbN+meTOtVpHfLnq9VGpiTAOLgM0uHO+ogmUsA3IFgx0x3Wl15pqTZWycCikcD7cAQN/g==", "dev": true, "license": "MIT", "dependencies": { @@ -8542,7 +8462,7 @@ "postcss-selector-parser": "^7.0.0" }, "engines": { - "node": "^18.20.4 || ^20.18.0 || >=22.10.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://github.com/sponsors/ota-meshi" @@ -9518,9 +9438,9 @@ } }, "node_modules/typescript": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz", - "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==", + "version": "5.8.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz", + "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", "dev": true, "license": "Apache-2.0", "bin": { @@ -9659,9 +9579,9 @@ } }, "node_modules/vite": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.0.tgz", - "integrity": "sha512-7dPxoo+WsT/64rDcwoOjk76XHj+TqNTIvHKcuMQ1k4/SeHDaQt5GFAeLYzrimZrMpn/O6DtdI03WUjdxuPM0oQ==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.1.tgz", + "integrity": "sha512-n2GnqDb6XPhlt9B8olZPrgMD/es/Nd1RdChF6CBD/fHW6pUyUTt2sQW2fPRX5GiD9XEa6+8A6A4f2vT6pSsE7Q==", "dev": true, "license": "MIT", "dependencies": { @@ -9744,9 +9664,9 @@ } }, "node_modules/vite-node": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.0.7.tgz", - "integrity": "sha512-2fX0QwX4GkkkpULXdT1Pf4q0tC1i1lFOyseKoonavXUNlQ77KpW2XqBGGNIm/J4Ows4KxgGJzDguYVPKwG/n5A==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.0.8.tgz", + "integrity": "sha512-6PhR4H9VGlcwXZ+KWCdMqbtG649xCPZqfI9j2PsK1FcXgEzro5bGHcVKFCTqPLaNKZES8Evqv4LwvZARsq5qlg==", "dev": true, "license": "MIT", "dependencies": { @@ -9804,19 +9724,19 @@ } }, "node_modules/vitest": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.7.tgz", - "integrity": "sha512-IP7gPK3LS3Fvn44x30X1dM9vtawm0aesAa2yBIZ9vQf+qB69NXC5776+Qmcr7ohUXIQuLhk7xQR0aSUIDPqavg==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.8.tgz", + "integrity": "sha512-dfqAsNqRGUc8hB9OVR2P0w8PZPEckti2+5rdZip0WIz9WW0MnImJ8XiR61QhqLa92EQzKP2uPkzenKOAHyEIbA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/expect": "3.0.7", - "@vitest/mocker": "3.0.7", - "@vitest/pretty-format": "^3.0.7", - "@vitest/runner": "3.0.7", - "@vitest/snapshot": "3.0.7", - "@vitest/spy": "3.0.7", - "@vitest/utils": "3.0.7", + "@vitest/expect": "3.0.8", + "@vitest/mocker": "3.0.8", + "@vitest/pretty-format": "^3.0.8", + "@vitest/runner": "3.0.8", + "@vitest/snapshot": "3.0.8", + "@vitest/spy": "3.0.8", + "@vitest/utils": "3.0.8", "chai": "^5.2.0", "debug": "^4.4.0", "expect-type": "^1.1.0", @@ -9828,7 +9748,7 @@ "tinypool": "^1.0.2", "tinyrainbow": "^2.0.0", "vite": "^5.0.0 || ^6.0.0", - "vite-node": "3.0.7", + "vite-node": "3.0.8", "why-is-node-running": "^2.3.0" }, "bin": { @@ -9844,8 +9764,8 @@ "@edge-runtime/vm": "*", "@types/debug": "^4.1.12", "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", - "@vitest/browser": "3.0.7", - "@vitest/ui": "3.0.7", + "@vitest/browser": "3.0.8", + "@vitest/ui": "3.0.8", "happy-dom": "*", "jsdom": "*" }, diff --git a/web/package.json b/web/package.json index 1126c3652f..af45e08659 100644 --- a/web/package.json +++ b/web/package.json @@ -68,7 +68,7 @@ "dependencies": { "@formatjs/icu-messageformat-parser": "^2.9.8", "@immich/sdk": "file:../open-api/typescript-sdk", - "@immich/ui": "^0.17.0", + "@immich/ui": "^0.17.3", "@mapbox/mapbox-gl-rtl-text": "0.2.3", "@mdi/js": "^7.4.47", "@photo-sphere-viewer/core": "^5.11.5", diff --git a/web/src/lib/assets/immich-logo-inline-dark.svg b/web/src/lib/assets/immich-logo-inline-dark.svg deleted file mode 100644 index 024337c2e3..0000000000 --- a/web/src/lib/assets/immich-logo-inline-dark.svg +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/web/src/lib/assets/immich-logo-inline-light.svg b/web/src/lib/assets/immich-logo-inline-light.svg deleted file mode 100644 index 216466f58d..0000000000 --- a/web/src/lib/assets/immich-logo-inline-light.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/web/src/lib/assets/immich-logo-stacked-dark.svg b/web/src/lib/assets/immich-logo-stacked-dark.svg deleted file mode 100644 index 7f8381869a..0000000000 --- a/web/src/lib/assets/immich-logo-stacked-dark.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/web/src/lib/assets/immich-logo-stacked-light.svg b/web/src/lib/assets/immich-logo-stacked-light.svg deleted file mode 100644 index 8c4505d97e..0000000000 --- a/web/src/lib/assets/immich-logo-stacked-light.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/web/src/lib/assets/immich-logo.json b/web/src/lib/assets/immich-logo.json deleted file mode 100644 index 9422c6398d..0000000000 --- a/web/src/lib/assets/immich-logo.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "content": "iVBORw0KGgoAAAANSUhEUgAAAoAAAAFACAYAAAAszc0KAAAAxnpUWHRSYXcgcHJvZmlsZSB0eXBlIGV4aWYAAHjabVBbEoMwCPzPKXoEXonkOLHqTG/Q4xeEzKjTdbKLICuh7N/PUV4OQilSF229NTBIl07DAoXAOBlBTj5hJcrsLV9khmTKppwNLRRnPhum4rCoXoz0nYX1XugSSvowinmAfSKPtzTqacQUBUyDEdeC1nW5XmHd4Q6NU5zWw+bxHWXz810W295W7T9MtDMyGDO3GID9SOFhARsjd/vQn5GMrDmJLeTfnibKD6lPWpnDBF3gAAABhGlDQ1BJQ0MgcHJvZmlsZQAAeJx9kT1Iw0AcxV9bpSJVQYuIOGSoTnZRUcdahSJUCLVCqw4ml35Bk4YkxcVRcC04+LFYdXBx1tXBVRAEP0CcHZwUXaTE/yWFFjEeHPfj3b3H3TvAXy8z1eyIAapmGalEXMhkV4XgKwLoxyBm0CsxU58TxSQ8x9c9fHy9i/Is73N/jh4lZzLAJxDHmG5YxBvE05uWznmfOMyKkkJ8Tjxu0AWJH7kuu/zGueCwn2eGjXRqnjhMLBTaWG5jVjRU4iniiKJqlO/PuKxw3uKslquseU/+wlBOW1nmOs0RJLCIJYgQIKOKEsqwEKVVI8VEivbjHv5hxy+SSyZXCYwcC6hAheT4wf/gd7dmfnLCTQrFgc4X2/4YBYK7QKNm29/Htt04AQLPwJXW8lfqwOwn6bWWFjkC+raBi+uWJu8BlzvA0JMuGZIjBWj683ng/Yy+KQsM3ALda25vzX2cPgBp6ip5AxwcAmMFyl73eHdXe2//nmn29wO1pXLBEGyzRgAADXppVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDQuNC4wLUV4aXYyIj4KIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIgogICAgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIKICAgIHhtbG5zOkdJTVA9Imh0dHA6Ly93d3cuZ2ltcC5vcmcveG1wLyIKICAgIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIKICAgIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIgogICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIgogICB4bXBNTTpEb2N1bWVudElEPSJnaW1wOmRvY2lkOmdpbXA6MDY0YmE0N2YtMDU3MC00OTBmLWJkOGUtY2UzNDFhYjk0ZGY1IgogICB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjdmYzk2NDZlLTE5NWQtNGE1Mi1iYTE3LWM0NDM4NmQyMWU1ZiIKICAgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjM0MGQxNWRmLTgzZDMtNDQ1Yi1hMzkwLTBjNTQ1NGNiMWI3ZCIKICAgR0lNUDpBUEk9IjIuMCIKICAgR0lNUDpQbGF0Zm9ybT0iTWFjIE9TIgogICBHSU1QOlRpbWVTdGFtcD0iMTcxMDgwMjgyMTQ5NjYwMyIKICAgR0lNUDpWZXJzaW9uPSIyLjEwLjM2IgogICBkYzpGb3JtYXQ9ImltYWdlL3BuZyIKICAgdGlmZjpPcmllbnRhdGlvbj0iMSIKICAgeG1wOkNyZWF0b3JUb29sPSJHSU1QIDIuMTAiCiAgIHhtcDpNZXRhZGF0YURhdGU9IjIwMjQ6MDM6MTlUMDA6MDA6MTgrMDE6MDAiCiAgIHhtcDpNb2RpZnlEYXRlPSIyMDI0OjAzOjE5VDAwOjAwOjE4KzAxOjAwIj4KICAgPHhtcE1NOkhpc3Rvcnk+CiAgICA8cmRmOlNlcT4KICAgICA8cmRmOmxpCiAgICAgIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiCiAgICAgIHN0RXZ0OmNoYW5nZWQ9Ii8iCiAgICAgIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MTEwZjhhOTQtNTQ4MS00MTkxLTkxYjktZjQ3NzA3ZDUyYTVlIgogICAgICBzdEV2dDpzb2Z0d2FyZUFnZW50PSJHaW1wIDIuMTAgKE1hYyBPUykiCiAgICAgIHN0RXZ0OndoZW49IjIwMjQtMDMtMTlUMDA6MDA6MjErMDE6MDAiLz4KICAgIDwvcmRmOlNlcT4KICAgPC94bXBNTTpIaXN0b3J5PgogIDwvcmRmOkRlc2NyaXB0aW9uPgogPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgIAo8P3hwYWNrZXQgZW5kPSJ3Ij8+fd4ZrQAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAOwwAADsMBx2+oZAAAAAd0SU1FB+gDEhcAFf/Hh5UAACAASURBVHja7d15nBT1nTfwT3fPTPfcMMoMwqgzcnvwgERAnnXETTYZnyCR4OYBEhLdx30E8yhiEkUTA2zceCUq+CyQXfcRY4Q8CTgq7oKRuGj2EUhUDrkPRTkEBplh7p6rnj9qqqeq+ldXd3V3dffn/XrNS+mjuqq6uuvT3/odPkmSJBARERFR1vBzFxARERExABIRERERAyARERERMQASEREREQMgERERETEAEhEREREDIBERERExABIRERERAyARERERMQASEREREQMgERERETEAEhEREREDIBERERExABIRERExABIRERERAyARERERMQASEREREQMgERERETEAEhEREREDIBERERExABIRERERAyARERERMQASEREREQMgERERETEAEhEREREDIBERERExABIRERERAyARERERAyARERERMQASEREREQMgERERETEAEhEREREDIBERERExABIRERERAyARERERMQASEREREQMgERERETEAEhEREREDIBERERExABIRERERAyARERERAyARERERMQASEREREQMgERERETEAEhEREREDIBERERExABIRERERAyARERERMQASEREREQMgERERETEAEhEREREDIBERERExABIRERERAyARERERMQASERERMQASEREREQMgERERETEAEhEREREDIBERERGlixzuAnKTz+dzdXmSJHGnEhERMQBSuoe6RL02wyIREREDIKVJyEvGNjAcEhERMQAy7HGbGQqJiIgBkBj4uF8YComIiAGQGPgcSWR4StY2qV+HYZCIiDI2K0g8yzHwpTjcpct+4EeFiIgYACnjwk6mHgrcV0RERAyADDIMMNyXRETEAMjdkNlBhW8x9zUREREDYBaEEb6t3P9EREQMgBkeOvg28r0hIiJiAMyCcMG3ju8XERERA2AWBAm+XQyDREREDIBZEBr4FjHQExERMQAy+Al1bXkXrQ8vRu/xEwnbBv+llchfeA+Cf/tNvqEMgkRExABIqQh9ao3XTkFvfX3itykYxMAje/jmeuz9JyIisotzAafJiT8Z1T27gt9i9c/p+2r3eFAexyBIREQJzSmsAKY2/Nnd/U6re2XHDzte7/anl6P9medcXy4l7ocBERERA2AGBj8vVf6c8l9aidy/moKu/3zPcv2zrW1hIo4VIiIiBsAMOZk3TrkpKjzpq3DJavuX8P2YhW0LGQSJiIgBMINP4HZ3c/j3r6D9mefcq/j5fIDdt9jngyRJ8CXjtSyWkY29je0cS/y4EhERA2AGBT/AXhs8K2XHD8ddEcxfeA/Cv/mta1XF3Kk1KHp+BXzBoOZ2q/XM1t7GDIJERMQAmEHBz7XqnhuVtiS9pg+A1bOkvsfphebORsHP/4HHGYMgERG5zM9d4O5JWZIk4Um5/enlaL3/QVvhL3dqDQYe2YOy44cjf/5Bg9QvYnud1cvKX3hP7Buve01luVbLtLOmor1advxw1oY/s+Mo1qBIRESkOX+wAuhO8FNO2mqu9eBNRcXPzjoJgqGdil/Ur5BLKxH6u++hbek/Gm5zts9AwsvCRETEAJgmJ15RD1435Ez8EqSuTvTs2O3qcvMX3oOOFf8MKRx2ZXkD936AjudXo+NfX4TU1BR1f+7UGuR+9SuQ6usNH6N5L7J8BhKGQCIiYgD0wAnXate1/9Ov0P74L9xdJxhU2DxWJfQPGgQpHLYMdZr9CZj2QM7mNoFuHpdEREQMgDGcYN0+yYouFVuFIc+FvniHkLHAGUhSe4wSEVFmYScQhydWu43znRC1E7QVpLx0gu8Lf26vkQQg+K2ZPDBjOA7ZQYSIiAzPEawAOgt/iaC+VBxV+YujyudTLU/S3Wb3uTHuyEg1MHdqDQLDr0D31u3o3rvf0Xob/mrJ8g4hsQQ9fsyJiIgB0MMnUPXgyEYDKAPA+UtHaP6tfmy8A0GXHT+M8OtvoO2eH0Dq7Y15Ofl3/08gGLTVwUOzr3UhWHQ5PNs7hDAEEhERA2ACT5zJ2j2idoADj+wRhj9RALQTpDIJO4R4+3gmIiJvy+HJ0hsny9b7F0VV7YzCX/vTy+1tn/r/y8pQ8u+voPP/rndckYNuOaV/egv+khI0DL/atSFjnGCHEPNj1uy49vVdniciIgZAhr8UBj9FVPiDvSqf7e31+3Fh8tS4l1P6p7fQ9eZmtD35dPLDn8+H3Osn8VNrIwSaHeMMgURElJWXgL0W/uBC2NNXxaSmJjRcNcHRMvyDBiGv9ivIveXraP7Wd8S/GK4dh+4Pd8a238vKIJ0/H997x7Z/aX+sExFR6mXdMDBeOCF2bXkXjVNuwvlLR0T+HL9xQy4Rb0NTE9qfXo7G62+yHfpCc2ej+He/wYAP34N/zBi0/mCR4eNjDX8AIDU22nmDzJeRgkvO6czsmOYwMUREWVwgyKYKoFeqIU576Rr1BlYHx1h63KqXKzU1ofX+Reh8863Y9m1f20BfMIiWO+9G15Z349pH+kqjLxiMhL/8hfcg//57+elNw2OfiIgYAD1x8kvFCdBJxS84fRoKnn7c1lAwTnr9qpfb/eFOtPyvhTHPW+wvLUHJe/8Bf0mJvB7hsKMQGBh+BXqOfGy5vuHX3+gPvIt+iPzv38VPcBp/DoiIiAEwq056ot6z6gqXLxhEaOE9woAjGi5Gt8HCgaOVNoLh37+C9meeEz8/jkGn/ZdWIvjtWfJrvPxb0zBpNpBz+9PL0f7Mc9bvK9sCMgQSEREDYCwnvFRtunrmD0Ae0w7BIDqeX20ZcBqn3BRTpa7s+GHb4SoedquQZgGua+t2tH5/oeVlcg4HwxBIREQMgGkR/sx0vvkWWu682zTg6MOjEf+llTFf0rXDf2kleo6fEIc91VRwvkAAUk+P4wDXW1+P1u8vRNfW7QyAbujeBHQ9AeR8D8i93fTzwQBIRJT5MrYXcDo2es/72t9YPib/+3eh7PhhlB0/jIFH9iB3ao04QDkIf4Gqyx0Hq15V+JOidzB8kDtrDDi4y3AdTQ/MQYNQ/LvfoPDpJwwfY3dAbALQcQfQvQXomG/5OWDvYCIiBkCGvxRqnHITOl5aa7ydwSCKnl9he3miLQ+MvQY9xz7VBK/GKTc52dlypU8U0J55Dh3Pr0bR8ysQ/NZM4faFf/+K6eJF7QTVy/dECOxaDbRWA82++P5aq4HOVe69Tmu1/BwAkE4rSdDW54EhkIgos2XcJeB0D3+iDiJWw56on5O/8B50rPhn4Xh5onZ36iFpcqfWoPvDnY6niVMvV98DWP+a+p7LdjpzqJ+j7ixjd/8kVHgJ0LnU3WXmLQaCS1x6nRCQ96D2ucVSRv5gIiIi+zKqApgJJ7LQwnuibrOqdAXnztY81nAfqIKTMhi1uqNF15Z3Y5ojWAqHI8trGH61ZvgXKRw2rfRJ4bBlFTDe/ZMwnavcD3+AvEx9NS/m1+nQPjd3lqPPBiuBRESZKWMqgJlWxRCNpWdU6RI9NndqjXAcvpJNryPnqjGOB6PWKzt+WFN5FFXmNO9PX6VPNAaiVRVQ/RylfaJoOUmvBLZc0n9pNacWyK8DENLebh1pgeJ2Oai1z5A7a9h9Xt48ubrnGxx9d7Pg86Bexyz4DBERUYYHwEw9cTkNgQ3Dr478e+CRPWj9/sKYZ/awEwDblv6jZugaK2Y9k806ntgNgECSB4huTnJ1zAdxQ04A8FfJ1b28xXLAc7pu/iog90H4gvMZAomIskDaXwLO5KqF0slD3YvW6HKnLxjUzBbS8U+/QtHzK5C/6IdAIOD6urU9+hjyF/1Q2MPXqIeyWc/keC7hql+nI8HjHGqFrB9SLIn/7Dw3p1auDirPKZLkCl5gXPRje48B4ceB1vFAeL7zTek9BoTnQ+pYHNNnjYiI0ixjpHsF0NWxzM5cAHYeA9pUlzILgsDoIcDlg1K2jUZTq+ln1Gj5+7vRuam/4udkajg3KVU6p1PCGVXvrCqAA4/s0VQ/kzY+YPtN8tAqhgcnAF+VtjIXee7N1pd7/VXy8/rG7dPoflVu29ez0/3tylsMX2hpRv6oIiKivlMMw5/Khx9rwx8g/3vXp6ndTkElEJAram0P/bQ/E+zZF5U/nAY39V+i1ttIrNU70TzJCdV7AGi7Xhv+cmoRVdWToK3M9WyTbw8vsdfWr/eYZtw+jZxbgYId/dVB3wDr5RV9blCRbO9b/z6dSw0rgawCEhExAGZW+OvqATq6xPf19KZ+e/vClH48PXUv2uB3ZouzwrXjEPz7vzNdfnD6NPfykapziZOxCs06kXiC1CiHN3WYU8Jffl1flc8iNLZ/z1mP3pzJ9tZJarReVssl/eMDhucDPUqADcnrHxUCH2MIJCJiAPR++IvZJ2eBN3WX0mZM9N52B4Mo/OXjKDt+WFP1ar3/QTROuQn+8kFRlTv/pZXIu+2bKPzpQ6ZVvfDrb2iGa3EyNIvehetvQtvSf4wEQX37xLTUuapvoOal6B9MOQTkPQbkb5T/P7hIW1nL3wj4LtYup/vXzl63+x3zwZ5bBjofIqb3mLw9bTfJobDzWcMQmLTPIBERMQDGKqbq3/6Tcru/LtV8tRWlnt9W/Xh46svB6rDVe/wE2h7+qa1OFsoy2p9ejtb7H4z9fQiH0fH8ak0QFI3flzbCS+SKmbrKFpgMFO6QQ5+RjjsA6Zyz1wroK34JbnMnnQbCC+VtVEJg5FJ2h2mnECIiYgBMGlcv/e49ARw4GX37mQtA3Z89vR/yv3+X3MNXF7zOXzpCeCm1/Znn0P5Pv7IV3tpd6kmrDoLSuXMY8OF76Rn+1JUwfxUQegEo2Ar4R4uf071JrhbaHgsQ/Q02lUvLie5roV++Mvh06xjAP1hzO9sDEhExAGZG+GtuB97ZBxw6ldZvXv7374q6HKyXuiFSxEHQir5SmdK5fvXhL6cWKNwv7pWr1nGHfJnV8tM32jiQCQ/1UNQ0bo6GlbFcPuT11q87QyAREQNg2jpzAXhzl1zZ2/wRcL6lb2Dd9B/Wwuzyqn5atlSy8/rqSmXHS2s11UijjiqNU25yf2VF4c9oFg2l4qe0y7NT+cupkTuGmO6wqGQZPcCz8pqRdoluvFGC29gekIgoo6TNOIBxV/827tD28tXPqiDq9PH6+/09gEcPBcYMTYs3VT1Fm9uMpphz9b3umxpOPV1d7tQaFD2/IlLtNJoJBHBhHEAn4Q+wOfVbSO4lrLQZ1E8jF1oLdMx2MBVcij6HJYjvc0hERJ6Qk/Hh79N64MCp6CFe1E/NDYifox7+5cBJcXtBwBODRWuixsJ70P74LxKy7J69+/VvDiRJEl5RLHp+BTqeeQ7d+udYUMKrejgZJfx1bXkXrQ8bd0wIzZ0d24Z1b5I7eugvfxqFP6PHiwQmy+0GNZd8VYGxZ6fcmzcNSE3iEOjrOw6IiCg9pEUFMOYAuN8ktOkpFUAnz9Gc5P3A9C95cv91792PptrpSX/dsuOHHc8Gon6uaAYQdVVQ9JyYiap4ZpU/W1U/RLfZU7g1j7B6+frKpRNKdbJ9hmUV0rAK2LEYCC7htyoREQNggsOfaOq26AcCdtoo+Xzxtwf0WCVQre3hn6LjpbVpc2AaBUCjS7+hubNR8PN/iDEhb5KnZlPLnSVX7ZTw56TiFw9l/j7/aOs2gspUc4GJQM92oPdT7X2J+mTn18GXO0O8+k2Qe0qLpr8jIiLPSMtOIJHMKpq6TRTsKkrl6pzZ4M5Owt/oofLy9OMFemDaOMNs+vN/sOwxnGzFL/2r4TRxXVu3R91m1CO47Pjh2MMfIPfa1ayYJLfJU4cXuz174/7FAzk42ZnZQ5lqrut32vCXU6sNf0Y9h/VTwBnShbienebVd9H0d0RE5CmebgNo2bvQaOo2veYO4MQX7lXm1O0B9RVGD0wbZ3oqv/t/ujbOn5GLThyxfMwXlcPR+vBilG56DQ1XTYh+y771Hc2/W3+wCOHfrY/enljb/EVCVKP2Um7ePOvHJFqsl3EBIDBJvmzdnK9af926S6cB32BEBn7umA90rTb7oAnWT1zZ85X0VQGB/unvALkqmHMrkPdg32sTEVFKM5ZXLwHbavenHqxZqe6duQD85Yh2Zo942b2MrPDwpeD2p5e7FgDtBD2nvqgcbn1sBIMo2fQ6AsOviO1FzC7nKtWyrtVy0LFb9fNXJadC6CX+KviKxNssNQ8wr2L6q+RKp9WYikRExAAYFQD1w7RUlwN/2NV3m9KYyvUVs3e52KOdQsw6UaQi8MUSCPMX/RD5378r9oUadeDIqZXn742nM0W2fYEYdQjp/Vy+bG7aoSQkX4YmIiIGQNvhDwA++gw4ojqR5wSAbn3lLwFBsCAIDCwATjZYP656EDByiGf2rboThZ1hWlIR+qzCYNzj/Ol74KqrUQx/7oVA9ee1+1V5v/bsNN73RETEAGgZ/gC50rf9sHzZV6SiFJg0Ajj0eWxDu5jRV/jM5g7+66uB0gLPBUCzYVq8FPxsHQuxBkC3hlHJNMWSo6FqRCHQ8H1qzoe2XSErgUREWR8AHY/519Mr97z9tN4oLYjb77kx7It6Wb298n+tlpvi9oGioVWkcBhtDy9G+HfrPR384g6CorZ/SgDsXCXfR6rjGuI5iiV7AdDwPQo/DnQ+FB04iYgoadJiGBjTE31bGGhuNw9nRsHQvRXsfx2r5XpwqBhfMIiip59wJfydH3aV8ab/chkkSYr8NYy/Pu4fC47moTUaykU6DYQXOvjUVAGBcd548wLj5AGcfRf13RAyHtrF1pAv6v1icVuxBKU3cKTnrx3BRQx8RESpPvd7qQLouPp35DSw74R26BWjCpxRJbC8BDjblJgNqi4HPjkrvq8gCIy8RH5MEokqgI5CVDr+SFBEtf0bDaAj+3rvxipnKtC9RRsAVdU8x/MEG12KJyKihPOn7ZrvPyl3AtGPu2d0shGFnBkTgf86OiGdhQEA46rk11D+Aqrd3RaWZzHZfzKlu9Fu+Gv75TJv/5JxGmKLJXmYErfDX2SQZd2fabCqBYobnFfokq1bMKizqponNYGIiNKE5yuAwtX75KwcnkxZ9P6tvAgozpc7h+hfI+B3b0BndaXv0Clg7wnzxya4faBSAbRzubfl/gdR9PQTnjlYG66fioFbt1g+znbFqdnHbwAn8ubJbSXV+1C3b+31CDZpi0lEREnhmQqgowqOqEdvwA9cVQmEcpUlGj+/MARcWw0cOGFcMdRX7GKlrvSNHCIvVzSNnPLYBLcP9AWDttv6Ffx8KZq+83eGJ3TlT3R7b0eH5rnnh11luCwz6ucM3LrFtI1hTMdSuvBCPtIP4RKrZE2rR0RExudKr1QAbVf/APGQK9dcBhw9I5gbOMZxAAuC8lPbbcw1HMsuDOXKs5WIKo0JbB/oNBz1dnSg5c67UfKb/6O5veH6qchf9AMEp0/TLFP9nknhMPyhkGZZbQ8vdlRVjOU5hscPK37J+SyLhoRpqTIOfXnzgOBK7jgiomwLgI47f4gCYCjX/tzAbhk9FDj8eXyXi0cPBcYM1c5qor8vReHPKgQCQOd725A3ZbLhe9Yw/GqUHd0beWzu9ZMi9zVeOwUDd2yNes9FgTLWddesT9T4czHKqZXn0FXmw3VruZ4TAgr+A+j6FdD1W9vbaHgZWNRGkJd+iYhSwrOdQBzl0kEl9sOfm5cHD5zsD23K+jpd/oGTctvA0UPE9+085kqwjeeyqD8UQtHzK4T3tf5gkelz8772N5rHSmG5otq9d39U+Ev4j4vcWe6HP0CeySIjdchD3oReAIo+t12ls90ZJG8ev4GJiFIk5RVAx9W/C23A23v6/x3wA8MGyyFKr6JUPEvIjIny8DEHT2mDYTJ2RUEQGFYBnL1gPIOJ2XNj6CRiFf4arp+K/IX3IPStmaaPOz/sqkg1zzAy/G49gn/7zci/e+vrcWFqLcr2fRi57Yuq0bjo2AHD993NCmBkOWaXIEUhTzSHrSj8iYg6OQiTdRXgvx7orkPKK4j+Kuft8oolw211PCQMEREl92vfiytlOuvHBx/rtsAnDn8AUFpo/CL6mUPUr5nIpmJtYXn4mtJC551MYugkYic4Ddy6BW0P/dTycepqnuEq6pbjHzQIBUt+rLnNKPwl9IdGkYNwk19ncnvI+vlGnRzy5mmf33sM6F6rCn+h1H3oYu2UYbCthlXA8BJ+6xKRrXOX48H+Kf0DoKFDn8sVQLWuHpPHnzI5cfVdVjWa7UACkJeTwG05FdvzenqBN3fJw8lYtD00++C0/e9Vmn+rK3sN109F+6/XROefJQ/j/JXXRv4t6pFbdnSv5oPr8/kMK4sN109N7hdKidGnoEp3g1EQs1H5a62WZxbRB7/8jX1VRbNKn0faEebNk8Ou1Wwnzb7obbX6EdW5lCGQiOIuXFC2BcBjZ43vqyiVh1cxus/wSDO4fcxQ4MvXuNdmcPTQ6OFfenrlKuDwwcDN482HiNGkt7AcIP9jL3C+JabVKfhf8wxD3MCtW5D/3TlRgz8HysujqnmSJKFrz77Y9klH2NbDeuvrE3dMFUtAwVbnYU+4PYJqWLEkt52LaeiTEJD3mLyMoga5raFvQGI/Y8r65twKFOzQDmZt1dYxpxYobu9bX8k4hDMEEhFldwB0NPQLYN4ZYtII40uqk0Zo/x3Vi1jwmgdOAht39F0adqHd0oGTck9ffQWzp1ee0m7jDrmy99k5eX3ttPNrbgfe2SesJtr9BRVaeI9xSPzBgsj/N1w/Nap9n1I1zLlqDFruf9DxLtF3Aml96JGoxzROuQmB8v7hcC587RbTZUqdL8jt/YyOOVEVsFM1xIxS9RKFnWaf+Z+oGmZ2n5nAZHkdun8lP79loBycpMbEfSDz5snLDy+RK5n67etcav583SVy089y51J5ma3VQNdqfhMTESU7g6WyE4jjACga/kUxY6LxY2ZMtPfcnl5g+2H7nTOMOpnYUVrQl2jaou8TDf8iGibG5DmJGPLl/LCrMPDIHmEnDSkcFj5PeU4kSKqGhTF6383WPbzpDwjWflUc/joWwxdaams7I23UiiWg5ZL+gJZfJ1e/1AEuqUJyFU06DbRUQ3hZ2F8lh8PwQ86DpZp6CBapEeh8FuhaZh0yc2qBnm3RjxMM6SL8jDcZbDMRkeB7g53HEiMn47cwlCtX1mxVXfxy9W3Xp9GdREQmjQD+30Hgi2bn6yUKfooDJ7WznRQEgaKQvecUBOGrHRfz7vKHQnIILB8UNfhy2dG9UZfEG6fchOD0ryO08B4UPb8i6nnq5zRcPxU5147DF52duOj44f5l9LUFDP/+FbQ/85zhujV95++iwp/UtREIz4ev6Jjt8BedSFQhSh3+UqLDOnT2HpMvKcf1DRtHuBX1kHYypEvu7bqqXweIiCjJQTtVFUDHw78AziuAFaVyGzmzjiLq56r19MpVNzOjh8rtEpMxAHXA39/G8dN6uSexYLt835zk+kvbGf6lcepXUfjLJ5BzrRw+jSp9Rtp+uUxzydl2dmseDF+xuAomtcnDtvh8+eL7mxA9J7C+ipWxgzyb/QqokiuMubf336aukupZDOZsWOk32+9ElL3BhBXA5HzVe2llXH+TJ42wDn+DDLqGnvgClm3/DpxM3uwjPb1yuK37M/DhJ9bb5SKzdoKKAVv+gNwJ4yM9f52EPwCm4U/UNlBp62cU/gDYH7bFTKYM8myn2KcM+hxc2d9Gz6oNIwdzJiJKS5l9CfjQ59aPMepFe6weiR0Q0AaHU80lovoH9PcYTpXCx36mDX8di+HLs3MJ1Dz8+UqU4R9DiFT5enZqhz8JLpL/THUA7TPEl0YT9skVDErdsxNoux7CiqXkoJ2dWbUPYLWOiCgD+DNqa/RVMXU7OiOicHWhLebhVVRn3Pi3Rz3VXKxr0d6ZlF1v1TvXCVHFL7I94ZXCtn5SR4whtbVaO7RKZyztCENyGFNfMk2k3FmC6mYHEL4jOvz5VPdb9WK202PZpYofx/kiIn43pHhfp6INoOPevwqzNoCTRgAffiy+NGrVW/eqSmDkEPkxO4/J4+xFnUVtrF9BEGjt6O8ocfN4YPNu9y/XGkwJJ9yvr/0FGD0EvlFDXX8f7bQNjHU5+unp1J09ogJhcL44LNqcRi6qV6q/Csh90H7Y6VotB8dYZ9Owou+ZLBJeKPfiVQJp4Q7APzr+NowuVfssewOzqhi1r9juiRj++DlIpMypAO46Zhy09OMA6h3oG0dPGP7QF/5s/CppC2t7yYZygWsugyvVQP3r6KaEMwo5vm9c1799LgvOne34OaLqnmg5+unpfLk3i6dzCy90f8N6j8nz29oZrDi8JMZBnm3KqTUPf70H5Mu+kfAHud2if3T//8cqWe37cmr5TSz4HLMSQtmO4Y8B0B6jzhjV5dZz7iqXWQfkmx2KztanuEBe7uWDVOHRxYO5IGi/beA3rkvILi9c8hOEN/3B1uVfJfjp2/OZLUczPd3k8ej4taDDTt7t5ifT1urYN1DfEUL017k0Mcdz3jy5Kpa/Mfo+Zcq5Zh/QOkYek08dptRtFoOLtLN5OPkLrnS+3l2rxYNIC799quROJ6JtJCKixP7gzJhLwCLq4V2snjtjojwbh5u9eovzgWur5dk6ROvkdOBpo+WXFWVUtcDo0rKdS85SUwi+EueXPCWpPb6OHKJOGXYvvzq9/CnspBGSq32WHVYSKLzEMBCLZmDhr3vz70fuH8rWY5/fEcnh5y5Q0Ye/eEOVMlWbPsTW/dn5tG8my7ds47bjk7R6G4yGnQl+65vWT7a45Gk8TVxfR45YLkcKO2XA3uVXJ5dZleqaPvwFJstt/twIfz075cvqoipeqqqhWUaSJJ74iCjxgTvZFcC4Gnk6rQCqp0cTPTfg77+MOqgEqG+Kb+MKQ8CXr5bHEDQYqNl0HdWspn5T79MEDf+S9idSB9XA/mPQeWGBnAAAIABJREFUwZAuoqpfohhV19zoPNGzE+h+Eeh+1Z22jAb7hQ28ichJPuD3Q2Jl9jiAB04CAZ/cw1d44lMFLKfhz+8DenUHZ2uH9ewhonW0M1xNrCFo0065F3BVefYd3XmLATxk77FOp0XLnSW3X0tk+Ot+Va7GGYUyq+qhMr9v94uJ66SSiv1CRBkf/ogB0JjV0C6RgHXKOADGozfGXybxtDU0qhaafahqx8lDwWTjF0roob5fkXL7Pl+BcVXPVyIYDsYsWAaXJHblpdNA+2xEtSG0U3VUgl/XMvn/He20wUDurUDOfwcCU/kNSUQpCX+s/iVhv6ftJeDpX7JfbZsx0fnlY6eK8+U2ecl+A2O4/JuNVUFJagc65sOXv9r4MbG0ABDNmxuL7k3y0DNmlbrcWUDwGaBzlbtVvSSFPn7JE5Gd7wZ+LyRH+lYAA3H0Xxk91J3LrhWlcicO0bqcawL+dMDeMsZVAZs/Mm7zZ7faqXx4XvtLJCCLhoDJxqqgz5evCYPqf4vpp04zaBvYewzomB9/AOy4w3gGjvw6OZh1PisP++KkqudWQCUiosw6L6ZtBbAgaDBoc5JcXCK/fqLXobpcHkx616fAp/XR+5MdQFwjNWXQxngw+LECSER2vhv4vcAAaB4AUykRYwbqlx/H/qQYA6AkxT91WpaGOwZAImIATLM6gSdOuumm7s+JC38FwcQtW73f02xswKSJZ+q0ZAS/0AtA4SdpeUlX9FnnDxgiohQF72RWAOOuAIjGxnPYPi4hpk0AjpyWB3ZOxCXhgiAweohwwGieQFP0Y6RnJ9A2PrYXSub4gR7/pc9f+0TECmCKagpptbbVgl6r8cyk4YaAH3hzp9ypJJ7wZ7YNbWG5DSB5R2Ccs1k8FEazhhARESUzeKdVBRAATjXI8+cqjNrLbT8EnGpMj3ehulzuCXyqQQ6SF9rMH18QBCovkodyyQnwKHYJf3WmyXcAEWX09wK/E5Ij/YaBsQpHivOt9pd53XDgs/rkXkoWBdchA+U/NdFl77YwcOgU8HkDj2AiogwKQQw/xAAo8slZ6/H7Pq2XZ/+w25GiohSoLAMuGWA41EpC6Hs0G7XzGz0E2HtCvAyDgaelY2eRlVO/ERGlcfhT/p8hkJJy3KXVJWDR0CvqStp+i3l19bN1mA3kvD+xc/QKBfzyAM5WPq0HPvoM6OqR9yvHAnQFv3TT4DuAKAs+F9n2meAl4NRIrwqgqKrnZGxAfcXsuuHi8Gen0pgIPb2ujXWYDtO9bTzZgSf2tuG/Xx7E/FGFDH9ElLU/PnkJmBgAzQT8xtOlqdkdGuadfcC11UBZkfb2o2fiW0+lsviHXeYVS4WonV+8PN5z+PO2HlTXnUPHtyuw7eUz/CQSUczMhsNKl0DF4Bff+8z96Fx6DQMzeoj1YyovksOXkWLVHLDN7XII1Lf7u7g49nVUXj/gjw5/1eWxb1csLrs4IYvdeLIDVa/I+6zqlXq8cKTN9nNfONKGqlfqcUlBAB3frgCAyH+JiNwOBT6fj+OlZkn44/vtcJ+m3TAwQHTFTNR2TlRVU6pvujZ0COUCN493f4PVl3MdTO+WyA+HGwb//ixO/21/mA29fMZWiFu8sxlLxxV78oPAX41p9h1A5PB7j8dZ+n4nxHJ+4/ttzZ+Wa62vmIkun+ofo66+XT4I+MrY/n93dCVl+rVMoQ5/gHUFryHci/v+Yhz+xr3xBcMfkUVFg1WN+H70ch+mBzfCH99ve3LScq1HDpH/zNrOKY8xEsrVtincuEP+r8m0a9lu48kOzN/ejGPftL9vVh5sRXXdOTTO6g+No187hwPf6L88vXhsIWZw9xLFHXISsfx4fiAlqnen0Xqrl2/0mFg6W2RyL1U3jrFE7Q8773OyPiuZyJ/Wa69U+apj7Okqep5bnSeSXFFMxhfSHe81OQp/i3c2Y/6oQk34q93cgFCg/4M6eeMXmHEZp0Uj8uqJP9ZKiug5blRl7D7f6jvR7rokajus1isZgcat10jE+jpdHq/kxLCP07INoJuMpl+LtxK485g8nAwAlBYAf3112lcL7DCqEla9Uo/FYwtxsKkHj18rXwoOvXwGO75ehjEDcmN+vXWfbsbyQ2vx7t/8a0zPv+K1aZaPqSyowL0jZ2PmZV/mN0Ymfgek0f5KdAXNrROs1fJj3Q4nFSE3npuo7Uj2+52s80Us6yvaZrffZ37HiCW1AujJsu2QgXI4mzFROyZgPJXA/Sf7wx8AjB6acQeO0QdKVCWs3dyA/dMvwrGW/vAHyJd+4wl/zx54Gbdd/pWYw59dJ9rO4JHdK/htQRkbwt1ctlcvxTkNsHarg+l46TGTL5fy8rBHA6DniTqXvLnL2fRw+kGkK0qj5/dNwRfcYx+1RIZuMWI0pIt62BcjdZ/Jj9F3EJn1biPqppZi9dF2TSeQ2s0NeOiaItvb9s6Z91Hz1v/Q3Hbf6G/Htb/sVP8U4d5O3Lj5Tqw5tpGfkxRXDMj9E78kSVF/TsOO0/ZabrU9c3IMxVMpzMZjwOlfotYvEe8zMQBqjRwSfyVQH/7MxiRMooeuKbJsv3fsm4Mwf3tz1O122v7N/tMF4WN+WzMAjZ0SFr7fogl/dVNLHa3/AzuWGVb6bt+6GB09Yc1tkzbNjXlf3TtqNo5O34Cj0zcg6M+L3K5UApcdXMPPCqsOZCPMpdOJ2E4oTfdgwc8gaY4HKclHdFpcnz90Cth7Ivp2s3aBn9YDB07JgVEx/UviqeYSZPXRdizd3eqoo0Ys5m1rwspJxaZfJvO2NWHV5BIAwH1/acaz18nVv3FvfIGttQORn2N/v7xz5n3cWCGeI3nalnux7oanEAoEI499ZPdKy8vCVtW/e0fNxoJRc7Dq8Do8tf9F4WMqCyow+/JazBtxG79JMuWz7/F9Fu/+cro8q/fMSWBy4/13Y384aXNm9DqJOpYT3QbQizOmJKu9KL9rouVwFwgYDTOjVAP1AXD/SfHcwUkMf0t2tWDp7lbTxzz2UQsWXV0ofq7NAZqVD9GSXS3C++s+68CMy0KR8KdM+aZYPLbQUfgD5OqfkaPNJyLhT3ns9tqXLJd5dPoGzb/DvZ2Y9+ef492zHwAAlh9cCwBYMGoO5o24Lep+QK4IPrX/RdSUX4srS6/g54Yyjlk4chom7AQtLwWQbAgMXt9GN9fP5/MxBOr3CSuAJowqgXZUlwPjqhK6eq8eD2Ph+8041tITfed3B9v6QK061Ib5o/pD4ax3G/HbmgGGr1n1Sr1hhbF2cwM2fUXb3lFf/ds57SLb22e3mufUFa9NE/bsFYU8pRKo3P/I7pVY/9nmqGVWFlTgruEzMafqZn6rZMJn36P7LNkVQLPnxFJNimd73Dp+3Br7MBEVpkRWrbz4+Uv0JXd+5zAAusNs0GmF0uYvCZW/0+29qK47h44e7b6rHRJE3dRShAL22uVcsq6/44bSNk9doYtn+jal+qfMFKJUB+2atGmurWqe0/CnCPrzsG/aes39ViFQse/Cx7jlnQVRyxc9lvhlnEkBUHmem2Ey1qCQiAAY6zp5OQB6scqZ6EHI+b1jjZ1A7Bo9xPz+youSEv5WH21Hdd05XLKuPir8zaoKRcKf3Q+Eutdu3dRSbDnTqenxG8/cvU/sbYPftxuX1d0OAI7CX81b/8P18KcX7u3EsNdvwbDXb8GNm+/E+s/+iKA/D6smPoya8gmRxy0/uDaq48eVpVcIq32ixxKls0QOq8HpuigVxy/1ff6kFOwdJvLYGLXzq5s6ALdeGoz5V5b6PVBXBK0ea7ZspfpXUXA/Pp3xsqe+CK58YybCvZ1R96srgnYrgUaPXTPl55h08TU8aPmZd3W/paICaOe7JNGVPDf3g1vVsHSuAHrhs5fMDinsECLGCqDHbToVRnXdOfheOiMMf7VDgobhz8mBPvj3Z1Fdd85W+Ju3rQmNnebL/cGH76G84EHPhT8lyImEezvx6N7nUR9uMKwErjq8ThgcV018GJNVge+BncuEIZMo3hOZ1ypmHJ/NnfcmkVPLEQmPDVYAvSkypIugg4e6nV+yvwQkScKrx8OWl3OrX/02Prk1tvDX0RPGvD//HKuvX+rKOht1+lAYVQSVjh1vnd6uqe4ZLas+3ICvvj0fTV2tmsdOG3oD7h01WzOmYDYGF37m3Tt5p2JojES2w0tlBTAV09Il+n1O9HITHUxZAUwOVgA9aMmuFnnwZUH4s9vOL5EfqPnbm7SBdHOD5t+LdzZHhb+f7Pon28sPBYJYNfFh18IfYD6dm1FF8ETbGTy653msmviwcEBovUHBgfjJVX8ftYxVh9fhli0LsKPhIA9uStnnlvjekLsFkbTfD6wAesOmU2HM324wpAuAeSMLsHJSccoPfH3bvxeOtOGO4QWRf6882KoZViaVzAZ7FlXx3vp8G5YfWot9Fz6OemxJbmHU7fqxBBWP7n0eLxx9TXjfk+PuE1Yhs/ELlyfQ5Fcw3KwAJrMK58UKoJvLy6a2f3bORckaADvbv4NSEgB5Qoh2ybp6nG7XDjMTy6VeM5FOJAZjBEZed3MDtp3rQuOscssAqKYe9qX61Rn45NY6T4Y/hWgYGIX+srDyWPXtdoZ8Wf/ZH/Ho3n+JXBYeFByIbV/7NX9t88uXAZABkAEwid8LzBwMgJ5iVvWbVRXCC1NKXAt/qw61aef5tQiBZr/MjD646kGfR294DgduuSdy37MHXsZ9o7/tmfCnMGqjZzYFnP75SiVx/Wd/xPJDa3Gi7UxM623WTjHTAiDDHwNgqgKgfnkMgNnzw5BtARkAPUNU9QMAaW5F0l7LaRA0CoD6QZ9//2kT/u3ULzUdORIdAp898DJ+dXh9pEIX9OfZ7ok7rKgST4y/D+MHjtLcbtRBRC3oz8NdI2ZGpo+Lh1lVkgGQATAbA6DXjx8GwPT5XmAA9HAAzLY3xPdSdKUonrZ+op7DVUUBzKoK4fE94nmCq4oChlO7OQmA+infdny9LDI+XjJCoFL1cxL6RO4Y9g3cNXwmBgXlKe3sVgKt32wANg/tTKsEMgAyADIAMgB64T1l7vBIAMz2E4N+UOd4q35Gg0SbhjnVa8bTOUQ05ZsyNmEyQuDtWxdrhmkRqSmfYPkYRdCfhznVN0eC4LKDa2xX92rKJ0T1GlbvB2Ud9JU+ozaHDH/EAOjtqg0DYPqEMAZABsCU2XQqjIXvt+DAhW7N7bOqQlh7Q6mjZZmNE2iH/jWf3d+Ghe83x9w2UKFU/0Thx61x/fTHSri3E1e+MdP0sYOCA1EfbnDhRSFX86KPZlwzYDj+7189bjjen3491ZU+UaXRqJcxAyADYCoCoP75DIDpFwC9sA9TvU78TurHcQCTZOf5bszYciEq/NUOCeKFKSWOlmU2TmDtkCAG5Jm/rY+NL9KEvwMXuvHQjhb5H78+Lf/Fup3TLoqMiK/8hQJBV8PfFa9N03T0sDPAsj78xTIwc035BOy7ZT2eHHcfSnILo5LhR42HhTOFqNfTaDzBeSNuw9HpGzT3c05h8hpJkiJ/RG7/mM+012IAdPhGZOIAjR09Eu7Y2oSOHu32Oh3UubFTwsL3jS/1Kj2HGzt7DZcxriwXi67WhhfRusUbBBN1vKiDn1FFb9V1P8awokrTZS0/uFYQ4oyNLLk8cml35mVfxh/+eqVm6jf1ch/ZvcJw3fSDTod7OzWPnVN9s2ZZZoHS6zjYKvG4yJ5gxUCWhp9FKcV7P5PLsaJLvqGADzu+XobRpTmax756PIyF7zc7uqSrHydw1aE2PLSj1TQA1k0doJk7OGp4GDNxXh6Ohbpzx8/G3o1Hdq/Q9PK9d9RszBtxG4a9fkvkOZUFFfibSyYbDsasUNrZrf/sj1h2aA1Otp01fby+c4a+XZ9+2cq6iajb/Kkfa9VWMN1P9Pyyd2dfpuoScKLCHy8BJ3YbvbQPvbAu7A3MAJhQ2+q7cNNbDVGVtcfGF0VV4E6398qdKHrsb7c+/NnpBFI7JIiNXx4Q1+smOhCq33vRjBqTL74G2859FBXiRJ0olJBmZtLFV2P7uT2qAxKmvXX1gcyq/aHRYNH6bVMvV7/MdG0LyADIAMgAyADoxe8EBkCZJ9sApvslgsZOCbP/80JUsJo3siAq/AHAE3vbHIewb1yaFwl/D+2wDn8vTCnRhL9YX1ej7zLxvG1NMbULun3r4kh7PuXvxs13Ys2xjQCAn1x1Z9Tl3OLcQqy67seaAKYELbVwb6fmcqqR7ef2aDp1VOZX4HtVt+DK0iuEjw/3duLGzXfiqf0vItzbGdWOcNV1P9Y8d/nBtRj2+i0Y9votwm3Tb4c6vGZSYCEyCn78UZCdP2LIA++J5IFPX6ZVCmZsuYBXj3cAML7kq2Y4SLOyL+ZWIH/N2aiwdt+YQmw714lt9V3WX7S6YWbirv4h+nKyU2aXUNWVs30XPsYt7yyI3Hd0+gbDKdnUl4L3TVtvuHy9gkAI/zp5MSZedLXmdrOBoJXBo2/70w8162a2XWbrq670Gd2ezl/2PNGnvmLhtQqgndfPhgqgfjnJmgs3mfvVSz2SWQH0eABM1zdFfyn24qAf58K98ewd2B5B2KaqogCqigLYcloONuPKcrHzfJejZYwry40a7iXWEPjI7pVY/9lmR0FJfwn1R2O+F9UWUAljVkPEqCnLUYguQ5vJ8QXQ3dsjv20+H2B6DGvfW3Ubw3QOgBxriwEwWwJguvzQcVJ9S9ZcvNneDtELPHEJOFN2vj785Qd8MYY/9cHp/r451tITCX8AsHisuDfs4Hzjw8PoOU4F/Xl4ctwCHJ2+AfumrUdN+YTIfcsPro0MhaIfHuVHY74b9Vij5Tu5pPrU/hc1w6/oX8dKt9TT//ZZHtfa+9XDwmQahj/K9FCeKZ8//TBeoj9+B2TIMSx55F1J16rBplNhzN8e3Xt3WHEAR5t7TE78Tj9EsTzH2ujSHOyffpFwWjojblX/RESXT+8Y9g2Eezoj7efkYPY93DFselRnCX1v4HtHzsbmM9vxh8+3Ol6XyoIK3DV8JmZe9mVHVUSLA91GMNTKhAogv/y9U7FI5KXGRL1+qtc5k85ZbgbXdP1cswLosQCYricOUfu94cU5ONLcLXx87ZAgdjR04Ux7b9LXVek0om73Fwr48MmMi3HJunrby4m37V8sIbCyoAJNXS1o6pIrrKLev/eOmo1fHV4f1aGiOLcA58KNUaHKqq2e4t5RszUVxssLh+DT1lNxhTaztoXpHAB5+ZcnLL4n6b0d2RAE+XliAHRnnXWVs6sH5GBPozj8DQz60NQpoSeFm3TrpaFIBxXFfWMK8ex+bS/ieSMLsOpQW9TzE1n904fABR88hbc+32b4mMoCuWPLibb+96AktzASEu2EKqdtBFUHq6P2fTYXKi9T9zF4ctx9kbEH0/FkwrDCE1Y2vC/p/J64VRVMl33Az5PMny0HZiIs2dWi+ffisYXC8CfNrYA0twIXbIS/UMAHaW4F2ueUY3hxwPSxtUOCaJ9T7midt52Lrjrpg540twI3VuQKn+9W2z8rQX8eVl33Y4Np1xAJfifazmja6DV1tTqa5s1pG0HVN4bVA2L5+kQwkBdV8UuXdoEc5oGyTaZMjafeDrM/yrAfMJLH3tV0qSDoO3yYVf6M2+/F18O3PORHVy/QYDTzR4yLH5zvFw5Lox9IOlnqww2474OnNANAqw0KDoyaei3oz+u/xCrYD+qQterwOjy1/8UEHdDO34PKggqcaD2jOWTS4TIwq3/J27/cr+TFH3qsADIAJuTg8tJq6sOfUZs/oyCVjtbeUIpZVaGUvb6d9no15RNsjfkHRM/QEe7txM3/cY9l275YbLhxmeHA0upOK2a8HgDZ9o+I0jXE8hKwR3j9jVh1qE0T/q4qFYe/WVUhnG436gUcz6Wy5F9mmzeyIKXhD+i7JDzxYdMhWVZNfNh0GaNKqyL/v/zgWqw6vK7/uYfX4dPWUwnZu7e8swCjNtyKhR/8Iqu+XBj+iIjfTR4OwpIH94QXqwmi4V6S1aNXmluh6WxSVRTAFUUBvH06uj1ffsCHdpd6mdiZxSTZzCqBlQUVmg4h+vvuGj4Tb53eHnluji8Hg/Mv6rvc6uxa7bShNXhy/AJN+8H6cAO++vZ8y04oyrrMqbpZUwEUVzDljiGVhf2DRPPzSkREGRkAvXhSEQ330j6nHPlrzib+14pgKrgYhpNz7LHxRcK5i70QAq16CIsE/XnY8d/WYvy/z460D4ynFaYyFdz4gaMit63/7I94YOeztp6vH15m37T1uPLfZhqukDL0TTp8Vhn+iIgYANM+AG46FcbNf9SOIze6NAcdPVLUANBumzeyACsnFePxPa14aEdL3MsryfWhqcvePtTPH+w1b32+DcsPrcW+Cx+nfF2Uqt60oTWY+Z8/xMfNJ6wO8L6gJ3gvTMb89lpbQFb/iIgYADP25KKv/klzK4QVQSdhSt+RRG3x2EIs+S9F4n1iMWNH7ZAgNp0KC+/L9ftQFvTZvmTt9QAIwPZgzlYG5pXitsv+Gv9ypE4TtvTLD/rz8LOxd+PRvf8ivNQbDOQi3NOVsO31UgBk+CMiYgBM6kkm6ROYO5gmzWAJcHqh0ejyq++l0zAqD82qCuGFKSWYseWCYQi0a1ZVCGtvKE2Lg9iNELjoytvx+L7VkX9PG1qDZRN+FFm+erDoHF9AnvM3BRgAiYjIDf50XOlkDzirTKEWW/CDrfDXPqcctUP6p1cTVQfliqN4XWqHBPHClBKEAj7UTS3VLMspZVnpwk4PYXGQ6t+XT+1/KfL/NeUT8OT4BZrlqzt7pCr8pcNnkOGPiChNvselNPjGTvXJxrz9nZ3qnkmjLtvL0D9O+5z2OeWaoNrRI8XcQUW/rHQR7u3EI7tXYv1nm20FwOnv3oe9jUej7ts3bT22n/sIj+xeadirOFW8UgFkxw8iovTm5y6wtujqwsh0bsrf4Hy/KtzZCW5mt9k9caofp23Hpw9sj+9pjXG9kJbhD5ArdU+OW4Cj0zfYmt7tN1MexcC8UuFyHtixzHPhz+s/yIiIKH3kpMNKSpIkPOn4fL6kVR1ePR7GwvebTXr9WlX5zMKcrdOu7jna11LaKVYVBXD9xTlYeyy2NoCpHvDZLbcMrcG64+JK4OSLxwIASnKK8PZXVuHaf5/dv2d9wI2b74yaWk5w8CV+HJ6o9b7Gs+GP1T8iIgbAjAuBp9t7MftPFzTj8IkDmjis2elNqx/nD9D2BpZ7HVtv57GWHgdD02iXl25t/4zsu/AxNpx81/D+HecPRP6/JKdIuxckRFX+9OP19R2QCPpzMaSgHJ+0nHS8jkF/Hu4aMTN6uSbNAXacP+jJ8EdEROmHl4ANNHZKWLKrBdV153DJunqT8CeZ3jZvZIGt11s8NrrH79LdrZFLucmYU7huamnaXv5VhHs78eDOZZGBno0eI0g3wseW5BYKQhowfuAobJi6HP82dTn+qnx8TOspWm6kkizZXG+P/DgjIqL0khadQOxUIdzYjNVH27F0d6vtCpp+ijb17SKbToXxxN42fO+KEG4fli/ePsHyqooCCR9w2my908myg2siwSroz8OGqcvw1bfnRz2usqAC04begDdO/inlbf1qyidg+7mPbAW8yoLUTAnHS79ERJkl7SqARieceC9PLdnVgjveazINWvaGVjFejzvea8KW052Yv73Z0bolI/xlirXHNkX+/95RszGsqFLYIeRE2xmsOrwuOvwluQBaUz4BqyY+jHtHzbb1+BNtZ/DI7hUMf0REFJecTNqYWNsDGs3KUVUUwOKxhZpqXX+FTkJ13TnRadHwdZTLuB098nMfvKrA9iViskfdeWPeiNsAAHOqb8YLR1+z+QsDuDhvAM51NiZ0PUOBPPzDNXcDAL769t2OqpDJvBTMdn9ERAyAnmHUISQW+vBXOyRosy2cz7Ayt2RXi3Aqt1DAF2lLeKylB/O3N+N0e6/htG/S3Aph5xD1uh5p7sGR5m4eySZ+NOa7ONp8IjJTiA8+SCZBXR/+jMbeG/b6LcLH2JmZRJKAE+1nDNoBRjs6fYPm9bzwGSQiovSVtp1A4r0UvOlUGNV152IMf+JAqFB33lAz6ujhe+kMquvOCZ9TOyTXdBvcCn+ZXIlUZgqJHDsmHS305lTdLLzdLNy9ceJPONpy3LBjiRIS7Ya/VOGlXyIiBsCMC4H69n52w5/x/VJUsNNTBpTWT/sGyBVB0Wwj287FFvCcdOiQ5lZg5aTijD7Qg/48+PSDb/uAJ8fdh5LcQuFzjk7fgJ+NvVt43wM7lglvX3ZwDR7Y+SxOtp1N+jiBDH9ERGRXTqZumFV7QPWwKrOqQpF5dK1MGZSLt09bt8Hq6JHge+mMsB2hMl/v/O3NWH203XgbXrJqF2Y8+LT1c7PHu2c/wCO7Vwov+y4/tBYLRs3Bz/b8S9R9Ti65eunybKLCHxERMQB6hll7QLudQtbeUGr79fZeUFfktIP21g4JYtMp7QwcSls//bAvoYAPL0wpwQtTSrDzfDfG/9sXTk7RCAWAAXn+pIwPmO4e2LHMcGaPE21n8OS+FxH05yW0c0XQn4d7R82OdEwxMvnN7xquq3odlx1cgwWj5iQ1/LH6R0SUOTJiIGizE5Pb1YwzmsClfd26qaXCoWKUXr9G1b5xZTkO2uDJobOjR4oKf5MH5fKIFtAHqnEDR2n+He7ttD0MSyzkQaOXWYY/0bqqzanub4+4/OBarDq8juGPiIiyNwAmMwSaXSZ+fE+rYQhUKoFGVk4qtmy3VzskiFCg/985/v51keZWYGttGaS5FRic77dcTqZSj/m37OCaqPuPTt+A9Tf8Iqpn77wRt2HDjdp2ffeOmo2j0zc4Coc15ROwb9p6HJ2+IfK37oZfYFhRZdzb9qMx30VN+QRNCGT4IyKimL73pQz7drd7IlO3kXP62rLoAAAItElEQVTSYeLxPa14aEcLJl2ch+3nkjs1V/uccjy0oxXP7td2MJk3sgArJxXbmMnEh3FlOdhaOxD5a87GtP1e9+je5+2P+eeyaUNr8OT4BcKBp60o7RRF4wHOqbo50hkl3NuJK9+YqQm0ifzcMPwREWWmjOsE4uYYgSKLri7EoqsLhUEy0UIBHx4bX4gDF7ojbQ1DAR9WTio2HMxat3eweGxh2s/3a0Y/5p+basonaJbrVvgCxO0UlVlC1IEylnDJ8EdERHr+TNyoRE0X5wVKD2JFR4+Ehe/bCX/ypd9bLw1m9AGtjPk387Kv2Eg+9pc7bWiNZixBt7x79gPcuPlOYds/ffhLBIY/IqLslLHDwBhVApWewepZOYxm7nD8mrpLqafbezHm9S/Q2OlOT12jaqP+krCddcv0EPjkuAV4ctwCAMCVb8zU9PAN+vOwb9r6qBk7gv48/Gzs3Zh52Zc1w7oE/XkYU1Ltahgzu+Srft1UhD8iIsp8/kzeOLNKYMe3+wPR0t2tWLKrxfXXH5zvxzNfKuJRlmL6ThxKGFSqhUrQCvd24pHdK6LCVyJm7XhgxzJH8/+6HfzY6YOIKLtlXCcQ0cnO1K9Pa/4pGrjZdPk2OpOoH1NVFMCAPD92nu9K2DYr23C6vRcP7WjBvJEF+MaleZi/vVnYQSRbqoOiwZorCypwTekIbPz8PyO3HZ2+AasOr8NT+180XZ5VG0A7VT4j04bWYNmEH1luh9N2iFafB4Y/IqLskJPpG2jZKeS7gzUh0Gjg5nioLzcfa+lBKNCrCV3WA0FrB5w2o5/STumwcsm6+qwfNFo02POJtjOo74hufzdvxG2YN+K2qMvHalaDMZsNQG2mpnwCnhy/IOk/hhj+iIiyR8ZXAO2e/PSVQBFRddBOBVAZOkZzstU9dv72Zqw61Jb0/aIMIZMN7FT1Us3OUDKxVAAZ/oiIKCsDoJ0TYejlM5FKneFjAj60zyl3FAAV+WvORpa/eGyho44n6ufGK5s6hJgxq+4l0tHpGzRTvomGezHjNACyvR8REen5s22DzU546o4hho/pkeB76Uzkzwn1dG9OO54sHlvoyvbbn3Iu8yVy+jcjc6rk6dzUl4YTOdwLwx8REQnPD1KWngWcnhjtVOCsqnodPRJmbLkQGcTZznOM6Nv0saqXHOrq272jZpu2ATSy7OAaTa9iJx05nDyX4Y+IiBgAHZ4g9SdJUTs+I1VFATx4VYGw2iYKgcpz7hqRr5llRG3TqbBhL95xZbnY8fUyHs1JDoCA3Iv4R2O+i2lDa0yfZ9Qj2Ky3r96aYxsjw9SYPZft/YiIiAHQxRAoYlYZNKruGYVAANjx9Yswriy6c7ZZL966qQMyfoYPrwbASDib8nNMuvgaw+ep2/wpnLb9s9NukOGPiIjs8Gf7DrA6IVqdUJW2eZMH5Ubdt3R3K6rrzmHh+y2a8KZM5yYaambhB82ax246FUZ13TnD8JcN07ulgwd2LjPtUKIPf8rUcnbDX1NXq2W7QYY/IiKyK+srgHZPnnZPoGbVPUC+1HvrpSE8eFUBBufL+dt6HEAYhj/1mH+UeOoK4Lav/RpffXs+mrr6p+KrLKjAXcNnYk7VzYaXfZ0O3rzm2EY8tf9Fzeuol+HWsUtERNnDz13Qf4KMtxoImFf3AHkg6Gf3ayuD48pyYuqdy/CXWoOCA/GTq/5ec9uJtjN4ZPcKLDu4xpXp3pYdXINHdq/QhL+a8gm2j0k7xzUREWUfVgBjDHp2d9urx8NYurvV9anfsmkAZy8RjcH36N7n8cLR12w9f07VzfjZ2LsN7zebPq6yoAL3jpyNmZd9mVU/IiJiAPR6CHQ7EHLIF28FQEW4txO3bFmAoy0nhM8N+vOwb9p60+WLOosA2k4fDH9ERBSvHO4C8xOo2clWuc/JyfbWS+VOG7EGQQ7k7F3rP/ujYfhTAqJRL2IzyvRwoUDQ9nFLRETEABhnELSquPh8PscnXiUIUuZQD9CsrtjFOuUcO3oQEVGisBOIzRBop4OInZM0ZZ71n/0RN26+03CYllimnFOmjLN7XDH8ERGRE2wD6HSH2Qx53K2ZSd8GUD81m/o+HmdERORVvATskJ22gcr9PDlnths33ynsratU7xIZ/nhsERERA2CKgqCdEMiTdeZShz+n07rFGvx4PBEREQOgB0KgnRM3g2BmU3rpxhr+GPyIiIgBkEGQPCzoz4vq0btswo8Y/IiIKK2wF3ACgqCdEz97DacnfY/eWNr7OXnvGf6IiCgR2As4UTvWYbjj28BjgscDERExADIIEt9/IiIiBsBsCgIMAwx+REREDIAMgsT3loiIiAEw28ICAwPfRyIiIgZAhgjuPL5fREREDIDZGCwYLvjeEBERMQAycHAH8j0gIiJiAMzGEMIwwn1NRETEAMiAwqDCfUlERMQAyACTHSGG+4uIiIgBkOEmA8MO9wMREREDIANhkiTrEEr2djH0ERERAyAxDGYBfhyIiCgb5HAXZF+gYShk2CMiIgZAYvDJ+FDIsEdERMQASA4CUrqEQ4Y8IiIiBkBKYrBiD1wiIiIGQGJIJCIiIo/ycxcQERERMQASEREREQMgERERETEAEhEREREDIBERERExABIRERERAyARERERMQASEREREQMgERERETEAEhEREREDIBERERExABIRERERAyARERERMQASERERMQASEREREQMgERERETEAEhEREREDIBERERExABIRERERAyARERERMQASEREREQMgERERETEAEhEREREDIBERERExABIRERERAyARERERMQASEREREQMgEREREQMgERERETEAEhEREREDIBERERExABIRERERAyARERERMQASEREREQMgERERETEAEhEREREDIBERERExABIRERERAyARERERMQASEREREQMgEREREQMgERERETEAEhEREREDIBERERExABIRERFRuvn/XcNQ24xp80UAAAAASUVORK5CYII=" -} diff --git a/web/src/lib/assets/immich-logo.svg b/web/src/lib/assets/immich-logo.svg deleted file mode 100644 index 376fa6f3e8..0000000000 --- a/web/src/lib/assets/immich-logo.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - diff --git a/web/src/lib/assets/svg-paths.ts b/web/src/lib/assets/svg-paths.ts index 9c37849fcc..ded3db0fc8 100644 --- a/web/src/lib/assets/svg-paths.ts +++ b/web/src/lib/assets/svg-paths.ts @@ -6,4 +6,5 @@ export const moonViewBox = '0 0 20 20'; export const sunViewBox = '0 0 20 20'; export const discordPath = - 'M 9.1367188 3.8691406 C 9.1217187 3.8691406 9.1067969 3.8700938 9.0917969 3.8710938 C 8.9647969 3.8810937 5.9534375 4.1403594 4.0234375 5.6933594 C 3.0154375 6.6253594 1 12.073203 1 16.783203 C 1 16.866203 1.0215 16.946531 1.0625 17.019531 C 2.4535 19.462531 6.2473281 20.102859 7.1113281 20.130859 L 7.1269531 20.130859 C 7.2799531 20.130859 7.4236719 20.057594 7.5136719 19.933594 L 8.3886719 18.732422 C 6.0296719 18.122422 4.8248594 17.086391 4.7558594 17.025391 C 4.5578594 16.850391 4.5378906 16.549563 4.7128906 16.351562 C 4.8068906 16.244563 4.9383125 16.189453 5.0703125 16.189453 C 5.1823125 16.189453 5.2957188 16.228594 5.3867188 16.308594 C 5.4157187 16.334594 7.6340469 18.216797 11.998047 18.216797 C 16.370047 18.216797 18.589328 16.325641 18.611328 16.306641 C 18.702328 16.227641 18.815734 16.189453 18.927734 16.189453 C 19.059734 16.189453 19.190156 16.243562 19.285156 16.351562 C 19.459156 16.549563 19.441141 16.851391 19.244141 17.025391 C 19.174141 17.087391 17.968375 18.120469 15.609375 18.730469 L 16.484375 19.933594 C 16.574375 20.057594 16.718094 20.130859 16.871094 20.130859 L 16.886719 20.130859 C 17.751719 20.103859 21.5465 19.463531 22.9375 17.019531 C 22.9785 16.947531 23 16.866203 23 16.783203 C 23 12.073203 20.984172 6.624875 19.951172 5.671875 C 18.047172 4.140875 15.036203 3.8820937 14.908203 3.8710938 C 14.895203 3.8700938 14.880188 3.8691406 14.867188 3.8691406 C 14.681188 3.8691406 14.510594 3.9793906 14.433594 4.1503906 C 14.427594 4.1623906 14.362062 4.3138281 14.289062 4.5488281 C 15.548063 4.7608281 17.094141 5.1895937 18.494141 6.0585938 C 18.718141 6.1975938 18.787437 6.4917969 18.648438 6.7167969 C 18.558438 6.8627969 18.402188 6.9433594 18.242188 6.9433594 C 18.156188 6.9433594 18.069234 6.9200937 17.990234 6.8710938 C 15.584234 5.3800938 12.578 5.3046875 12 5.3046875 C 11.422 5.3046875 8.4157187 5.3810469 6.0117188 6.8730469 C 5.9327188 6.9210469 5.8457656 6.9433594 5.7597656 6.9433594 C 5.5997656 6.9433594 5.4425625 6.86475 5.3515625 6.71875 C 5.2115625 6.49375 5.2818594 6.1985938 5.5058594 6.0585938 C 6.9058594 5.1905937 8.4528906 4.7627812 9.7128906 4.5507812 C 9.6388906 4.3147813 9.5714062 4.1643437 9.5664062 4.1523438 C 9.4894063 3.9813438 9.3217188 3.8691406 9.1367188 3.8691406 z M 12 7.3046875 C 12.296 7.3046875 14.950594 7.3403125 16.933594 8.5703125 C 17.326594 8.8143125 17.777234 8.9453125 18.240234 8.9453125 C 18.633234 8.9453125 19.010656 8.8555 19.347656 8.6875 C 19.964656 10.2405 20.690828 12.686219 20.923828 15.199219 C 20.883828 15.143219 20.840922 15.089109 20.794922 15.037109 C 20.324922 14.498109 19.644687 14.191406 18.929688 14.191406 C 18.332687 14.191406 17.754078 14.405437 17.330078 14.773438 C 17.257078 14.832437 15.505 16.21875 12 16.21875 C 8.496 16.21875 6.7450313 14.834687 6.7070312 14.804688 C 6.2540312 14.407687 5.6742656 14.189453 5.0722656 14.189453 C 4.3612656 14.189453 3.6838438 14.494391 3.2148438 15.025391 C 3.1658438 15.080391 3.1201719 15.138266 3.0761719 15.197266 C 3.3091719 12.686266 4.0344375 10.235594 4.6484375 8.6835938 C 4.9864375 8.8525938 5.3657656 8.9433594 5.7597656 8.9433594 C 6.2217656 8.9433594 6.6724531 8.8143125 7.0644531 8.5703125 C 9.0494531 7.3393125 11.704 7.3046875 12 7.3046875 z M 8.890625 10.044922 C 7.966625 10.044922 7.2167969 10.901031 7.2167969 11.957031 C 7.2167969 13.013031 7.965625 13.869141 8.890625 13.869141 C 9.815625 13.869141 10.564453 13.013031 10.564453 11.957031 C 10.564453 10.900031 9.815625 10.044922 8.890625 10.044922 z M 15.109375 10.044922 C 14.185375 10.044922 13.435547 10.901031 13.435547 11.957031 C 13.435547 13.013031 14.184375 13.869141 15.109375 13.869141 C 16.034375 13.869141 16.783203 13.013031 16.783203 11.957031 C 16.783203 10.900031 16.033375 10.044922 15.109375 10.044922 z'; + 'M81.15,0c-1.2376,2.1973-2.3489,4.4704-3.3591,6.794-9.5975-1.4396-19.3718-1.4396-28.9945,0-.985-2.3236-2.1216-4.5967-3.3591-6.794-9.0166,1.5407-17.8059,4.2431-26.1405,8.0568C2.779,32.5304-1.6914,56.3725.5312,79.8863c9.6732,7.1476,20.5083,12.603,32.0505,16.0884,2.6014-3.4854,4.8998-7.1981,6.8698-11.0623-3.738-1.3891-7.3497-3.1318-10.8098-5.1523.9092-.6567,1.7932-1.3386,2.6519-1.9953,20.281,9.547,43.7696,9.547,64.0758,0,.8587.7072,1.7427,1.3891,2.6519,1.9953-3.4601,2.0457-7.0718,3.7632-10.835,5.1776,1.97,3.8642,4.2683,7.5769,6.8698,11.0623,11.5419-3.4854,22.3769-8.9156,32.0509-16.0631,2.626-27.2771-4.496-50.9172-18.817-71.8548C98.9811,4.2684,90.1918,1.5659,81.1752.0505l-.0252-.0505ZM42.2802,65.4144c-6.2383,0-11.4159-5.6575-11.4159-12.6535s4.9755-12.6788,11.3907-12.6788,11.5169,5.708,11.4159,12.6788c-.101,6.9708-5.026,12.6535-11.3907,12.6535ZM84.3576,65.4144c-6.2637,0-11.3907-5.6575-11.3907-12.6535s4.9755-12.6788,11.3907-12.6788,11.4917,5.708,11.3906,12.6788c-.101,6.9708-5.026,12.6535-11.3906,12.6535Z'; +export const discordViewBox = '0 0 126.644 96'; diff --git a/web/src/lib/components/admin-page/restore-dialogue.svelte b/web/src/lib/components/admin-page/restore-dialogue.svelte index a72ada2ca5..1386ae9fc4 100644 --- a/web/src/lib/components/admin-page/restore-dialogue.svelte +++ b/web/src/lib/components/admin-page/restore-dialogue.svelte @@ -32,7 +32,7 @@ diff --git a/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte b/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte index 2a95e7a9f5..59bb798a0b 100644 --- a/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte +++ b/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte @@ -1,20 +1,20 @@

  • - diff --git a/web/src/lib/components/asset-viewer/editor/editor-panel.svelte b/web/src/lib/components/asset-viewer/editor/editor-panel.svelte index 133d9c9021..39ba7ac200 100644 --- a/web/src/lib/components/asset-viewer/editor/editor-panel.svelte +++ b/web/src/lib/components/asset-viewer/editor/editor-panel.svelte @@ -69,7 +69,7 @@ prompt={$t('editor_close_without_save_prompt')} cancelText={$t('no')} cancelColor="secondary" - confirmColor="red" + confirmColor="danger" confirmText={$t('close')} onCancel={() => { $showCancelConfirmDialog = false; diff --git a/web/src/lib/components/assets/thumbnail/__test__/thumbnail.spec.ts b/web/src/lib/components/assets/thumbnail/__test__/thumbnail.spec.ts new file mode 100644 index 0000000000..62f0802a22 --- /dev/null +++ b/web/src/lib/components/assets/thumbnail/__test__/thumbnail.spec.ts @@ -0,0 +1,63 @@ +import { getIntersectionObserverMock } from '$lib/__mocks__/intersection-observer.mock'; +import Thumbnail from '$lib/components/assets/thumbnail/thumbnail.svelte'; +import { assetFactory } from '@test-data/factories/asset-factory'; +import { fireEvent, render, screen } from '@testing-library/svelte'; + +describe('Thumbnail component', () => { + beforeAll(() => { + vi.stubGlobal('IntersectionObserver', getIntersectionObserverMock()); + }); + + it('should only contain a single tabbable element (the container)', () => { + const asset = assetFactory.build({ originalPath: 'image.jpg', originalMimeType: 'image/jpeg' }); + render(Thumbnail, { + asset, + focussed: false, + overrideDisplayForTest: true, + selected: true, + }); + + const container = screen.getByTestId('container-with-tabindex'); + expect(container.getAttribute('tabindex')).toBe('0'); + + // This isn't capturing all tabbable elements, but should be the most likely ones. Mainly guarding against + // inserting extra tabbable elments in future in + let allTabbableElements = screen.queryAllByRole('link'); + allTabbableElements = allTabbableElements.concat(screen.queryAllByRole('checkbox')); + expect(allTabbableElements.length).toBeGreaterThan(0); + for (const tabbableElement of allTabbableElements) { + const testIdValue = tabbableElement.dataset.testid; + if (testIdValue === null || testIdValue !== 'container-with-tabindex') { + expect(tabbableElement.getAttribute('tabindex')).toBe('-1'); + } + } + }); + + it('handleFocus should be called on focus of container', async () => { + const asset = assetFactory.build({ originalPath: 'image.jpg', originalMimeType: 'image/jpeg' }); + const handleFocusSpy = vi.fn(); + render(Thumbnail, { + asset, + overrideDisplayForTest: true, + handleFocus: handleFocusSpy, + }); + + const container = screen.getByTestId('container-with-tabindex'); + await fireEvent(container, new FocusEvent('focus')); + + expect(handleFocusSpy).toBeCalled(); + }); + + it('element will be focussed if not already', () => { + const asset = assetFactory.build({ originalPath: 'image.jpg', originalMimeType: 'image/jpeg' }); + const handleFocusSpy = vi.fn(); + render(Thumbnail, { + asset, + overrideDisplayForTest: true, + focussed: true, + handleFocus: handleFocusSpy, + }); + + expect(handleFocusSpy).toBeCalled(); + }); +}); diff --git a/web/src/lib/components/assets/thumbnail/thumbnail.svelte b/web/src/lib/components/assets/thumbnail/thumbnail.svelte index 49d6e3dbf4..3f867cce01 100644 --- a/web/src/lib/components/assets/thumbnail/thumbnail.svelte +++ b/web/src/lib/components/assets/thumbnail/thumbnail.svelte @@ -40,6 +40,7 @@ thumbnailWidth?: number | undefined; thumbnailHeight?: number | undefined; selected?: boolean; + focussed?: boolean; selectionCandidate?: boolean; disabled?: boolean; readonly?: boolean; @@ -60,7 +61,9 @@ onRetrieveElement?: ((elment: HTMLElement) => void) | undefined; onSelect?: ((asset: AssetResponseDto) => void) | undefined; onMouseEvent?: ((event: { isMouseOver: boolean; selectedGroupIndex: number }) => void) | undefined; + handleFocus?: (() => void) | undefined; class?: string; + overrideDisplayForTest?: boolean; } let { @@ -72,6 +75,7 @@ thumbnailWidth = undefined, thumbnailHeight = undefined, selected = false, + focussed = false, selectionCandidate = false, disabled = false, readonly = false, @@ -85,7 +89,9 @@ onRetrieveElement = undefined, onSelect = undefined, onMouseEvent = undefined, + handleFocus = undefined, class: className = '', + overrideDisplayForTest = false, }: Props = $props(); let { @@ -94,6 +100,7 @@ const componentId = generateId(); let element: HTMLElement | undefined = $state(); + let focussableElement: HTMLElement | undefined = $state(); let mouseOver = $state(false); let intersecting = $state(false); let lastRetrievedElement: HTMLElement | undefined = $state(); @@ -111,6 +118,12 @@ } }); + $effect(() => { + if (focussed && document.activeElement !== focussableElement) { + focussableElement?.focus(); + } + }); + let width = $derived(thumbnailSize || thumbnailWidth || 235); let height = $derived(thumbnailSize || thumbnailHeight || 235); let display = $derived(intersecting); @@ -217,7 +230,7 @@ > {/if} - {#if display} + {#if display || overrideDisplayForTest}
    { + onkeydown={(evt) => { if (evt.key === 'Enter') { callClickHandlers(); } + if (evt.key === 'x') { + onSelect?.(asset); + } }} tabindex={0} onclick={handleClick} role="link" + bind:this={focussableElement} + onfocus={handleFocus} + data-testid="container-with-tabindex" > {#if mouseOver && !disableMouseOver} @@ -244,7 +263,7 @@ style:height="{height}px" href={currentUrlReplaceAssetId(asset.id)} onclick={(evt) => evt.preventDefault()} - tabindex={0} + tabindex={-1} aria-label="Thumbnail URL" > @@ -258,6 +277,8 @@ class="absolute p-2 focus:outline-none" class:cursor-not-allowed={disabled} role="checkbox" + tabindex={-1} + onfocus={handleFocus} aria-checked={selected} {disabled} > diff --git a/web/src/lib/components/assets/thumbnail/video-thumbnail.svelte b/web/src/lib/components/assets/thumbnail/video-thumbnail.svelte index 09b1d1f0d7..a2e30be543 100644 --- a/web/src/lib/components/assets/thumbnail/video-thumbnail.svelte +++ b/web/src/lib/components/assets/thumbnail/video-thumbnail.svelte @@ -90,7 +90,13 @@
    {#if showTime} - {Duration.fromObject({ seconds: remainingSeconds }).toFormat('m:ss')} + {#if remainingSeconds < 60} + {Duration.fromObject({ seconds: remainingSeconds }).toFormat('m:ss')} + {:else if remainingSeconds < 3600} + {Duration.fromObject({ seconds: remainingSeconds }).toFormat('mm:ss')} + {:else} + {Duration.fromObject({ seconds: remainingSeconds }).toFormat('h:mm:ss')} + {/if} {/if} diff --git a/web/src/lib/components/faces-page/people-card.svelte b/web/src/lib/components/faces-page/people-card.svelte index fa31a3e9a2..d12855c54f 100644 --- a/web/src/lib/components/faces-page/people-card.svelte +++ b/web/src/lib/components/faces-page/people-card.svelte @@ -6,7 +6,6 @@ import { getPeopleThumbnailUrl } from '$lib/utils'; import { type PersonResponseDto } from '@immich/sdk'; import { - mdiAccountEditOutline, mdiAccountMultipleCheckOutline, mdiCalendarEditOutline, mdiDotsVertical, @@ -22,22 +21,13 @@ interface Props { person: PersonResponseDto; preload?: boolean; - onChangeName: () => void; onSetBirthDate: () => void; onMergePeople: () => void; onHidePerson: () => void; onToggleFavorite: () => void; } - let { - person, - preload = false, - onChangeName, - onSetBirthDate, - onMergePeople, - onHidePerson, - onToggleFavorite, - }: Props = $props(); + let { person, preload = false, onSetBirthDate, onMergePeople, onHidePerson, onToggleFavorite }: Props = $props(); let showVerticalDots = $state(false); @@ -63,6 +53,7 @@ altText={person.name} title={person.name} widthStyle="100%" + circle /> {#if person.isFavorite}
    @@ -70,14 +61,6 @@
    {/if}
    - {#if person.name} - - {person.name} - - {/if} {#if showVerticalDots} @@ -91,7 +74,6 @@ title={$t('show_person_options')} > - -
    +
    {#each people as person, index (person.id)} {#if hasNextPage && index === people.length - 1}
    diff --git a/web/src/lib/components/forms/api-key-form.svelte b/web/src/lib/components/forms/api-key-form.svelte index 086d7708c3..bba7398655 100644 --- a/web/src/lib/components/forms/api-key-form.svelte +++ b/web/src/lib/components/forms/api-key-form.svelte @@ -1,9 +1,9 @@ - +
    {/if} - + {dateGroup.groupTitle}
    @@ -218,6 +227,8 @@ onSelect={(asset) => assetSelectHandler(asset, dateGroup.assets, dateGroup.groupTitle)} onMouseEvent={() => assetMouseEventHandler(dateGroup.groupTitle, asset)} selected={assetInteraction.selectedAssets.has(asset) || assetStore.albumAssets.has(asset.id)} + handleFocus={() => assetOnFocusHandler(asset)} + focussed={assetInteraction.isFocussedAsset(asset)} selectionCandidate={assetInteraction.assetSelectionCandidates.has(asset)} disabled={assetStore.albumAssets.has(asset.id)} thumbnailWidth={width} diff --git a/web/src/lib/components/photos-page/asset-grid.svelte b/web/src/lib/components/photos-page/asset-grid.svelte index ea862cdd1a..1f4f9aca85 100644 --- a/web/src/lib/components/photos-page/asset-grid.svelte +++ b/web/src/lib/components/photos-page/asset-grid.svelte @@ -42,8 +42,8 @@ isSelectionMode?: boolean; singleSelect?: boolean; /** `true` if this asset grid is responds to navigation events; if `true`, then look at the - `AssetViewingStore.gridScrollTarget` and load and scroll to the asset specified, and - additionally, update the page location/url with the asset as the asset-grid is scrolled */ + `AssetViewingStore.gridScrollTarget` and load and scroll to the asset specified, and + additionally, update the page location/url with the asset as the asset-grid is scrolled */ enableRouting: boolean; assetStore: AssetStore; assetInteraction: AssetInteraction; @@ -706,6 +706,36 @@ e.preventDefault(); } }; + + const focusNextAsset = async () => { + if (assetInteraction.focussedAssetId === null) { + const firstAsset = assetStore.getFirstAsset(); + if (firstAsset !== null) { + assetInteraction.focussedAssetId = firstAsset.id; + } + } else { + const focussedAsset = assetStore.assets.find((asset) => asset.id === assetInteraction.focussedAssetId); + if (focussedAsset) { + const nextAsset = await assetStore.getNextAsset(focussedAsset); + if (nextAsset !== null) { + assetInteraction.focussedAssetId = nextAsset.id; + } + } + } + }; + + const focusPreviousAsset = async () => { + if (assetInteraction.focussedAssetId !== null) { + const focussedAsset = assetStore.assets.find((asset) => asset.id === assetInteraction.focussedAssetId); + if (focussedAsset) { + const previousAsset = await assetStore.getPreviousAsset(focussedAsset); + if (previousAsset) { + assetInteraction.focussedAssetId = previousAsset.id; + } + } + } + }; + onDestroy(() => { assetStore.taskManager.removeAllTasksForComponent(componentId); }); @@ -749,6 +779,8 @@ { shortcut: { key: 'A', ctrl: true }, onShortcut: () => selectAllAssets(assetStore, assetInteraction) }, { shortcut: { key: 'PageDown' }, preventDefault: false, onShortcut: focusElement }, { shortcut: { key: 'PageUp' }, preventDefault: false, onShortcut: focusElement }, + { shortcut: { key: 'ArrowRight' }, preventDefault: false, onShortcut: focusNextAsset }, + { shortcut: { key: 'ArrowLeft' }, preventDefault: false, onShortcut: focusPreviousAsset }, ]; if (assetInteraction.selectionActive) { diff --git a/web/src/lib/components/shared-components/create-share-link-modal/create-shared-link-modal.svelte b/web/src/lib/components/shared-components/create-share-link-modal/create-shared-link-modal.svelte index 0b35177cef..19bef9c7db 100644 --- a/web/src/lib/components/shared-components/create-share-link-modal/create-shared-link-modal.svelte +++ b/web/src/lib/components/shared-components/create-share-link-modal/create-shared-link-modal.svelte @@ -1,5 +1,4 @@ {#if today.month === 4 && today.day === 1} - {$t('immich_logo')} + {$t('immich_logo')} {:else} - {$t('immich_logo')} + {$t('immich_logo')} {/if} diff --git a/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte b/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte index 10df5a6f0e..b823e8fd56 100644 --- a/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte +++ b/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte @@ -1,7 +1,6 @@ @@ -368,8 +350,10 @@ {personMerge1} {personMerge2} {potentialMergePeople} - onClose={() => (showMergeModal = false)} - onReject={changeName} + onClose={() => { + showMergeModal = false; + }} + onReject={() => handleMergeCancel()} onConfirm={handleMergeSamePerson} /> {/if} @@ -425,15 +409,30 @@ {#if countVisiblePeople > 0 && (!searchName || searchedPeopleLocal.length > 0)} {#snippet children({ person, index })} - handleChangeName(person)} - onSetBirthDate={() => handleSetBirthDate(person)} - onMergePeople={() => handleMergePeople(person)} - onHidePerson={() => handleHidePerson(person)} - onToggleFavorite={() => handleToggleFavorite(person)} - /> +
    + handleSetBirthDate(person)} + onMergePeople={() => handleMergePeople(person)} + onHidePerson={() => handleHidePerson(person)} + onToggleFavorite={() => handleToggleFavorite(person)} + /> + +
    onNameChangeSubmit(newName, person)}> + onNameChangeInputFocus(person)} + onfocusout={() => onNameChangeSubmit(newName, person)} + oninput={(event) => onNameChangeInputUpdate(event)} + /> +
    +
    {/snippet}     {:else} @@ -447,35 +446,6 @@
    {/if} - {#if showChangeNameModal} - (showChangeNameModal = false)}> -
    -
    - - -
    -
    - - {#snippet stickyBottom()} - - - {/snippet} -     - {/if} - {#if showSetBirthDateModal} {#if selectHidden} - +
    {/if} diff --git a/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte index c1b75bc561..a35a30c1c4 100644 --- a/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte +++ b/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte @@ -1,6 +1,6 @@ - + diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte index 2706ead46e..f3b3930e12 100644 --- a/web/src/routes/+layout.svelte +++ b/web/src/routes/+layout.svelte @@ -3,7 +3,7 @@ import { page } from '$app/state'; import { shortcut } from '$lib/actions/shortcut'; import DownloadPanel from '$lib/components/asset-viewer/download-panel.svelte'; - import Error from '$lib/components/error.svelte'; + import ErrorLayout from '$lib/components/layouts/ErrorLayout.svelte'; import AppleHeader from '$lib/components/shared-components/apple-header.svelte'; import DialogWrapper from '$lib/components/shared-components/dialog/dialog-wrapper.svelte'; import NavigationLoadingBar from '$lib/components/shared-components/navigation-loading-bar.svelte'; @@ -17,11 +17,11 @@ import { closeWebsocketConnection, openWebsocketConnection } from '$lib/stores/websocket'; import { copyToClipboard, setKey } from '$lib/utils'; import { isAssetViewerRoute, isSharedLinkRoute } from '$lib/utils/navigation'; - import { onDestroy, onMount, type Snippet } from 'svelte'; - import { run } from 'svelte/legacy'; import { setTranslations } from '@immich/ui'; - import '../app.css'; + import { onDestroy, onMount, type Snippet } from 'svelte'; import { t } from 'svelte-i18n'; + import { run } from 'svelte/legacy'; + import '../app.css'; interface Props { children?: Snippet; @@ -141,7 +141,7 @@ /> {#if page.data.error} - + {:else} {@render children?.()} {/if} diff --git a/web/src/routes/admin/jobs-status/+page.svelte b/web/src/routes/admin/jobs-status/+page.svelte index a3e3d6eb04..21381081e0 100644 --- a/web/src/routes/admin/jobs-status/+page.svelte +++ b/web/src/routes/admin/jobs-status/+page.svelte @@ -46,6 +46,7 @@ { title: $t('admin.user_cleanup_job'), value: ManualJobName.UserCleanup }, { title: $t('admin.memory_cleanup_job'), value: ManualJobName.MemoryCleanup }, { title: $t('admin.memory_generate_job'), value: ManualJobName.MemoryCreate }, + { title: $t('admin.backup_database'), value: ManualJobName.BackupDatabase }, ].map(({ value, title }) => ({ id: value, label: title, value })); const handleCancel = () => (isOpen = false); diff --git a/web/src/routes/admin/library-management/+page.svelte b/web/src/routes/admin/library-management/+page.svelte index 3e3a5491fa..9a598101e1 100644 --- a/web/src/routes/admin/library-management/+page.svelte +++ b/web/src/routes/admin/library-management/+page.svelte @@ -357,12 +357,6 @@ - {#if renameLibrary === index} - -
    - (renameLibrary = undefined)} /> -
    - {/if} {#if editImportPaths === index}
    @@ -394,3 +388,11 @@
    • + +{#if renameLibrary !== undefined} + (renameLibrary = undefined)} + /> +{/if} diff --git a/web/src/routes/admin/user-management/+page.svelte b/web/src/routes/admin/user-management/+page.svelte index 6fe8dea1f3..9ec2e9eab1 100644 --- a/web/src/routes/admin/user-management/+page.svelte +++ b/web/src/routes/admin/user-management/+page.svelte @@ -155,7 +155,7 @@ onConfirm={() => (shouldShowPasswordResetSuccess = false)} onCancel={() => (shouldShowPasswordResetSuccess = false)} hideCancelButton={true} - confirmColor="green" + confirmColor="success" > {#snippet promptSnippet()}
    @@ -222,7 +222,7 @@ {#if !immichUser.deletedAt} editUserHandler(immichUser)} @@ -231,7 +231,7 @@ {#if immichUser.id !== $user.id} deleteUserHandler(immichUser)} @@ -242,7 +242,7 @@ {#if immichUser.deletedAt && immichUser.status === UserStatus.Deleted} 0); const errorMessage = $derived(passwordConfirm.length === 0 || valid ? '' : $t('password_does_not_match')); - const onSubmit = async (event: Event) => { - event.preventDefault(); - + const onSubmit = async () => { if (!valid) { return; } - await updateMyUser({ userUpdateMeDto: { password: String(password) } }); + await updateMyUser({ userUpdateMeDto: { password } }); await goto(AppRoute.AUTH_LOGIN); resetSavedUser(); await logout(); @@ -34,7 +32,7 @@ -
    + {$t('hi_user', { values: { name: $user.name, email: $user.email } })} diff --git a/web/src/routes/auth/onboarding/+page.svelte b/web/src/routes/auth/onboarding/+page.svelte index 3f31dd587a..9950b0d09d 100644 --- a/web/src/routes/auth/onboarding/+page.svelte +++ b/web/src/routes/auth/onboarding/+page.svelte @@ -5,7 +5,7 @@ import { page } from '$app/stores'; import OnboardingHello from '$lib/components/onboarding-page/onboarding-hello.svelte'; import OnboardingPrivacy from '$lib/components/onboarding-page/onboarding-privacy.svelte'; - import OnboadingStorageTemplate from '$lib/components/onboarding-page/onboarding-storage-template.svelte'; + import OnboardingStorageTemplate from '$lib/components/onboarding-page/onboarding-storage-template.svelte'; import OnboardingTheme from '$lib/components/onboarding-page/onboarding-theme.svelte'; import { AppRoute, QueryParameter } from '$lib/constants'; import { retrieveServerConfig } from '$lib/stores/server-config.store'; @@ -18,7 +18,7 @@ component: | typeof OnboardingHello | typeof OnboardingTheme - | typeof OnboadingStorageTemplate + | typeof OnboardingStorageTemplate | typeof OnboardingPrivacy; } @@ -26,7 +26,7 @@ { name: 'hello', component: OnboardingHello }, { name: 'theme', component: OnboardingTheme }, { name: 'privacy', component: OnboardingPrivacy }, - { name: 'storage', component: OnboadingStorageTemplate }, + { name: 'storage', component: OnboardingStorageTemplate }, ]; run(() => { diff --git a/web/src/routes/link/+page.ts b/web/src/routes/link/+page.ts index caa4108bfa..1bd0f4c856 100644 --- a/web/src/routes/link/+page.ts +++ b/web/src/routes/link/+page.ts @@ -2,14 +2,14 @@ import { AppRoute } from '$lib/constants'; import { redirect } from '@sveltejs/kit'; import type { PageLoad } from './$types'; -export const load = (({ url }) => { - enum LinkTarget { - HOME = 'home', - UNSUBSCRIBE = 'unsubscribe', - VIEW_ASSET = 'view_asset', - ACTIVATE_LICENSE = 'activate_license', - } +enum LinkTarget { + HOME = 'home', + UNSUBSCRIBE = 'unsubscribe', + VIEW_ASSET = 'view_asset', + ACTIVATE_LICENSE = 'activate_license', +} +export const load = (({ url }) => { const queryParams = url.searchParams; const target = queryParams.get('target') as LinkTarget; switch (target) { diff --git a/web/static/immich-logo-no-bg.svg b/web/static/immich-logo-no-bg.svg deleted file mode 100644 index 376fa6f3e8..0000000000 --- a/web/static/immich-logo-no-bg.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - diff --git a/web/static/immich-logo.svg b/web/static/immich-logo.svg deleted file mode 100644 index a3522c233f..0000000000 --- a/web/static/immich-logo.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - -