Skip to content

Commit 3b3c25d

Browse files
author
4c0d3r
committed
Deal with large casts in movies/scenes
1 parent 4c7c5a0 commit 3b3c25d

File tree

7 files changed

+25180
-75
lines changed

7 files changed

+25180
-75
lines changed

‎namer/metadataapi.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,12 @@ def __evaluate_match(name_parts: FileNameParts, looked_up: LookedUpFileInfo, nam
7373
result: Tuple[str, float] = ('', 0.0)
7474

7575
# Full Name
76-
all_performers = list(map(lambda p: p.name, looked_up.performers))
76+
# Deal with some movies having 50+ performers by throwing performer info away for essamble casts :D
77+
performers = looked_up.performers
78+
if len(looked_up.performers) > 6:
79+
performers = []
80+
81+
all_performers = list(map(lambda p: p.name, performers))
7782
if looked_up.name:
7883
all_performers.insert(0, looked_up.name)
7984

@@ -83,7 +88,7 @@ def __evaluate_match(name_parts: FileNameParts, looked_up: LookedUpFileInfo, nam
8388

8489
# First Name Powerset.
8590
if result and result[1] < 89.9:
86-
all_performers = list(map(lambda p: p.name.split(" ")[0], looked_up.performers))
91+
all_performers = list(map(lambda p: p.name.split(" ")[0], performers))
8792
if looked_up.name:
8893
all_performers.insert(0, looked_up.name)
8994
result = __attempt_better_match(result, name_parts.name, all_performers, namer_config)

‎test/dc.json‎

Lines changed: 31 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,35 @@
77
"type": "Scene",
88
"slug": "dorcel-club-peeping-tom",
99
"external_id": "85289",
10-
"description": "After seeing a couple kissing in a parking lot, Bella decides to use her virtual reality mask again. This time she is not an actress, but watches a scene in which the couple of this morning, Aya and Ryan Benetti accompanied by Megane give each other a lot of pleasure. This mask is definitely very useful...",
10+
"description": "After seeing a couple kissing in a parking lot, Bella decides to use her virtual reality mask again. This time she is not an actress, but watches a scene in which the couple of this morning, Aya an...",
1111
"site_id": 204,
1212
"date": "2021-12-23",
1313
"url": "https://dorcelclub.com/en/scene/85289/peeping-tom",
14-
"image": "https://public16-content.dorcelclub.com/pics/scene/52/89/85289_1_scenedefaultsoft_1_773_515_crop_6761f0e7.jpg",
15-
"poster": "https://thumb.metadataapi.net/0mik61ikWmugsBC-u4d_LNuranE=/1000x1500/smart/filters:sharpen():upscale():watermark(https%3A%2F%2Fcdn.metadataapi.net%2Fsites%2F15%2Fe1%2Fac%2Fe028ae39fdc24d6d0fed4ecf14e53ae%2Flogo%2Fdorcelclub-logo.png,-10,-10,25,50)/https%3A%2F%2Fcdn.metadataapi.net%2Fscene%2F1c%2F80%2F69%2F5315d74a81f27e7adb890f68bf54cc6%2Fbackground%2Fbg-dorcel-club-peeping-tom.png",
14+
"image": "https://public16-content.dorcelclub.com/pics/scene/52/89/85289_1_scenedefaultsoft_1_767_511_crop_26fb3ff7.jpg",
15+
"poster": "https://thumb.metadataapi.net/hob2CMnysuye_4aua1iP_Rg9aEY=/1000x1500/smart/filters:sharpen():upscale():watermark(https%3A%2F%2Fcdn.metadataapi.net%2Fsites%2F15%2Fe1%2Fac%2Fe028ae39fdc24d6d0fed4ecf14e53ae%2Flogo%2Fdorcelclub-logo.png,-10,-10,25,50)/https%3A%2F%2Fcdn.metadataapi.net%2Fscene%2Fef%2Fe6%2F22%2Fc15bb4f089ee76cc7aca45c503aaf66%2Fbackground%2Fbg-dorcel-club-peeping-tom.webp",
1616
"trailer": null,
17-
"duration": null,
17+
"duration": 2303,
1818
"format": null,
1919
"sku": null,
2020
"posters": {
21-
"large": "https://thumb.metadataapi.net/0mik61ikWmugsBC-u4d_LNuranE=/1000x1500/smart/filters:sharpen():upscale():watermark(https%3A%2F%2Fcdn.metadataapi.net%2Fsites%2F15%2Fe1%2Fac%2Fe028ae39fdc24d6d0fed4ecf14e53ae%2Flogo%2Fdorcelclub-logo.png,-10,-10,25,50)/https%3A%2F%2Fcdn.metadataapi.net%2Fscene%2F1c%2F80%2F69%2F5315d74a81f27e7adb890f68bf54cc6%2Fbackground%2Fbg-dorcel-club-peeping-tom.png",
22-
"medium": "https://thumb.metadataapi.net/fXt9F-Wlp8Tlyc412nsbKuS039w=/750x1250/smart/filters:sharpen():upscale():watermark(https%3A%2F%2Fcdn.metadataapi.net%2Fsites%2F15%2Fe1%2Fac%2Fe028ae39fdc24d6d0fed4ecf14e53ae%2Flogo%2Fdorcelclub-logo.png,-10,-10,25,50)/https%3A%2F%2Fcdn.metadataapi.net%2Fscene%2F1c%2F80%2F69%2F5315d74a81f27e7adb890f68bf54cc6%2Fbackground%2Fbg-dorcel-club-peeping-tom.png",
23-
"small": "https://thumb.metadataapi.net/oYxzt5tByNPhwgvWRdkVe4dEMqs=/500x750/smart/filters:sharpen():upscale():watermark(https%3A%2F%2Fcdn.metadataapi.net%2Fsites%2F15%2Fe1%2Fac%2Fe028ae39fdc24d6d0fed4ecf14e53ae%2Flogo%2Fdorcelclub-logo.png,-10,-10,25,50)/https%3A%2F%2Fcdn.metadataapi.net%2Fscene%2F1c%2F80%2F69%2F5315d74a81f27e7adb890f68bf54cc6%2Fbackground%2Fbg-dorcel-club-peeping-tom.png"
21+
"large": "https://thumb.metadataapi.net/hob2CMnysuye_4aua1iP_Rg9aEY=/1000x1500/smart/filters:sharpen():upscale():watermark(https%3A%2F%2Fcdn.metadataapi.net%2Fsites%2F15%2Fe1%2Fac%2Fe028ae39fdc24d6d0fed4ecf14e53ae%2Flogo%2Fdorcelclub-logo.png,-10,-10,25,50)/https%3A%2F%2Fcdn.metadataapi.net%2Fscene%2Fef%2Fe6%2F22%2Fc15bb4f089ee76cc7aca45c503aaf66%2Fbackground%2Fbg-dorcel-club-peeping-tom.webp",
22+
"medium": "https://thumb.metadataapi.net/oiccto6Al3mAWkMKS2CZsEcjFsM=/750x1250/smart/filters:sharpen():upscale():watermark(https%3A%2F%2Fcdn.metadataapi.net%2Fsites%2F15%2Fe1%2Fac%2Fe028ae39fdc24d6d0fed4ecf14e53ae%2Flogo%2Fdorcelclub-logo.png,-10,-10,25,50)/https%3A%2F%2Fcdn.metadataapi.net%2Fscene%2Fef%2Fe6%2F22%2Fc15bb4f089ee76cc7aca45c503aaf66%2Fbackground%2Fbg-dorcel-club-peeping-tom.webp",
23+
"small": "https://thumb.metadataapi.net/ICjg6_j_6G-373orrK3v8t5uxJA=/500x750/smart/filters:sharpen():upscale():watermark(https%3A%2F%2Fcdn.metadataapi.net%2Fsites%2F15%2Fe1%2Fac%2Fe028ae39fdc24d6d0fed4ecf14e53ae%2Flogo%2Fdorcelclub-logo.png,-10,-10,25,50)/https%3A%2F%2Fcdn.metadataapi.net%2Fscene%2Fef%2Fe6%2F22%2Fc15bb4f089ee76cc7aca45c503aaf66%2Fbackground%2Fbg-dorcel-club-peeping-tom.webp"
2424
},
2525
"background": {
26-
"full": "https://cdn.metadataapi.net/scene/1c/80/69/5315d74a81f27e7adb890f68bf54cc6/background/bg-dorcel-club-peeping-tom.png",
27-
"large": "https://thumb.metadataapi.net/gfQArLUEgejtzwawPGgzhv1DWko=/fit-in/3000x3000/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fscene%2F1c%2F80%2F69%2F5315d74a81f27e7adb890f68bf54cc6%2Fbackground%2Fbg-dorcel-club-peeping-tom.png",
28-
"medium": "https://thumb.metadataapi.net/pDrotmmWxAbtHRtgC3gpfvc2sdE=/fit-in/1500x1500/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fscene%2F1c%2F80%2F69%2F5315d74a81f27e7adb890f68bf54cc6%2Fbackground%2Fbg-dorcel-club-peeping-tom.png",
29-
"small": "https://thumb.metadataapi.net/MW5fTbjjhzQEv8_qVtSOFtpYjsE=/fit-in/750x750/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fscene%2F1c%2F80%2F69%2F5315d74a81f27e7adb890f68bf54cc6%2Fbackground%2Fbg-dorcel-club-peeping-tom.png"
26+
"full": "https://cdn.metadataapi.net/scene/ef/e6/22/c15bb4f089ee76cc7aca45c503aaf66/background/bg-dorcel-club-peeping-tom.webp",
27+
"large": "https://thumb.metadataapi.net/Bbz3m1mbCBKB03PS1Snpi6U6zGA=/fit-in/3000x3000/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fscene%2Fef%2Fe6%2F22%2Fc15bb4f089ee76cc7aca45c503aaf66%2Fbackground%2Fbg-dorcel-club-peeping-tom.webp",
28+
"medium": "https://thumb.metadataapi.net/1inmC8XI4uVAk6gu-SwVZAQ6bpM=/fit-in/1500x1500/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fscene%2Fef%2Fe6%2F22%2Fc15bb4f089ee76cc7aca45c503aaf66%2Fbackground%2Fbg-dorcel-club-peeping-tom.webp",
29+
"small": "https://thumb.metadataapi.net/XHfghOMpNYps5UJNLKT4WwDEL6o=/fit-in/750x750/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fscene%2Fef%2Fe6%2F22%2Fc15bb4f089ee76cc7aca45c503aaf66%2Fbackground%2Fbg-dorcel-club-peeping-tom.webp"
3030
},
3131
"media": {
32-
"id": 8342629,
33-
"url": "https://thumb.metadataapi.net/gfQArLUEgejtzwawPGgzhv1DWko=/fit-in/3000x3000/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fscene%2F1c%2F80%2F69%2F5315d74a81f27e7adb890f68bf54cc6%2Fbackground%2Fbg-dorcel-club-peeping-tom.png",
34-
"size": 573755,
35-
"order": 5196283
32+
"id": 11365258,
33+
"url": "https://thumb.metadataapi.net/Bbz3m1mbCBKB03PS1Snpi6U6zGA=/fit-in/3000x3000/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fscene%2Fef%2Fe6%2F22%2Fc15bb4f089ee76cc7aca45c503aaf66%2Fbackground%2Fbg-dorcel-club-peeping-tom.webp",
34+
"size": 62682,
35+
"order": 5196300
3636
},
3737
"created": "2021-12-24",
38-
"last_updated": "2022-02-26 12:52:51",
38+
"last_updated": "2022-10-08 08:35:54",
3939
"performers": [
4040
{
4141
"id": "16f7dcdc-8af6-4180-a7d6-cb6ed0cf7108",
@@ -50,21 +50,19 @@
5050
"birthplace": null,
5151
"cupsize": null,
5252
"ethnicity": null,
53+
"eye_colour": null,
5354
"fakeboobs": false,
5455
"gender": null,
5556
"haircolor": null,
5657
"height": null,
57-
"iafd": null,
5858
"measurements": null,
5959
"nationality": null,
6060
"piercings": null,
61-
"status": null,
6261
"tattoos": null,
63-
"weight": null,
64-
"yearsactive": null
62+
"weight": null
6563
},
66-
"image": "https://thumb.metadataapi.net/Cl5J7rRXvopYPRhjtXCi9AOrACA=/1000x1500/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2Fdefault_03.png",
67-
"thumbnail": "https://thumb.metadataapi.net/CjW0_gOiw4JB0IqHd3Wnh7kHdrY=/fit-in/3000x3000/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2Fdefault_25.png",
64+
"image": "https://thumb.metadataapi.net/O63AYNU4uXHqp8ae6SFuay7kFuQ=/1000x1500/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2Fdefault_27.png",
65+
"thumbnail": "https://thumb.metadataapi.net/dr6x_7eVU4XyF_K7b3AbIVNqVrE=/fit-in/3000x3000/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2Fdefault_24.png",
6866
"parent": {
6967
"id": "2dd0e306-fb51-46e3-942a-4d3af208ad26",
7068
"_id": 139405,
@@ -99,8 +97,8 @@
9997
"freeones_id": null,
10098
"indexxx_id": null
10199
},
102-
"image": "https://thumb.metadataapi.net/mtpviPI9i5GMqvLiOF7rdcIXNSA=/1000x1500/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2Fdefault_40.png",
103-
"thumbnail": "https://thumb.metadataapi.net/MqZU9pe2mpN_fz6GQ1B--XwCxEU=/fit-in/3000x3000/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2Fdefault_31.png",
100+
"image": "https://thumb.metadataapi.net/5RnCSRgi4nvomc-qe_heRPdCpIA=/1000x1500/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2Fdefault_22.png",
101+
"thumbnail": "https://thumb.metadataapi.net/F29-QnWIvuYUJHzziBHs4Gd2bj4=/fit-in/3000x3000/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2Fdefault_17.png",
104102
"posters": []
105103
}
106104
},
@@ -117,18 +115,16 @@
117115
"birthplace": null,
118116
"cupsize": null,
119117
"ethnicity": null,
118+
"eye_colour": null,
120119
"fakeboobs": false,
121120
"gender": "Female",
122121
"haircolor": null,
123122
"height": null,
124-
"iafd": null,
125123
"measurements": null,
126124
"nationality": "French",
127125
"piercings": null,
128-
"status": null,
129126
"tattoos": null,
130-
"weight": null,
131-
"yearsactive": null
127+
"weight": null
132128
},
133129
"image": "https://thumb.metadataapi.net/87JwXyOKgTvQaZ3XxiXMDuQjb74=/1000x1500/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2Fa2%2F3a%2F17%2F0d7d32d3f6b1b4296fb9f33a0e42474%2Fposter%2F94a2cad9524d82bb9120939c128de57cccf689f5",
134130
"thumbnail": "https://thumb.metadataapi.net/exaGe7rU95qg6fu1t1OxxmW5e8I=/fit-in/3000x3000/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2Fa2%2F3a%2F17%2F0d7d32d3f6b1b4296fb9f33a0e42474%2Fposter%2F94a2cad9524d82bb9120939c128de57cccf689f5",
@@ -215,18 +211,16 @@
215211
"birthplace": null,
216212
"cupsize": null,
217213
"ethnicity": null,
218-
"fakeboobs": false,
214+
"eye_colour": null,
215+
"fakeboobs": null,
219216
"gender": "Female",
220217
"haircolor": null,
221218
"height": null,
222-
"iafd": null,
223219
"measurements": null,
224220
"nationality": "French",
225221
"piercings": null,
226-
"status": null,
227222
"tattoos": null,
228-
"weight": null,
229-
"yearsactive": null
223+
"weight": null
230224
},
231225
"image": "https://thumb.metadataapi.net/Yo_0iGZT_huaKj1RRtaIEfJDc8Y=/1000x1500/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2F0c%2Fc7%2F9f%2F698de757057afb49f9c0ee65b058796%2Fposter%2Fbella-tina.jpg",
232226
"thumbnail": "https://thumb.metadataapi.net/zU4HV-dyWq-83wpwUHVFehYzKgk=/fit-in/3000x3000/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2F0c%2Fc7%2F9f%2F698de757057afb49f9c0ee65b058796%2Fposter%2Fbella-tina.jpg",
@@ -313,18 +307,16 @@
313307
"birthplace": null,
314308
"cupsize": null,
315309
"ethnicity": null,
316-
"fakeboobs": false,
310+
"eye_colour": null,
311+
"fakeboobs": null,
317312
"gender": "Female",
318313
"haircolor": null,
319314
"height": null,
320-
"iafd": null,
321315
"measurements": null,
322316
"nationality": "French",
323317
"piercings": null,
324-
"status": null,
325318
"tattoos": null,
326-
"weight": null,
327-
"yearsactive": null
319+
"weight": null
328320
},
329321
"image": "https://thumb.metadataapi.net/24YJGB9gOAPOwh2znTOtGUp6QVQ=/1000x1500/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2F26%2Fd5%2Fc2%2F51fe73278d8742aa2a93f59146ea41c%2Fposter%2F08a6cb671005d4e6d7f76cd536b5ef61762487e3",
330322
"thumbnail": "https://thumb.metadataapi.net/MnklmQzOF40QF905_TsYV3RNbGM=/fit-in/3000x3000/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2F26%2Fd5%2Fc2%2F51fe73278d8742aa2a93f59146ea41c%2Fposter%2F08a6cb671005d4e6d7f76cd536b5ef61762487e3",
@@ -465,7 +457,7 @@
465457
}
466458
],
467459
"path": "https://api.metadataapi.net/scenes",
468-
"per_page": 25,
460+
"per_page": 15,
469461
"to": 1,
470462
"total": 1
471463
}

