PR checklist

immich-app · Jan 17, 2024 · cfac09c · cfac09c
1 parent fca7d9c
commit cfac09c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/server/src/domain/media/media.service.ts b/server/src/domain/media/media.service.ts
@@ -318,9 +318,10 @@ export class MediaService {
     containerExtension: string,
     ffmpegConfig: SystemConfigFFmpegDto,
   ): boolean {
-    const isTargetVideoCodec = ffmpegConfig.acceptedVideoCodecs.includes(<VideoCodec>videoStream.codecName)
+    const isTargetVideoCodec = ffmpegConfig.acceptedVideoCodecs.includes(<VideoCodec>videoStream.codecName);
     const isTargetContainer = ['mov,mp4,m4a,3gp,3g2,mj2', 'mp4', 'mov'].includes(containerExtension);
-    const isTargetAudioCodec = audioStream == null || ffmpegConfig.acceptedAudioCodecs.includes(<AudioCodec>audioStream.codecName);
+    const isTargetAudioCodec =
+      audioStream == null || ffmpegConfig.acceptedAudioCodecs.includes(<AudioCodec>audioStream.codecName);
 
     this.logger.verbose(
       `${asset.id}: AudioCodecName ${audioStream?.codecName ?? 'None'}, AudioStreamCodecType ${

diff --git a/web/src/lib/components/admin-page/settings/ffmpeg/ffmpeg-settings.svelte b/web/src/lib/components/admin-page/settings/ffmpeg/ffmpeg-settings.svelte
@@ -12,8 +12,8 @@
   import SettingInputField, { SettingInputFieldType } from '../setting-input-field.svelte';
   import SettingSelect from '../setting-select.svelte';
   import SettingSwitch from '../setting-switch.svelte';
-  import SettingCheckboxes from '../setting-checkboxes.svelte'
-  import {isEqual, sortBy} from 'lodash-es';
+  import SettingCheckboxes from '../setting-checkboxes.svelte';
+  import { isEqual, sortBy } from 'lodash-es';
   import { fade } from 'svelte/transition';
   import SettingAccordion from '../setting-accordion.svelte';
   import { mdiHelpCircleOutline } from '@mdi/js';
@@ -90,7 +90,7 @@
           ]}
           name="acodec"
           isEdited={config.ffmpeg.targetAudioCodec !== savedConfig.ffmpeg.targetAudioCodec}
-          onChange={() => config.ffmpeg.acceptedAudioCodecs = [config.ffmpeg.targetAudioCodec]}
+          onChange={() => (config.ffmpeg.acceptedAudioCodecs = [config.ffmpeg.targetAudioCodec])}
         />
 
         <SettingSelect
@@ -105,7 +105,7 @@
           ]}
           name="vcodec"
           isEdited={config.ffmpeg.targetVideoCodec !== savedConfig.ffmpeg.targetVideoCodec}
-          onChange={() => config.ffmpeg.acceptedVideoCodecs = [config.ffmpeg.targetVideoCodec]}
+          onChange={() => (config.ffmpeg.acceptedVideoCodecs = [config.ffmpeg.targetVideoCodec])}
         />
 
         <SettingSelect

diff --git a/web/src/lib/components/admin-page/settings/setting-checkboxes.svelte b/web/src/lib/components/admin-page/settings/setting-checkboxes.svelte
@@ -2,18 +2,17 @@
   import { quintOut } from 'svelte/easing';
   import { fly } from 'svelte/transition';
 
-  export let value: string[] | number[];
-  export let options: { value: string | number; text: string }[];
+  export let value: string[];
+  export let options: { value: string; text: string }[];
   export let label = '';
   export let desc = '';
   export let name = '';
   export let isEdited = false;
-  export let number = false;
   export let disabled = false;
 
-  function handleCheckboxChange(option) {
+  function handleCheckboxChange(option: string) {
     if (value.includes(option)) {
-      value = value.filter(item => item !== option);
+      value = value.filter((item) => item !== option);
     } else {
       value = [...value, option];
     }
@@ -42,11 +41,14 @@
 
   {#each options as option}
     <label class="flex items-center mb-2">
-      <input type="checkbox" class="form-checkbox h-5 w-5 color"
-             checked={value.includes(option.value)}
-             on:change={() => handleCheckboxChange(option.value)}/>
+      <input
+        type="checkbox"
+        class="form-checkbox h-5 w-5 color"
+        {disabled}
+        checked={value.includes(option.value)}
+        on:change={() => handleCheckboxChange(option.value)}
+      />
       <span class="ml-2 text-sm text-gray-500 dark:text-gray-300 pt-1">{option.text}</span>
     </label>
   {/each}
-
 </div>
diff --git a/web/src/lib/components/admin-page/settings/setting-select.svelte b/web/src/lib/components/admin-page/settings/setting-select.svelte
@@ -10,14 +10,14 @@
   export let isEdited = false;
   export let number = false;
   export let disabled = false;
-  export let onChange: () => void
+  export let onChange: () => void = () => {};
 
   const handleChange = (e: Event) => {
     value = (e.target as HTMLInputElement).value;
     if (number) {
       value = parseInt(value);
     }
-    onChange()
+    onChange();
   };
 </script>