tbelway/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2026-05-23 07:22:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/immich-app/immich into chore/admin-only-library

Browse Source
This commit is contained in:
Jonathan Jogenfors
2024-02-29 13:35:50 +01:00
parent 55daf0c710 dc7a329cc8
commit 09f86b1ed6
7 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/android/fastlane/report.xml
+3 -3
View File
@@ -5,17 +5,17 @@
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.000271">
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.000266">
</testcase>
<testcase classname="fastlane.lanes" name="1: bundleRelease" time="74.334294">
<testcase classname="fastlane.lanes" name="1: bundleRelease" time="81.342186">
</testcase>
<testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="29.507669">
<testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="48.746195">
</testcase>
mobile/ios/Runner.xcodeproj/project.pbxproj
+3 -3
View File
@@ -379,7 +379,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 140;
CURRENT_PROJECT_VERSION = 141;
DEVELOPMENT_TEAM = 2F67MQ8R79;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@@ -515,7 +515,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 140;
CURRENT_PROJECT_VERSION = 141;
DEVELOPMENT_TEAM = 2F67MQ8R79;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@@ -543,7 +543,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 140;
CURRENT_PROJECT_VERSION = 141;
DEVELOPMENT_TEAM = 2F67MQ8R79;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
mobile/ios/Runner/Info.plist
+2 -2
View File
@@ -55,11 +55,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.96.0</string>
<string>1.97.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>140</string>
<string>141</string>
<key>FLTEnableImpeller</key>
<true />
<key>ITSAppUsesNonExemptEncryption</key>
mobile/ios/fastlane/report.xml
+6 -6
View File
@@ -5,32 +5,32 @@
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.000316">
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.000304">
</testcase>
<testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.190055">
<testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.272646">
</testcase>
<testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="4.109364">
<testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="3.560896">
</testcase>
<testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.15926">
<testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.235745">
</testcase>
<testcase classname="fastlane.lanes" name="4: build_app" time="80.90681">
<testcase classname="fastlane.lanes" name="4: build_app" time="114.820395">
</testcase>
<testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="71.634559">
<testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="68.950812">
</testcase>
server/src/domain/job/job.service.spec.ts
+1 -6
View File
@@ -286,12 +286,7 @@ describe(JobService.name, () => {
},
{
item: { name: JobName.GENERATE_JPEG_THUMBNAIL, data: { id: 'asset-1' } },
jobs: [
JobName.GENERATE_WEBP_THUMBNAIL,
JobName.GENERATE_THUMBHASH_THUMBNAIL,
JobName.SMART_SEARCH,
JobName.FACE_DETECTION,
],
jobs: [JobName.GENERATE_WEBP_THUMBNAIL, JobName.GENERATE_THUMBHASH_THUMBNAIL],
},
{
item: { name: JobName.GENERATE_JPEG_THUMBNAIL, data: { id: 'asset-1', source: 'upload' } },
server/src/domain/job/job.service.ts
+10 -8
View File
@@ -248,16 +248,18 @@ export class JobService {
const jobs: JobItem[] = [
{ name: JobName.GENERATE_WEBP_THUMBNAIL, data: item.data },
{ name: JobName.GENERATE_THUMBHASH_THUMBNAIL, data: item.data },
{ name: JobName.SMART_SEARCH, data: item.data },
{ name: JobName.FACE_DETECTION, data: item.data },
];
const [asset] = await this.assetRepository.getByIds([item.data.id]);
if (asset) {
if (asset.type === AssetType.VIDEO) {
jobs.push({ name: JobName.VIDEO_CONVERSION, data: item.data });
} else if (asset.livePhotoVideoId) {
jobs.push({ name: JobName.VIDEO_CONVERSION, data: { id: asset.livePhotoVideoId } });
if (item.data.source === 'upload') {
jobs.push({ name: JobName.SMART_SEARCH, data: item.data }, { name: JobName.FACE_DETECTION, data: item.data });
const [asset] = await this.assetRepository.getByIds([item.data.id]);
if (asset) {
if (asset.type === AssetType.VIDEO) {
jobs.push({ name: JobName.VIDEO_CONVERSION, data: item.data });
} else if (asset.livePhotoVideoId) {
jobs.push({ name: JobName.VIDEO_CONVERSION, data: { id: asset.livePhotoVideoId } });
}
}
}
server/start.sh
+3
View File
@@ -1,5 +1,8 @@
#!/usr/bin/env bash
lib_path="/usr/lib/$(arch)-linux-gnu/libmimalloc.so.2"
export LD_PRELOAD="$lib_path"
read_file_and_export() {
if [ -n "${!1}" ]; then
content="$(cat "${!1}")"