‎test/ea.full.json‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,16 @@
4949
"birthplace": null,
5050
"cupsize": null,
5151
"ethnicity": null,
52+
"eye_colour": null,
5253
"fakeboobs": false,
5354
"gender": null,
5455
"haircolor": null,
5556
"height": null,
56-
"iafd": null,
5757
"measurements": null,
5858
"nationality": null,
5959
"piercings": null,
60-
"status": null,
6160
"tattoos": null,
62-
"weight": null,
63-
"yearsactive": null
61+
"weight": null
6462
},
6563
"image": "https://thumb.metadataapi.net/flLf1pecTlKcpJCki30l5iWXNdQ=/1000x1500/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2F3e%2Fb6%2F0a%2F9a33557155b8a6f3e6c88bee8ed65a6%2Fposter%2F6a00376cbee2aa83c8c2514b89b332276df42c35",
6664
"thumbnail": "https://thumb.metadataapi.net/5caXoJzd3dWcZUZahpe7SHlLFco=/fit-in/3000x3000/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2F3e%2Fb6%2F0a%2F9a33557155b8a6f3e6c88bee8ed65a6%2Fposter%2F6a00376cbee2aa83c8c2514b89b332276df42c35",
@@ -201,18 +199,16 @@
201199
"birthplace": null,
202200
"cupsize": null,
203201
"ethnicity": null,
202+
"eye_colour": null,
204203
"fakeboobs": false,
205204
"gender": null,
206205
"haircolor": null,
207206
"height": null,
208-
"iafd": null,
209207
"measurements": null,
210208
"nationality": null,
211209
"piercings": null,
212-
"status": null,
213210
"tattoos": null,
214-
"weight": null,
215-
"yearsactive": null
211+
"weight": null
216212
},
217213
"image": "https://thumb.metadataapi.net/r8g92zymZ6SduikMTwcXMojRxik=/1000x1500/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2F71%2F51%2Fdc%2F4b09a05007ba30c041e474c2b398a51%2Fposter%2Ffrancesca-le.png",
218214
"thumbnail": "https://thumb.metadataapi.net/58u56g8EUhkx0cEIhhW1QoxFAx4=/fit-in/3000x3000/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2F71%2F51%2Fdc%2F4b09a05007ba30c041e474c2b398a51%2Fposter%2Ffrancesca-le.png",
@@ -413,18 +409,16 @@
413409
"birthplace": null,
414410
"cupsize": null,
415411
"ethnicity": null,
412+
"eye_colour": null,
416413
"fakeboobs": false,
417414
"gender": "Male",
418415
"haircolor": null,
419416
"height": null,
420-
"iafd": null,
421417
"measurements": null,
422418
"nationality": null,
423419
"piercings": null,
424-
"status": null,
425420
"tattoos": null,
426-
"weight": null,
427-
"yearsactive": null
421+
"weight": null
428422
},
429423
"image": "https://thumb.metadataapi.net/EIsvo6fVYUuLzp6bO8I0LYUdZmI=/1000x1500/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2F9d%2Fd5%2F61%2F11eb0285e2534a949839a1a5573be08%2Fposter%2F0955f0ee0c6500c8e17f8dd3cf1a019b6f4d3d3e",
430424
"thumbnail": "https://thumb.metadataapi.net/laB78FtoA1km0QuYfmitmZiKNt4=/fit-in/3000x3000/smart/filters:sharpen():upscale()/https%3A%2F%2Fcdn.metadataapi.net%2Fperformer%2F9d%2Fd5%2F61%2F11eb0285e2534a949839a1a5573be08%2Fposter%2F0955f0ee0c6500c8e17f8dd3cf1a019b6f4d3d3e",

0 commit comments

Comments
 (0)