Merge branch 'ci-pretty'

.github/workflows/static-analysis.yaml

@@ -53,7 +53,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install Pretter
-        run: npm install -g prettier
+        run: npm install --no-save "prettier@$(cat ./package.json | jq -r '.devDependencies["prettier"]')"
 
       - name: Run Prettier
         run: npx prettier src --check

.vscode/settings.json

@@ -98,4 +98,7 @@
   },
   "git.alwaysSignOff": true,
   "editor.formatOnSave": true,
+  "psalm.configPaths": [
+    "psalm-ls.xml"
+  ],
 }

package.json

@@ -71,6 +71,7 @@
     "@types/url-parse": "^1.4.9",
     "@types/videojs-contrib-quality-levels": "^2.0.2",
     "playwright": "^1.39.0",
+    "prettier": "^3.0.3",
     "typescript": "^5.2.2",
     "workbox-webpack-plugin": "^7.0.0"
   }

psalm-ls.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<psalm
+    totallyTyped="true"
+    errorLevel="5"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    cacheDirectory=".cache/psalm"
+>
+    <!--
+        Duplication is due to differences in language server and CLI
+        The CLI needs the files in extraFiles since we specify lib as
+        the scan directory. The language server needs the files in
+        projectFiles since it doesn't seem to support extraFiles.
+    -->
+    <projectFiles>
+        <directory name="lib" />
+        <directory name="../../lib" />
+        <directory name="../../apps/files/lib/Event" />
+        <directory name="../../3rdparty/doctrine" />
+        <directory name="../../3rdparty/psr" />
+        <directory name="../../3rdparty/guzzlehttp" />
+
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+    <issueHandlers>
+        <UndefinedDocblockClass>
+            <errorLevel type="suppress">
+                <referencedClass name="Doctrine\DBAL\Schema\Schema" />
+                <referencedClass name="Doctrine\DBAL\Schema\SchemaException" />
+                <referencedClass name="Doctrine\DBAL\Driver\Statement" />
+                <referencedClass name="Doctrine\DBAL\Schema\Table" />
+                <referencedClass name="Doctrine\DBAL\Platforms\AbstractPlatform" />
+            </errorLevel>
+        </UndefinedDocblockClass>
+    </issueHandlers>
+</psalm>

psalm.xml

@@ -8,23 +8,14 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     cacheDirectory=".cache/psalm"
 >
+    <!-- The language server works slightly differently and has a different file -->
     <projectFiles>
         <directory name="lib" />
-
-        <!--
-            Duplication is due to differences in language server and CLI
-            The CLI needs the files in extraFiles since we specify lib as
-            the scan directory. The language server needs the files in
-            projectFiles since it doesn't seem to support extraFiles.
-        -->
-        <directory name="../../lib" />
-        <directory name="../../apps/files/lib/Event" />
-        <directory name="../../3rdparty/doctrine" />
-        <directory name="../../3rdparty/psr" />
-        <directory name="../../3rdparty/guzzlehttp" />
-
         <ignoreFiles>
             <directory name="vendor" />
+            <directory name="../../lib" />
+            <directory name="../../apps/files" />
+            <directory name="../../3rdparty" />
         </ignoreFiles>
     </projectFiles>
     <extraFiles>

src/App.vue

@@ -294,7 +294,7 @@ export default defineComponent({
           this.metadataComponent?.$destroy?.();
           this.metadataComponent = null;
         },
-      })
+      }),
     );
 
     // Check for native interface

src/components/ScrollerManager.vue

