diff --git a/src/extractor/DoodStream.ts b/src/extractor/DoodStream.ts index 5f9c177..94bc770 100644 --- a/src/extractor/DoodStream.ts +++ b/src/extractor/DoodStream.ts @@ -52,9 +52,9 @@ export class DoodStream implements Extractor { sourceId: `${this.id}_${meta.countryCode.toLowerCase()}`, ttl: this.ttl, meta: { + ...meta, title, ...(mp4Head['content-length'] && { bytes: parseInt(mp4Head['content-length'] as string) }), - ...meta, }, requestHeaders: { Referer: 'http://dood.to/', diff --git a/src/extractor/Dropload.ts b/src/extractor/Dropload.ts index 57c1774..2415cea 100644 --- a/src/extractor/Dropload.ts +++ b/src/extractor/Dropload.ts @@ -43,10 +43,10 @@ export class Dropload implements Extractor { sourceId: `${this.id}_${meta.countryCode.toLowerCase()}`, ttl: this.ttl, meta: { + ...meta, bytes: bytes.parse(sizeMatch[1] as string) as number, height: parseInt(heightMatch[1] as string) as number, title, - ...meta, }, }, ]; diff --git a/src/extractor/Fsst.ts b/src/extractor/Fsst.ts index f343a53..71b81e8 100644 --- a/src/extractor/Fsst.ts +++ b/src/extractor/Fsst.ts @@ -36,9 +36,9 @@ export class Fsst implements Extractor { label: this.label, sourceId: `${this.id}_${meta.countryCode.toLowerCase()}_${index}`, meta: { + ...meta, height: parseInt(heightAndUrlMatch[1] as string), title, - ...meta, }, }; }); diff --git a/src/extractor/Soaper.ts b/src/extractor/Soaper.ts index 195d751..cc05928 100644 --- a/src/extractor/Soaper.ts +++ b/src/extractor/Soaper.ts @@ -57,8 +57,8 @@ export class Soaper implements Extractor { sourceId: `${this.id}_${meta.countryCode.toLowerCase()}`, ttl: this.ttl, meta: { - ...(height && { height: parseInt(height[1] ?? height[2] as string) }), ...meta, + ...(height && { height: parseInt(height[1] ?? height[2] as string) }), }, }, ]; diff --git a/src/extractor/SuperVideo.ts b/src/extractor/SuperVideo.ts index 47f5b18..19907d0 100644 --- a/src/extractor/SuperVideo.ts +++ b/src/extractor/SuperVideo.ts @@ -40,12 +40,12 @@ export class SuperVideo implements Extractor { sourceId: `${this.id}_${meta.countryCode.toLowerCase()}`, ttl: this.ttl, meta: { + ...meta, ...(heightAndSizeMatch && { bytes: bytes.parse(heightAndSizeMatch[2] as string) as number, height: parseInt(heightAndSizeMatch[1] as string) as number, }), - title, - ...meta, + ...(title && { title }), }, }, ]; diff --git a/src/handler/__snapshots__/CineHDPlus.test.ts.snap b/src/handler/__snapshots__/CineHDPlus.test.ts.snap index d7e7b15..9cdf9b2 100644 --- a/src/handler/__snapshots__/CineHDPlus.test.ts.snap +++ b/src/handler/__snapshots__/CineHDPlus.test.ts.snap @@ -9,7 +9,7 @@ exports[`CineHDPlus handle imdb babylon 5 s2e3 (es) 1`] = ` "bytes": 219571814, "countryCode": "es", "height": 344, - "title": "Babylon 5 2x3", + "title": "Babylon 2x3", }, "sourceId": "supervideo_es", "ttl": 900000, diff --git a/src/handler/__snapshots__/Eurostreaming.test.ts.snap b/src/handler/__snapshots__/Eurostreaming.test.ts.snap index bb3d460..48a7e19 100644 --- a/src/handler/__snapshots__/Eurostreaming.test.ts.snap +++ b/src/handler/__snapshots__/Eurostreaming.test.ts.snap @@ -9,7 +9,7 @@ exports[`Eurostreaming handle imdb black mirror s2e4 1`] = ` "bytes": 875875532, "countryCode": "it", "height": 1080, - "title": "Black Mirror 2x4", + "title": "Black Mirror 1080p", }, "sourceId": "supervideo_it", "ttl": 900000, @@ -23,7 +23,7 @@ exports[`Eurostreaming handle imdb black mirror s2e4 1`] = ` "bytes": 875875532, "countryCode": "it", "height": 1080, - "title": "Black Mirror 2x4", + "title": "Black Mirror 1080p", }, "sourceId": "supervideo_it", "ttl": 900000, @@ -37,7 +37,7 @@ exports[`Eurostreaming handle imdb black mirror s2e4 1`] = ` "bytes": 875875532, "countryCode": "it", "height": 1080, - "title": "Black Mirror 2x4", + "title": "Black Mirror S2 E4 1080p", }, "sourceId": "dropload_it", "ttl": 900000, diff --git a/src/handler/__snapshots__/Frembed.test.ts.snap b/src/handler/__snapshots__/Frembed.test.ts.snap index 49b913d..39b13e2 100644 --- a/src/handler/__snapshots__/Frembed.test.ts.snap +++ b/src/handler/__snapshots__/Frembed.test.ts.snap @@ -7,7 +7,7 @@ exports[`Frembed handle imdb black mirror s4e2 1`] = ` "label": "DoodStream", "meta": { "countryCode": "fr", - "title": "Black Mirror 4x2", + "title": "Black Mirror S04E02 FRENCH 720p WEB x264-RiPiT", }, "requestHeaders": { "Referer": "http://dood.to/", @@ -66,7 +66,7 @@ exports[`Frembed handle tmdb black mirror s4e2 1`] = ` "label": "DoodStream", "meta": { "countryCode": "fr", - "title": "Black Mirror 4x2", + "title": "Black Mirror S04E02 FRENCH 720p WEB x264-RiPiT", }, "requestHeaders": { "Referer": "http://dood.to/", diff --git a/src/handler/__snapshots__/KinoGer.test.ts.snap b/src/handler/__snapshots__/KinoGer.test.ts.snap index 1c8409b..6881d15 100644 --- a/src/handler/__snapshots__/KinoGer.test.ts.snap +++ b/src/handler/__snapshots__/KinoGer.test.ts.snap @@ -8,7 +8,7 @@ exports[`KinoGer handle imdb blood and sinners 1`] = ` "meta": { "countryCode": "de", "height": 360, - "title": "Blood & Sinners (2025)", + "title": "Blood.and.Sinners.2025.mkv", }, "sourceId": "fsst_de_0", "url": "https://www.secvideo1.online/get_file/16/a135ab46b1243e41c0282c16d7cdcbcd3e54de0f28/900000/900576/900576_360p.mp4/", @@ -18,7 +18,7 @@ exports[`KinoGer handle imdb blood and sinners 1`] = ` "meta": { "countryCode": "de", "height": 720, - "title": "Blood & Sinners (2025)", + "title": "Blood.and.Sinners.2025.mkv", }, "sourceId": "fsst_de_1", "url": "https://www.secvideo1.online/get_file/16/801a42b7ac11f7e08101fe8c3cb5370470f5f91590/900000/900576/900576_720p.mp4/", @@ -28,7 +28,7 @@ exports[`KinoGer handle imdb blood and sinners 1`] = ` "meta": { "countryCode": "de", "height": 1080, - "title": "Blood & Sinners (2025)", + "title": "Blood.and.Sinners.2025.mkv", }, "sourceId": "fsst_de_2", "url": "https://www.secvideo1.online/get_file/16/fae180e05d8d7af50fff44c7a24232b522db464935/900000/900576/900576.mp4/", @@ -101,7 +101,7 @@ exports[`KinoGer handle imdb dead city s2e6 1`] = ` "meta": { "countryCode": "de", "height": 360, - "title": "The Walking Dead: Dead City 2x6", + "title": "the.walking.dead.dead.city.s02e06.german.dl.1080p.web.x264-wvf.mkv", }, "sourceId": "fsst_de_0", "url": "https://www.secvideo1.online/get_file/9/99510c9abde68b5e82b08cd239172405b06f84c9e5/901000/901994/901994_360p.mp4/", @@ -111,7 +111,7 @@ exports[`KinoGer handle imdb dead city s2e6 1`] = ` "meta": { "countryCode": "de", "height": 720, - "title": "The Walking Dead: Dead City 2x6", + "title": "the.walking.dead.dead.city.s02e06.german.dl.1080p.web.x264-wvf.mkv", }, "sourceId": "fsst_de_1", "url": "https://www.secvideo1.online/get_file/9/868ae0229e543e7a9a6f7cf4b3df88f460a1bfc444/901000/901994/901994_720p.mp4/", @@ -121,7 +121,7 @@ exports[`KinoGer handle imdb dead city s2e6 1`] = ` "meta": { "countryCode": "de", "height": 1080, - "title": "The Walking Dead: Dead City 2x6", + "title": "the.walking.dead.dead.city.s02e06.german.dl.1080p.web.x264-wvf.mkv", }, "sourceId": "fsst_de_2", "url": "https://www.secvideo1.online/get_file/9/44ff1bf6024db32840054f00029afb114120b91353/901000/901994/901994.mp4/", @@ -152,7 +152,7 @@ exports[`KinoGer handle no fsst via brokeback mountain 1`] = ` "label": "DoodStream", "meta": { "countryCode": "de", - "title": "Brokeback Mountain (2005)", + "title": "Brokeback Mountain 2005", }, "requestHeaders": { "Referer": "http://dood.to/",