Merge branch 'feature/remove-four-images-priority' into develop

README.md

@@ -16,8 +16,10 @@
   <a href="#how-to-use">How To Use</a> •
   <a href="#contributing">Contributing</a> •
   <a href="#credits">Credits</a> •
+  <a href="#authors">Authors</a> •
   <a href="#license">License</a> •
-  <a href="#projects-using-autophoto">Projects using autophoto</a>
+  <a href="#projects-using-autophoto">Projects using autophoto</a> •
+  <a href="#changelog">Changelog</a>
 </p>
 
 ![bluesky](doc/bluesky-post.webp)
@@ -26,7 +28,7 @@
 
 * Pre-scan your directory for photos
   - Photos are detected by a path pattern
-  - Check all detected photos if they are valid
+  - Check all detected photos if they are valid (for instance BlueSky has size limitations)
 * Scan your directory for photos
   - For now only suppose to work with video game screenshots
   - Photos are detected by a path pattern
@@ -246,3 +248,10 @@ the domains, the performance, etc. So, if you want to help me, I will be happy t
 > [zhykos.fr](https://www.zhykos.fr) &nbsp;&middot;&nbsp;
 > GitHub [@zhykos](https://github.com/Zhykos) &nbsp;&middot;&nbsp;
 > Bluesky [@zhykos](https://bsky.app/profile/zhykos.bsky.social)
+
+---
+
+## Changelog
+
+* 2.1
+  - Remove the pick priority of directories which have at least 4 photos to publish

src/picker/service/PickerService.ts

@@ -24,28 +24,7 @@ export class PickerService {
       return undefined;
     }
 
-    const possibilitiesPriority: UnpublishedVideoGamesScreenshot[] =
-      unpublishedVideoGamesScreenshots.filter(
-        (screenshot) => screenshot.images.length >= 4,
-      );
-
-    if (possibilitiesPriority.length > 0) {
-      return this.pickScreenshotsToShare(possibilitiesPriority);
-    }
-
-    const mapByLength = new Map<number, UnpublishedVideoGamesScreenshot[]>();
-    for (const screenshot of unpublishedVideoGamesScreenshots) {
-      const length: number = screenshot.images.length;
-      if (!mapByLength.has(length)) {
-        mapByLength.set(length, []);
-      }
-      mapByLength.get(length)?.push(screenshot);
-    }
-    return this.pickScreenshotsToShare(
-      mapByLength.get(3) ??
-        mapByLength.get(2) ??
-        (mapByLength.get(1) as UnpublishedVideoGamesScreenshot[]),
-    );
+    return this.pickScreenshotsToShare(unpublishedVideoGamesScreenshots);
   }
 
   private pickScreenshotsToShare(
@@ -67,18 +46,19 @@ export class PickerService {
   private async getUnpublishedVideoGamesScreenshots(): Promise<
     UnpublishedVideoGamesScreenshot[]
   > {
-    const unpublishedScreenshotRelations: UnpublishedVideoGameScreenshotRelation[] =
-      await this.relationRepository.getUnpublishedVideoGameRelations();
+    const unpublishedScreenshotRelations:
+      UnpublishedVideoGameScreenshotRelation[] = await this.relationRepository
+        .getUnpublishedVideoGameRelations();
     const unpublishedVideoGamesIDs: string[] = distinct(
       unpublishedScreenshotRelations.map((rel) => rel.videoGameID),
     );
-    const unpublishedVideoGames: VideoGame[] =
-      await this.videoGameRepository.getVideoGames(unpublishedVideoGamesIDs);
+    const unpublishedVideoGames: VideoGame[] = await this.videoGameRepository
+      .getVideoGames(unpublishedVideoGamesIDs);
     const unpublishedImagesIDs: string[] = distinct(
       unpublishedScreenshotRelations.map((rel) => rel.imageID),
     );
-    const unpublishedImages: Image[] =
-      await this.imageRepository.getVideoGameScreenshots(unpublishedImagesIDs);
+    const unpublishedImages: Image[] = await this.imageRepository
+      .getVideoGameScreenshots(unpublishedImagesIDs);
     return UnpublishedVideoGamesScreenshot.buildAll(
       unpublishedScreenshotRelations,
       unpublishedVideoGames,

test/main.test.ts

@@ -1,5 +1,9 @@
-import { assertEquals } from "@std/assert";
-import { assertNotEquals } from "@std/assert/not-equals";
+import {
+  assert,
+  assertEquals,
+  assertMatch,
+  assertNotEquals,
+} from "@std/assert";
 import {
   afterAll,
   beforeAll,
@@ -78,14 +82,14 @@ describe("main", () => {
     ]);
 
     assertNotEquals(mockedBlueskyServer.lastRecord, undefined);
-    assertEquals(
-      mockedBlueskyServer.lastRecord?.text,
-      'Screenshots from video game "80\'s Overdrive" (2017) taken on Nintendo Switch',
+    assertMatch(
+      mockedBlueskyServer.lastRecord?.text ?? "",
+      /^Screenshots? from video game ".+" \(\d+\) taken on .+$/,
     );
-    assertEquals(mockedBlueskyServer.lastRecord?.embed.images.length, 4);
-    assertEquals(
-      mockedBlueskyServer.lastRecord?.embed.images[0].alt,
-      "Screenshot from video game 80's Overdrive (no more details given by the bot)",
+    assert((mockedBlueskyServer.lastRecord?.embed.images.length ?? 0) > 0);
+    assertMatch(
+      mockedBlueskyServer.lastRecord?.embed.images[0].alt ?? "",
+      /^Screenshot from video game .+ \(no more details given by the bot\)$/,
     );
     assertNotEquals(
       mockedBlueskyServer.lastRecord?.embed.images[0].image,