Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ManyVids, Bang Actors and Update Actor DB #1845

Merged
merged 3 commits into from
Sep 27, 2023
Merged

Fix ManyVids, Bang Actors and Update Actor DB #1845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
555df92
Fix ManyVids
diamondpete Sep 26, 2023
ece2243
Skip Placeholder Images on Bang
diamondpete Sep 26, 2023
7a45785
Add Actor Names to DB
diamondpete Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions Contents/Code/PAdatabaseActors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,21 @@
'Avril Sun': ['Avril May', 'Candy Love'],
'Baby Kxtten': ['Baby Kitten', 'Bxby Kitten'],
'Bad Viksi': ['Viksi', 'Viksi Q'],
'Barbie Brill': ['Brill Barbie'],
'Barra Brass': ['Barra'],
'Big Dick Fred': ['Mandingo', 'Curtis', 'Fred Dingo', 'Fred Foolish'],
'Billie Star': ['Billy Star', 'Katia', 'Petra'],
'Black Angelika': ['Angelika Black', 'Black Angelica'],
'Bonny Bon': ['Bonni Bone', 'Bonnie Bond', 'Bonny Bo', 'Bony Bo', 'Bonnie Bon', 'Bonny Bone', 'Bonnie Bunny'],
'Briana Banderas': ['Briana Moon'],
'Brianna Rose': ['Jessa', 'Jessa Brianna', 'Jessa Brianne', 'Jessa Rose', 'SexyNerdBri'],
'Big Dick Fred': ['Mandingo', 'Curtis', 'Fred Dingo', 'Fred Foolish'],
'Brickzilla': ['Brickzilla 📏➕☝🏾'],
'Bridgette B': ['Bridgette B.'],
'Britney Angel': ['Brytnie'],
'Britney Beth': ['Bibi Jones', 'Bibi Jones™'],
'Brooke Lee Adams': ['Zeba'],
'Bunny Colby': ['Nadya Nabakova', 'Nadya Nabokova'],
'Bruno Dickems': ['Bruno Dickemz', 'Bruno Dickenz', 'Bruno Dickens'],
'Bunny Colby': ['Nadya Nabakova', 'Nadya Nabokova'],
'Cage Jordi': ['Cage', 'Cage Nickels', 'Eanil Broia', 'John Kaiser', 'Kamil Broza', 'Kamil Skála', 'Kan Hard'],
'Cail Brodevski': ['Cail', 'Dima', 'Deemam', 'Dorian', 'Cail Aka Dorian'],
'Candie Luciani': ['Candice Luciani', 'Candie Toydoll'],
Expand All @@ -69,9 +71,10 @@
'CJ Miles': ['Cj Miles', 'C.J. Miles'],
'Clea Gaultier': ['CléA Gaultier'],
'Clockwork Victoria': ['Clockwork Viktoria', 'Viktoria Clockwork', 'Victory Clockwork'],
'Coco Lovelock': ['Coco Lovecock'],
'Connie Carter': ['Connie', 'Conny', 'Conny Carter', 'Josephine'],
'Cyrstal Rae': ['Crystal Rae', 'Crystal Ray', 'Chrysal Ray'],
'Connie Garcia': ['Connie García', 'Connie GarcíA'],
'Cyrstal Rae': ['Crystal Rae', 'Crystal Ray', 'Chrysal Ray'],
'Dahlia Sky': ['Amber Rose', 'Bailey Blue', 'Dahlia Skye'],
'Dana Sofia': ['Dana SofíA'],
'Darcie Belle': ['Darcie Bell'],
Expand All @@ -97,8 +100,8 @@
'Eva Elfie': ['Lady Jay', 'Tieny Mieny', 'Tiny Teen', 'Tiny Teen / Eva Elfie', 'Aeva Elfie'],
'Eve Laurence': ['Eve Lawrence'],
'Fernanda Santori': ['Fernandasw', 'FernandaSW'],
'Foxy Di': ['Foxi Di'],
'Foxies Gold': ['Foxies'],
'Foxy Di': ['Foxi Di'],
'Francesca DiCaprio': ['Francesca Di Caprio', 'Francesca Dicaprio'],
'Franceska Jaimes': ['Sweet Sugar', 'Francesca Jaimes', 'Franceska James'],
'Freddy Salvador': ['Fredau Montes', 'Fredduy Salvador'],
Expand Down Expand Up @@ -136,16 +139,16 @@
'Jessica Foxx': ['Jessica Blue', 'Jessica Cute'],
'Jewel De\'Nyle': ['Jewel De Nyle', 'Jewel DeNyle', 'Jewel Denyle'],
'Jmac': ['J Mac', 'JMac'],
'Jojo Kiss': ['Jo Jo Kiss'],
'Johnny Bravo': ['Jhonny Bravo'],
'Jojo Kiss': ['Jo Jo Kiss'],
'Jordan Ashe': ['Jordan Ash', 'Jordan Ashley', 'Jorden Ashley'],
'Jordi El Nino Polla': ['Jordi Enp', 'Jordi El Niño Polla'],
'Josephine Jackson': ['Josephina Jackson'],
'Josh Jo': ['Josh', 'Jo Josh', 'John Syx', 'Joohn Syx', 'Josc Admiral', 'Josh Admiral', 'Josh Dean'],
'Juicy Leila': ['Sowanna', 'Victoria Skye'],
'Justanicecock': ['Justa Nicecock', 'Just A Nice Cock'],
'Kandii Kitten': ['Kandii'],
'Kagney Linn Karter': ['Kagney Lynn Karter'],
'Kandii Kitten': ['Kandii'],
'Kari Sweets': ['Kari Sweet'],
'Karina O\'Reilley': ['Karina Oreilley', 'Karina O Reilley', 'Karina O Reilly', 'Carina Roman', 'Carina Romann', 'Katrina O\'Reilly', 'Karina Roman'],
'Karlie Brooks': ['Carli (NVG Network)', 'Karli Brookes (ATK)', 'Karlie Brookes'],
Expand Down Expand Up @@ -175,13 +178,13 @@
'Lexi Anne Garza': ['Lexi Aaane', 'Lexi Anne'],
'Lia Lor': ['Brady Paige'],
'Light Fairy': ['Flora Fairy', 'Lightfairy'],
'Liona Shy': ['Juliya B', 'Leona Levi', 'Liona Levi', 'Lil Tammy'],
'Lilly Ford': ['Lilly Lit'],
'Lilu Moon': ['Lilu'],
'Lily Labeau': ['Lilly LaBeau', 'Lilly Labuea', 'Lily La Beau', 'Lily Lebeau', 'Lily Luvs'],
'Lina Arian Joy': ['Arian Joy', 'Lina Arian', 'Lina Joy'],
'Lina Love': ['Diana Wells', 'Lena Love', 'Lina Miles'],
'Linda Brugal': ['Milana Witch'],
'Liona Shy': ['Juliya B', 'Leona Levi', 'Liona Levi', 'Lil Tammy'],
'Lioness': ['Andrea Sultisz'],
'Little Caprice': ['Caprice', 'Caprice A', 'Caprice S', 'Lil Caprice', 'Lola Karups', 'Marketa'],
'Little Dragon': ['Your Little Dragon'],
Expand All @@ -192,19 +195,20 @@
'Lora Craft': ['Lara Craft'],
'Luca Ferrero': ['Luca Ferraro'],
'Lucia Denville': ['Lucia Denvile'],
'Lucie Wilde': ['Lucie Wild', 'Busty Buffy'],
'Lucy Valentine': ['Emma Wilson'],
'Luna Umberlay': ['Luna Umberley'],
'Lupe Burnett': ['Megan Vale'],
'Maddy O\'Reilly': ['Maddy O\'reilly', 'Maddy OReilly', 'Maddy Oreilly'],
'Madison Summers': ['Madison Summer'],
'May Thai': ['Mai Thai'],
'Mandy Foxxx': ['MandyFoxxx94'],
'Mariana Martix': ['Mariana Martinez', 'Mariana Martínez'],
'Marica Hase': ['Marcia Hase', 'Marica Boomer', 'Marica Haze', 'Marika Hase'],
'Marilyn Crystal': ['Marilyn Christal', 'Marylin Crystal', 'Stacey Chrystal', 'Stacy Crystal'],
'Marilyn Sugar': ['Marylin Sugar'],
'Matt Hughes': ['Daniel', 'Danny D.', 'Danny D', 'Danny Dong', 'Matt H.'],
'Matty Perez': ['Marfa Pushkin', 'Matty', 'Metty'],
'May Thai': ['Mai Thai'],
'Mayara Rodrigues': ['Mayara Rodriguez'],
'Melena Maria Rya': ['Maria Rya', 'Melena Maria'],
'Melissa Benz': ['Melisa Benz', 'Melissa Grand'],
Expand Down Expand Up @@ -267,8 +271,8 @@
'Robin Reid': ['Robin'],
'Rosa Ramirez': ['Lina C', 'Lina'],
'Rosaline Rosa': ['Rosaline Rose'],
'Ruthless Kid': ['Lil D', 'Lil D.'],
'Ruckus XXX': ['Ruckus'],
'Ruthless Kid': ['Lil D', 'Lil D.'],
'Sara Luvv': ['Sara Luv'],
'Sara Rich': ['Nina Winslet', 'Mia Park', 'Mia Parker', 'Veronica Rich', 'Liloo Von'],
'Sasha D': ['Sasha (V)', 'Sandra'],
Expand All @@ -284,8 +288,8 @@
'Shelley Bliss': ['Mia Ferrari'],
'Simon Kitty': ['Simon', 'Simon Kay'],
'Sirenita Fuentes': ['Sirenita'],
'Skylar Vox': ['Dylan Vox', 'Dylann Vox'],
'Sky Pierce': ['Skypierce', 'SkyFlyPierce', 'Skye Pierce'],
'Skylar Vox': ['Dylan Vox', 'Dylann Vox'],
'Sofi Smile': ['Sofi Smail', 'Sonia Smile', 'Sony Smile'],
'Sofia Habibi': ['SofíA Habibi'],
'Sofy Soul': ['Sofy Torn'],
Expand Down Expand Up @@ -1528,12 +1532,15 @@
'Alena H': ['Helen'],
'Alysa Gap': ['Alysa'],
'Amirah Adara': ['Amirah'],
'Chrissy Harris': ['Chrissy'],
'Foxy Di': ['Foxy D'],
'Goldie Baby': ['Ms White-Kitten'],
'Jennifer Stone': ['Jeniffer Stone'],
'Milana Vital': ['Milana'],
'Mishelle Klein': ['Molly'],
'Sapphire Blue': ['Sapphire'],
'Siri Dahl': ['Siri'],
'Sophia Traxler': ['Olivia', 'Lucy'],
},
22: { # Reality Kings
'Agness Miller': ['Agness'],
Expand Down Expand Up @@ -5590,6 +5597,8 @@
'Bess Breast': ['Bess'],
'Gracie Gates': ['Gracie'],
'Leana Lovings': ['Leana'],
'Lil Chica': ['Chica'],
'Luna Amor': ['Alexya'],
'Luna Fae': ['Luna'],
'Mella Megan': ['Mella'],
'Reese Robbins': ['Reese'],
Expand Down
6 changes: 5 additions & 1 deletion Contents/Code/networkBang.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art):
actorXPATH = '//div[contains(@class,"overflow-hidden")]//div[contains(@class, "name")]/a[contains(@href, "pornstar") and not(@aria-label)]'

