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.

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

Various/Add New Romero Sites, Fix Kink SceneID Search and Fix Actor from AE #1875

Merged
merged 4 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions Contents/Code/PAdatabaseActors.py
Original file line number Diff line number Diff line change
Expand Up @@ -6066,6 +6066,9 @@
68: { # Mofos
'Krystal Banks': ['Krystal'],
},
69: { # Adult Empire
'Ice La Fox': ['Ice LaFox'],
},
}

ActorsStudioIndexes = {
Expand Down Expand Up @@ -6138,6 +6141,7 @@
66: ['SexMex'],
67: ['Data18'],
68: ['Mofos'],
69: ['Adult Empire'],
}


Expand Down
4 changes: 3 additions & 1 deletion Contents/Code/PAsiteList.py
Original file line number Diff line number Diff line change
Expand Up @@ -1888,6 +1888,8 @@
1794: ('Vouyer Media', 'https://vouyermedia.com', '/MemberSceneSearch?q='),
1795: ('West Coast Productions', 'https://westcoastproductions.com', '/MemberSceneSearch?q='),
1796: ('Whorecraft VR', 'https://whorecraftvr.com', '/MemberSceneSearch?q='),
1797: ('Freeze', 'https://freeze.xxx', '/?s='),
1798: ('Plants vs Cunts', 'https://plantsvscunts.com', '/?s='),
}

abbreviations = (
Expand Down Expand Up @@ -2812,7 +2814,7 @@ def getProviderFromSiteNum(siteNum):
provider = networkGammaEntOther

# Romero Multimedia
elif (895 <= siteNum <= 896) or (1594 <= siteNum <= 1596):
elif (895 <= siteNum <= 896) or (1594 <= siteNum <= 1596) or (1797 <= siteNum <= 1798):
provider = networkRomero

# XVirtual
Expand Down
4 changes: 2 additions & 2 deletions Contents/Code/networkKink.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ def search(results, lang, siteNum, searchData):
req = PAutils.HTTPRequest(sceneURL, headers={'Cookie': 'viewing-preferences=straight%2Cgay'})
detailsPageElements = HTML.ElementFromString(req.text)

titleNoFormatting = detailsPageElements.xpath('//h1[@class="shoot-title"]')[0].text_content().strip()[:-1]
releaseDate = parse(detailsPageElements.xpath('//span[@class="shoot-date"]')[0].text_content().strip()).strftime('%Y-%m-%d')
titleNoFormatting = PAutils.parseTitle(detailsPageElements.xpath('//h1[contains(@class, "fs-0")]')[0].text_content().strip(), siteNum)
releaseDate = parse(detailsPageElements.xpath('//div[contains(@class, "shoot-detail-legend")]//span[@class="text-muted ms-2"]')[0].text_content()).strftime('%Y-%m-%d')
curID = PAutils.Encode(sceneURL)

results.Append(MetadataSearchResult(id='%s|%d' % (curID, siteNum), name='[%s] %s [%s] %s' % (shootID, titleNoFormatting, PAsearchSites.getSearchSiteName(siteNum), releaseDate), score=100, lang=lang))
Expand Down
9 changes: 6 additions & 3 deletions Contents/Code/networkRomero.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,14 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art):
detailsPageElements = HTML.ElementFromString(req.text)

# Title
metadata.title = PAutils.parseTitle(detailsPageElements.xpath('//meta[@itemprop="name"]/@content|//h1/text()')[0].split('|')[0].strip(), siteNum)
metadata.title = PAutils.parseTitle(detailsPageElements.xpath('//meta[@itemprop="name"]/@content|//h1/text()')[0].split('|')[0].split('- Free Video')[0].strip(), siteNum)

# Summary
summary = ''
paragraphs = detailsPageElements.xpath('//div[@class="cont"]/p|//div[@class="cont"]//div[@id="fullstory"]/p|//div[@class="zapdesc"]//div[not(contains(., "Including"))][.//br]')
if (1797 <= siteNum <= 1798):
paragraphs = detailsPageElements.xpath('//div[@id="fullstory"]/p')
else:
paragraphs = detailsPageElements.xpath('//div[@class="cont"]/p|//div[@class="cont"]//div[@id="fullstory"]/p|//div[@class="zapdesc"]//div[not(contains(., "Including"))][.//br]')
for paragraph in paragraphs:
text = paragraph.text_content().strip()
if text and not text == '\xc2\xa0':
Expand Down Expand Up @@ -85,7 +88,7 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art):
movieGenres.addGenre(genreName)

# Actor(s)
for actorLink in detailsPageElements.xpath('//div[contains(@class, "inner")]//div[contains(@class, "tagsmodels")]/a'):
for actorLink in detailsPageElements.xpath('//div[contains(@class, "tagsmodels")][./img[@alt="model icon"]]//a'):
actorName = actorLink.text_content().strip()
actorPhotoURL = ''

Expand Down
2 changes: 2 additions & 0 deletions docs/sitelist.md
Original file line number Diff line number Diff line change
Expand Up @@ -1304,9 +1304,11 @@ If you're having difficulty finding the SceneID, double-check [PAsiteList.py](..
+ #### Romero Multimedia Network | ✓
- Deafeated XXX
- Defeated Sex Fight
- Freeze
- Futanari XXX
- Hentaied
- Parasited
- Plants vs Cunts
+ #### SapphiX Network | Matching type: ✅
- Fist Flush
- Give Me Pink
Expand Down
Loading