@@ -604,7 +604,9 @@ export default defineComponent({
   z-index: 100; // below top-matter and top-bar
   cursor: ns-resize;
   opacity: 0;
-  transition: opacity 0.2s ease-in-out, visibility 0.2s ease-in-out;
+  transition:
+    opacity 0.2s ease-in-out,
+    visibility 0.2s ease-in-out;
 
   // Show on hover or scroll of main window
   &:hover,

src/components/SelectionManager.vue

@@ -462,7 +462,7 @@ export default defineComponent({
         } else {
           this.touchScrollDelta = Math.min(
             (touch.clientY - _m.window.innerHeight + TOUCH_SELECT_CLAMP.bottom) / 3,
-            TOUCH_SELECT_CLAMP.maxDelta
+            TOUCH_SELECT_CLAMP.maxDelta,
           );
         }
 
@@ -501,7 +501,7 @@ export default defineComponent({
       const recyclerRect = this.recycler?.getBoundingClientRect();
       const clampedY = Math.max(
         (recyclerRect?.top ?? 0) + TOUCH_SELECT_CLAMP.bufferPx,
-        Math.min((recyclerRect?.bottom ?? 0) - TOUCH_SELECT_CLAMP.bufferPx, touch.clientY)
+        Math.min((recyclerRect?.bottom ?? 0) - TOUCH_SELECT_CLAMP.bufferPx, touch.clientY),
       );
 
       // Which photo is the cursor over, if any

src/components/Settings.vue

@@ -245,7 +245,7 @@ export default defineComponent({
     async chooseFoldersPath() {
       const newPath = await utils.chooseNcFolder(
         this.t('memories', 'Choose the root for the folders view'),
-        this.config.folders_path
+        this.config.folders_path,
       );
 
       if (newPath !== this.config.folders_path) {

src/components/Sidebar.vue

@@ -68,7 +68,7 @@ export default defineComponent({
             },
           },
         },
-        globalThis.OCA.Files
+        globalThis.OCA.Files,
       );
     }
   },

src/components/SplitTimeline.vue

@@ -233,7 +233,9 @@ export default defineComponent({
     opacity: 0.1;
     cursor: col-resize;
     margin: 0 0 0 auto;
-    transition: opacity 0.4s ease-out, background-color 0.4s ease-out;
+    transition:
+      opacity 0.4s ease-out,
+      background-color 0.4s ease-out;
   }
 
   > .separator:hover {
@@ -273,7 +275,9 @@ export default defineComponent({
 
       // Note: you can't use transforms to animate the top
       // because it causes the viewer to be rendered incorrectly
-      transition: top 0.2s ease, height 0.2s ease;
+      transition:
+        top 0.2s ease,
+        height 0.2s ease;
 
       > .timeline-header {
         height: 58px;

src/components/Timeline.vue

@@ -1069,7 +1069,7 @@ export default defineComponent({
           numCols: this.numCols,
           allowBreakout: this.allowBreakout(),
           seed: dayId,
-        }
+        },
       );
 
       // Check if some rows were added
@@ -1359,7 +1359,10 @@ export default defineComponent({
   left: 0;
   cursor: pointer;
   height: 100%;
-  transition: width 0.2s ease-in-out, height 0.2s ease-in-out, transform 0.2s ease-in-out; // reflow
+  transition:
+    width 0.2s ease-in-out,
+    height 0.2s ease-in-out,
+    transform 0.2s ease-in-out; // reflow
 }
 
 /** Dynamic top matter */

src/components/admin/AdminMixin.ts

@@ -62,7 +62,7 @@ export default defineComponent({
             info: status.substring(10),
           },
           0,
-          noescape
+          noescape,
         );
       } else if (status.startsWith('test_ok')) {
         return this.t(
@@ -73,7 +73,7 @@ export default defineComponent({
             info: status.substring(8),
           },
           0,
-          noescape
+          noescape,
         );
       } else {
         return this.t('memories', '{name} binary status: {status}.', {

src/components/admin/sections/Indexing.vue

@@ -35,15 +35,15 @@
         {{
           t(
             'memories',
-            'Looks like it has been more than an hour since the last index job was run. Make sure Nextcloud cron is configured correctly.'
+            'Looks like it has been more than an hour since the last index job was run. Make sure Nextcloud cron is configured correctly.',
           )
         }}
       </NcNoteCard>
       <NcNoteCard type="error" v-if="status.bad_encryption">
         {{
           t(
             'memories',
-            'Only server-side encryption (OC_DEFAULT_MODULE) is supported, but another encryption module is enabled.'
+            'Only server-side encryption (OC_DEFAULT_MODULE) is supported, but another encryption module is enabled.',
           )
         }}
       </NcNoteCard>
@@ -53,7 +53,7 @@
       {{
         t(
           'memories',
-          'The EXIF indexes are built and checked in a periodic background task. Be careful when selecting anything other than automatic indexing. For example, setting the indexing to only timeline folders may cause delays before media becomes available to users, since the user configures the timeline only after logging in.'
+          'The EXIF indexes are built and checked in a periodic background task. Be careful when selecting anything other than automatic indexing. For example, setting the indexing to only timeline folders may cause delays before media becomes available to users, since the user configures the timeline only after logging in.',
         )
       }}
       {{ t('memories', 'Folders with a ".nomedia" or a ".nomemories" file are always excluded from indexing.') }}

src/components/admin/sections/Performance.vue

@@ -9,7 +9,7 @@
             ? t('memories', 'HTTPS is enabled')
             : t(
                 'memories',
-                'You are accessing this page over an insecure context. Several browser APIs are not available, which will make Memories very slow. Enable HTTPS on your server to improve performance.'
+                'You are accessing this page over an insecure context. Several browser APIs are not available, which will make Memories very slow. Enable HTTPS on your server to improve performance.',
               )
         }}
       </NcNoteCard>

src/components/admin/sections/Places.vue

@@ -39,14 +39,14 @@
       {{
         t(
           'memories',
-          'Memories supports offline reverse geocoding using the OpenStreetMaps data on MySQL and Postgres.'
+          'Memories supports offline reverse geocoding using the OpenStreetMaps data on MySQL and Postgres.',
         )
       }}
       <br />
       {{
         t(
           'memories',
-          'You need to download the planet data into your database. This is highly recommended and has low overhead.'
+          'You need to download the planet data into your database. This is highly recommended and has low overhead.',
         )
       }}
       <br />
@@ -116,7 +116,7 @@ export default defineComponent({
       // construct warning
       const warnSetup = this.t(
         'memories',
-        'Looks like the database is already setup. Are you sure you want to redownload planet data?'
+        'Looks like the database is already setup. Are you sure you want to redownload planet data?',
       );
       const warnLong = this.t('memories', 'You are about to download the planet database. This may take a while.');
       const warnReindex = this.t('memories', 'This may also cause all photos to be re-indexed!');

src/components/admin/sections/Video.vue

@@ -8,7 +8,7 @@
       {{
         t(
           'memories',
-          'Note that this may be very CPU intensive without hardware acceleration, and transcoding will not be used for external storage.'
+          'Note that this may be very CPU intensive without hardware acceleration, and transcoding will not be used for external storage.',
         )
       }}
 

src/components/admin/sections/VideoAccel.vue

@@ -15,7 +15,7 @@
       {{
         t(
           'memories',
-          'Intel processors supporting QuickSync Video (QSV) as well as some AMD GPUs can be used for transcoding using VA-API acceleration.'
+          'Intel processors supporting QuickSync Video (QSV) as well as some AMD GPUs can be used for transcoding using VA-API acceleration.',
         )
       }}
       {{ t('memories', 'For more details on driver installation, check the documentation:') }}
@@ -52,7 +52,7 @@
       {{
         t(
           'memories',
-          'Depending on the versions of the installed SDK and ffmpeg, you need to specify the scaler to use'
+          'Depending on the versions of the installed SDK and ffmpeg, you need to specify the scaler to use',
         )
       }}
 
@@ -102,7 +102,7 @@
       {{
         t(
           'memories',
-          'Due to a bug in certain hardware drivers, videos may appear in incorrect orientations when streaming. This can be resolved in some cases by rotating the video on the accelerator.'
+          'Due to a bug in certain hardware drivers, videos may appear in incorrect orientations when streaming. This can be resolved in some cases by rotating the video on the accelerator.',
         )
       }}
       <br />