for actorLink in detailsPageElements.xpath(actorXPATH):
actorPhotoURL = ''
if siteNum == 1365:
actorName = actorLink.text_content()

Expand All @@ -136,7 +137,10 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art):
actorPhotoURL = modelPageElements['image'].split('?')[0].strip()
else:
actorName = actorLink.xpath('.//span')[0].text_content()
actorPhotoURL = actorLink.xpath('../..//img/@src')[0].split('?')[0]
img = actorLink.xpath('../..//img/@src')[0].split('?')[0]

if 'placeholder' not in img:
actorPhotoURL = img

if actorName:
movieActors.addActor(actorName, actorPhotoURL)
Expand Down
28 changes: 10 additions & 18 deletions Contents/Code/siteManyvids.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ def search(results, lang, siteNum, searchData):
except:
sceneTitle = ''

req = PAutils.HTTPRequest(PAsearchSites.getSearchSearchURL(siteNum) + sceneID)
sceneURL = PAsearchSites.getSearchSearchURL(siteNum) + sceneID
req = PAutils.HTTPRequest(sceneURL)
searchResult = HTML.ElementFromString(req.text)

titleNoFormatting = searchResult.xpath('//h1[contains(@class, "title")]')[0].text_content()
curID = searchData.title.lower().replace(' ', '-')
curID = PAutils.Encode(sceneURL)
subSite = searchResult.xpath('//a[@aria-label="model-profile"]')[0].text_content().strip()
releaseDate = searchData.dateFormat() if searchData.date else ''

