Merge pull request #1875 from diamondpete/siteupdates

Various/Add New Romero Sites, Fix Kink SceneID Search and Fix Actor from AE
PAhelper · Jan 30, 2024 · ffc5901 · ffc5901
2 parents 9c15727 + de6ec59
commit ffc5901
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/Contents/Code/PAdatabaseActors.py b/Contents/Code/PAdatabaseActors.py
@@ -6068,6 +6068,9 @@
     68: {  # Mofos
         'Krystal Banks': ['Krystal'],
     },
+    69: {  # Adult Empire
+        'Ice La Fox': ['Ice LaFox'],
+    },
 }
 
 ActorsStudioIndexes = {
@@ -6140,6 +6143,7 @@
     66: ['SexMex'],
     67: ['Data18'],
     68: ['Mofos'],
+    69: ['Adult Empire'],
 }
 
 

diff --git a/Contents/Code/PAsiteList.py b/Contents/Code/PAsiteList.py
@@ -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 = (
@@ -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

diff --git a/Contents/Code/networkKink.py b/Contents/Code/networkKink.py
@@ -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))

diff --git a/Contents/Code/networkRomero.py b/Contents/Code/networkRomero.py
@@ -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':
@@ -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 = ''
 

diff --git a/docs/sitelist.md b/docs/sitelist.md
@@ -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