Merge branch 'p-stream:master' into master

Author: anzarfarooq

.gitignore

@@ -7,4 +7,4 @@ dist
 .env
 .vscode
 .metrics.json
-.metrics.json
+pnpm-lock.yaml

.metrics.json

@@ -29,7 +29,9 @@ export default defineCachedEventHandler(async (event) => {
     for (let i = 0; i < listItems.length; i++) {
       const listItem = listItems[i];
 
-      if (!listItem.href) continue;
+      if (!listItem.href) {
+        continue;
+      }
 
       try {
         const listUrl = `https://letterboxd.com${listItem.href}`;
@@ -63,6 +65,7 @@ export default defineCachedEventHandler(async (event) => {
 
         for (const selector of possibleFilmSelectors) {
           const elements = list$(selector);
+          
           if (elements.length > 0) {
             workingSelector = selector;
             films = elements.map((i, el) => {
@@ -84,19 +87,23 @@ export default defineCachedEventHandler(async (event) => {
               };
             }).get().filter(film => film.name);
 
-            if (films.length > 0) break;
+            if (films.length > 0) {
+              break;
+            }
           }
         }
 
-        const tmdbIds = [];
+        const tmdbMovies = [];
 
-        for (const film of films) {
+        for (let j = 0; j < films.length; j++) {
+          const film = films[j];
+          
           try {
             const searchResult = await tmdb.search.movies({ query: film.name });
 
             if (searchResult.results && searchResult.results.length > 0) {
-              const tmdbId = searchResult.results[0].id;
-              tmdbIds.push(tmdbId);
+              const tmdbMovie = searchResult.results[0];
+              tmdbMovies.push(tmdbMovie);
             }
           } catch (error) {
             continue;
@@ -106,10 +113,10 @@ export default defineCachedEventHandler(async (event) => {
         allLists.push({
           listName: listName,
           listUrl: listUrl,
-          tmdbIds,
+          tmdbMovies,
           metadata: {
             originalFilmCount: films.length,
-            foundTmdbIds: tmdbIds.length,
+            foundTmdbMovies: tmdbMovies.length,
             expectedItemCount: expectedItemCount,
             workingSelector
           }
@@ -119,10 +126,10 @@ export default defineCachedEventHandler(async (event) => {
         allLists.push({
           listName: listItem.title,
           listUrl: `https://letterboxd.com${listItem.href}`,
-          tmdbIds: [],
+          tmdbMovies: [],
           metadata: {
             originalFilmCount: 0,
-            foundTmdbIds: 0,
+            foundTmdbMovies: 0,
             expectedItemCount: null,
             error: 'Failed to process list'
           }
@@ -134,8 +141,8 @@ export default defineCachedEventHandler(async (event) => {
       lists: allLists,
       totalLists: allLists.length,
       summary: {
-        totalTmdbIds: allLists.reduce((sum, list) => sum + list.tmdbIds.length, 0),
-        totalExpectedItems: allLists.reduce((sum, list) => sum + (list.metadata.expectedItemCount || 0), 0)
+        totalTmdbMovies: allLists.reduce((sum, list) => sum + list.tmdbMovies.length, 0),
+        totalExpectedItems: allLists.reduce((sum, list) => sum + (list.metadata?.expectedItemCount || 0), 0)
       }
     };
   } catch (error) {

package-lock.json

@@ -281,22 +281,30 @@ export function recordProviderMetrics(items: any[], hostname: string, tool?: str
   // Record hostname once per request
   metrics.providerHostnames.inc({ hostname });
 
-  // Record status and watch metrics for each item
+  // Record status metrics for each item
   items.forEach(item => {
     // Record provider status
     metrics.providerStatuses.inc({
       provider_id: item.embedId ?? item.providerId,
       status: item.status,
     });
+  });
+
+  // Reverse items to get the last one, and find the last successful item
+  const itemList = [...items];
+  itemList.reverse();
+  const lastSuccessfulItem = items.find(v => v.status === 'success');
+  const lastItem = itemList[0];
 
-    // Record watch metrics for each item
+  // Record watch metrics only for the last item
+  if (lastItem) {
     metrics.watchMetrics.inc({
-      tmdb_full_id: item.type + '-' + item.tmdbId,
-      provider_id: item.providerId,
-      title: item.title,
-      success: (item.status === 'success').toString(),
+      tmdb_full_id: lastItem.type + '-' + lastItem.tmdbId,
+      provider_id: lastSuccessfulItem?.providerId ?? lastItem.providerId,
+      title: lastItem.title,
+      success: (!!lastSuccessfulItem).toString(),
     });
-  });
+  }
 
   // Record tool metrics
   if (tool) {