Expand All @@ -30,10 +31,10 @@ def search(results, lang, siteNum, searchData):
def update(metadata, lang, siteNum, movieGenres, movieActors, art):
metadata_id = metadata.id.split('|')
sceneDate = metadata_id[2]
sceneURL = PAsearchSites.getSearchSearchURL(siteNum) + metadata_id[0]
sceneURL = PAutils.Decode(metadata_id[0])
req = PAutils.HTTPRequest(sceneURL)
detailsPageElements = HTML.ElementFromString(req.text)
videoURL = 'https://video-player-bff.estore.kiwi.manyvids.com/videos/%s' % metadata_id[0].split('-')[0]
videoURL = 'https://video-player-bff.estore.kiwi.manyvids.com/videos/%s' % sceneURL.rsplit('/')[-1]
videoPageElements = PAutils.HTTPRequest(videoURL).json()

# Title
Expand All @@ -60,7 +61,7 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art):
metadata.studio = 'ManyVids'

# Tagline and Collection(s)
tagline = detailsPageElements.xpath('//a[contains(@class, "username ")]')[0].text_content().strip()
tagline = videoPageElements['model']['displayName']
metadata.tagline = tagline
metadata.collections.add(tagline)

Expand All @@ -77,23 +78,14 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art):
movieGenres.addGenre(genreName)

# Actor(s)
actorName = detailsPageElements.xpath('//a[contains(@class, "username ")]')[0].text_content()
actorPhotoURL = ''

try:
actorPhotoURL = detailsPageElements.xpath('//div[@class="pr-2"]/a/img')[0].get('src')
except:
pass
actor = videoPageElements['model']
actorName = actor['displayName']
actorPhotoURL = actor['avatar']

movieActors.addActor(actorName, actorPhotoURL)

# Posters
xpaths = [
'//div[@id="rmpPlayer"]/@data-video-screenshot'
]
for xpath in xpaths:
for poster in detailsPageElements.xpath(xpath):
art.append(poster)
art.append(videoPageElements['thumbnail'])

Log('Artwork found: %d' % len(art))
for idx, posterUrl in enumerate(art, 1):
Expand Down