fix: accept nested YouTube Takeout parts

Author: Priveetee

apps/web/src/lib/prepare-youtube-takeout.ts

@@ -3,7 +3,7 @@ import { m } from "../paraglide/messages.js";
 import type { PortabilityPreparationProgress } from "./portability-preparation-progress";
 import { isTakeoutStorageQuotaError } from "./takeout-errors";
 import { TakeoutZipReader } from "./takeout-zip-reader";
-import { isRootZipPart, isTakeoutMetadata, streamTakeoutPart } from "./youtube-takeout-archive";
+import { isNestedZipPart, isTakeoutMetadata, streamTakeoutPart } from "./youtube-takeout-archive";
 import {
   MAX_IN_MEMORY_BYTES,
   MAX_METADATA_BYTES,
@@ -54,7 +54,7 @@ export async function prepareYoutubeTakeout(
       if (entry.directory) continue;
       sourceReader.registerEntry(entry);
       if (isTakeoutMetadata(entry.filename)) metadata.push(entry);
-      else if (isRootZipPart(entry.filename)) {
+      else if (isNestedZipPart(entry.filename)) {
         if (entry.encrypted || entry.uncompressedSize > MAX_NESTED_BYTES) {
           throw new Error(m.portability_takeout_metadata_limit());
         }

apps/web/src/lib/youtube-takeout-archive.ts

@@ -7,8 +7,12 @@ export function isTakeoutMetadata(name: string): boolean {
   return /youtube.*\.(csv|html|json)$/i.test(name);
 }
 
-export function isRootZipPart(name: string): boolean {
-  return !name.includes("/") && /\.zip$/i.test(name);
+export function isNestedZipPart(name: string): boolean {
+  return /\.zip$/i.test(name);
+}
+
+export function isTakeoutZipPart(name: string): boolean {
+  return /(?:^|\/)takeout-\d{8}t\d{6}z-\d+-\d+\.zip$/i.test(name);
 }
 
 export async function isYoutubeTakeoutArchive(file: Blob): Promise<boolean> {
@@ -21,7 +25,7 @@ export async function isYoutubeTakeoutArchive(file: Blob): Promise<boolean> {
       sourceReader.registerEntry(entry);
       const name = entry.filename.replaceAll("\\", "/");
       if (name.toLowerCase().startsWith("takeout/") && isTakeoutMetadata(name)) return true;
-      if (/^takeout-\d{8}t\d{6}z-\d+-\d+\.zip$/i.test(name)) return true;
+      if (isTakeoutZipPart(name)) return true;
     }
   } catch {
     return false;

apps/web/tests/prepare-youtube-takeout.test.ts

@@ -66,6 +66,32 @@ test("extracts metadata from multiple ZIP parts and excludes media", async () =>
   }
 });
 
+test("extracts metadata from ZIP parts nested inside a folder", async () => {
+  const part = new ZipWriter(new BlobWriter());
+  await part.add(
+    "Takeout/YouTube y YouTube Music/suscripciones/suscripciones.csv",
+    new TextReader(
+      "ID de canal,URL del canal,Título del canal\nUC1,https://www.youtube.com/channel/UC1,Canal",
+    ),
+  );
+  const outer = new ZipWriter(new BlobWriter());
+  await outer.add(
+    "downloads/takeout-20260905T223911Z-2-001.zip",
+    new BlobReader(await part.close()),
+  );
+
+  const result = await prepareYoutubeTakeout(new File([await outer.close()], "takeout.zip"));
+  const reader = new ZipReader(new BlobReader(result));
+  try {
+    const entries = await reader.getEntries();
+    expect(entries.map((entry) => entry.filename)).toEqual([
+      "Takeout/YouTube y YouTube Music/suscripciones/suscripciones.csv",
+    ]);
+  } finally {
+    await reader.close();
+  }
+});
+
 test("rejects a video-only part instead of starting an empty import", async () => {
   const writer = new ZipWriter(new BlobWriter());
   await writer.add("Takeout/YouTube/videos/upload.mp4", new TextReader("video"));

apps/web/tests/takeout-zip-reader.test.ts

@@ -104,6 +104,19 @@ test("detects a direct Google Takeout archive from its YouTube metadata paths",
   expect(await isYoutubeTakeoutArchive(file)).toBe(true);
 });
 
+test("detects a Spanish Google Takeout archive from its localized YouTube metadata paths", async () => {
+  const writer = new ZipWriter(new BlobWriter());
+  await writer.add(
+    "Takeout/YouTube y YouTube Music/suscripciones/suscripciones.csv",
+    new TextReader(
+      "ID de canal,URL del canal,Título del canal\nUC1,https://www.youtube.com/channel/UC1,Canal",
+    ),
+  );
+  const file = new File([await writer.close()], "takeout.zip");
+
+  expect(await isYoutubeTakeoutArchive(file)).toBe(true);
+});
+
 test("detects Google Takeout transfer archives before decompressing their parts", async () => {
   const writer = new ZipWriter(new BlobWriter());
   await writer.add(
@@ -114,3 +127,14 @@ test("detects Google Takeout transfer archives before decompressing their parts"
 
   expect(await isYoutubeTakeoutArchive(file)).toBe(true);
 });
+
+test("detects Takeout transfer parts nested inside a folder", async () => {
+  const writer = new ZipWriter(new BlobWriter());
+  await writer.add(
+    "downloads/takeout-20260905T223911Z-2-001.zip",
+    new TextReader("not a real nested archive"),
+  );
+  const file = new File([await writer.close()], "transfer-01a07621.zip");
+
+  expect(await isYoutubeTakeoutArchive(file)).toBe(true);
+});