Various Changes - New Sites/Cleanup

Contents/Code/PAdatabaseActors.py

@@ -1534,6 +1534,7 @@
         'Jennifer Stone': ['Jeniffer Stone'],
         'Mishelle Klein': ['Molly'],
         'Sapphire Blue': ['Sapphire'],
+        'Siri Dahl': ['Siri'],
     },
     22: {  # Reality Kings
         'Agness Miller': ['Agness'],
@@ -5587,8 +5588,13 @@
         'Rose Winters': ['Rose'],
     },
     56: {  # Score Group
+        'Bess Breast': ['Bess'],
+        'Gracie Gates': ['Gracie'],
+        'Leana Lovings': ['Leana'],
         'Luna Fae': ['Luna'],
         'Mella Megan': ['Mella'],
+        'Reese Robbins': ['Reese'],
+        'Siri Dahl': ['Siri'],
     },
     57: {  # Desperate Amateurs
         'Stephie Staar': ['Stephie'],

Contents/Code/PAsiteList.py

@@ -1837,6 +1837,10 @@
     1741: ('Colette', 'https://www.colette.com', '/videos/'),
     1742: ('SINematica', 'https://sinematica.com', '/Scene/MemberSearch?q='),
     1743: ('Work Me Harder', 'https://www.realitykings.com', 'https://site-api.project1service.com'),
+    1744: ('ScoreVideos', 'https://www.scorevideos.com', '/porn-videos/'),
+    1745: ('Bush', 'https://www.cherrypimps.com', '/search.php?query='),
+    1746: ('Ginger', 'https://www.cherrypimps.com', '/search.php?query='),
+    1747: ('Divine-DD', 'https://www.divine-dd.com', '/search/'),
 }
 
 abbreviations = (
@@ -1899,6 +1903,15 @@
     ('^clip ', 'AnalVids '),
     ('^clubseventeen ', 'ClubSweethearts '),
     ('^cps ', 'CherryPimps '),
+    ('^cpbush ', 'Bush '),
+    ('^cpbusted ', 'Busted '),
+    ('^cpcheese ', 'Cheese.XXX '),
+    ('^cpconfessions ', 'Confessions.XXX '),
+    ('^cpcucked ', 'Cucked.XXX '),
+    ('^cpfresh ', 'Fresh '),
+    ('^cpginger ', 'Ginger '),
+    ('^cppetite ', 'Petite.XXX '),
+    ('^cptaboo ', 'Taboo '),
     ('^css ', 'CzechStreets '),
     ('^cuf ', 'CumFiesta '),
     ('^cws ', 'CzechWifeSwap '),
@@ -1912,6 +1925,7 @@
     ('^dm ', 'DirtyMasseur '),
     ('^dnj ', 'DaneJones '),
     ('^dpg ', 'DigitalPlayground '),
+    ('^drilled ', 'Drilled.XXX '),
     ('^ds ', 'ScrewMeToo '),
     ('^dsw ', 'DaughterSwap '),
     ('^dwc ', 'DirtyWivesClub '),
@@ -2600,7 +2614,7 @@ def getProviderFromSiteNum(siteNum):
             provider = networkIntersec
 
         # Cherry Pimps
-        elif (783 <= siteNum <= 792) or (1052 <= siteNum <= 1056):
+        elif (783 <= siteNum <= 792) or (1052 <= siteNum <= 1056) or (1745 <= siteNum <= 1746):
             provider = networkCherryPimps
 
         # Wicked
@@ -2900,7 +2914,7 @@ def getProviderFromSiteNum(siteNum):
             provider = siteWoodmanCastingX
 
         # ScoreGroup
-        elif (1012 <= siteNum <= 1021) or (1344 <= siteNum <= 1345):
+        elif (1012 <= siteNum <= 1021) or (1344 <= siteNum <= 1345) or siteNum == 1744:
             provider = networkScoreGroup
 
         # TwoTGirls
@@ -3167,7 +3181,7 @@ def getProviderFromSiteNum(siteNum):
             provider = siteJAVDatabase
 
         # Radical Cash
-        elif (1675 <= siteNum <= 1685):
+        elif (1675 <= siteNum <= 1685) or siteNum == 1747:
             provider = networkRadicalCash
 
         # Teeny Taboo

Contents/Code/network1service.py

@@ -48,7 +48,7 @@ def search(results, lang, siteNum, searchData):
         if req:
             searchResults = req.json()['result']
             for searchResult in searchResults:
-                titleNoFormatting = searchResult['title'].replace('�', '\'')
+                titleNoFormatting = PAutils.parseTitle(searchResult['title'].replace('�', '\''), siteNum)
                 releaseDate = parse(searchResult['dateReleased']).strftime('%Y-%m-%d')
                 curID = searchResult['id']
                 siteName = searchResult['brand'].title()

Contents/Code/networkCherryPimps.py

@@ -9,7 +9,7 @@ def search(results, lang, siteNum, searchData):
         req = PAutils.HTTPRequest(url)
         searchResults = HTML.ElementFromString(req.text)
         for searchResult in searchResults.xpath('//div[contains(@class, "video-thumb") or contains(@class, "item-video")]'):
-            titleNoFormatting = searchResult.xpath('(.//p[@class="text-thumb"] | .//div[@class="item-title"])/a')[0].text_content().strip()
+            titleNoFormatting = PAutils.parseTitle(searchResult.xpath('(.//p[@class="text-thumb"] | .//div[@class="item-title"])/a')[0].text_content().strip(), siteNum)
             curID = PAutils.Encode(searchResult.xpath('(.//p[@class="text-thumb"] | .//div[@class="item-title"])/a/@href')[0])
             subSite = searchResult.xpath('.//p[@class="text-thumb"]/a[@class="badge"] | .//div[@class="item-sitename"]/a')[0].text_content().strip()
 
@@ -42,7 +42,7 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art):
     detailsPageElements = HTML.ElementFromString(req.text)
 
     # Title
-    metadata.title = detailsPageElements.xpath('//*[@class="trailer-block_title"] | //h1')[0].text_content().strip()
+    metadata.title = PAutils.parseTitle(detailsPageElements.xpath('//*[@class="trailer-block_title"] | //h1')[0].text_content().strip(), siteNum)
 
     # Summary
     metadata.summary = detailsPageElements.xpath('//div[@class="info-block"]//p[@class="text"] | //div[@class="update-info-block"]//p')[0].text_content().strip()

Contents/Code/networkPornWorld.py

@@ -50,7 +50,7 @@ def search(results, lang, siteNum, searchData):
             dateNotFound = False
             for searchResult in searchResults.xpath("//div[contains(concat(' ',normalize-space(@class),' '),' card-scene ')]"):
 
-                titleNoFormatting = searchResult.xpath(".//div[@class='card-scene__text']/a")[0].text_content().strip()
+                titleNoFormatting = PAutils.parseTitle(searchResult.xpath(".//div[@class='card-scene__text']/a")[0].text_content().strip(), siteNum)
                 sceneDate = searchResult.xpath('.//div[@class="label label--time"]')[1].text_content().strip()
                 sceneDateObj = dateFromIso(sceneDate)
 
@@ -71,12 +71,9 @@ def search(results, lang, siteNum, searchData):
                         # take off some points if we don't match the title search params
                         score = score - Util.LevenshteinDistance(searchData.title.lower(), titleNoFormatting.lower())
 
-                    Log('Scene: %s %s (%s%%)' % (sceneDate, titleNoFormatting, score))
+                    # Log('Scene: %s %s (%s%%)' % (sceneDate, titleNoFormatting, score))
 
-                    # scene names can be obscure so output the date too
-                    name = '%s %s' % (sceneDate, titleNoFormatting)
-
-                    results.Append(MetadataSearchResult(id='%s|%d' % (curID, siteNum), name=name, score=score, lang=lang))
+                    results.Append(MetadataSearchResult(id='%s|%d' % (curID, siteNum), name='%s [%s] %s' % (titleNoFormatting, PAsearchSites.getSearchSiteName(siteNum), sceneDate), score=score, lang=lang))
 
         # if we have a date, there's a far better chance of a decent match than the title search, so get out now
         return results
@@ -93,7 +90,7 @@ def search(results, lang, siteNum, searchData):
         detailsPageElements = HTML.ElementFromString(req.text)
 
         curID = PAutils.Encode(url)
-        titleNoFormatting = getTitle(detailsPageElements)
+        titleNoFormatting = getTitle(detailsPageElements, siteNum)
 
         results.Append(MetadataSearchResult(id='%s|%d' % (curID, siteNum), name=titleNoFormatting, score=100, lang=lang))
 
@@ -105,7 +102,7 @@ def search(results, lang, siteNum, searchData):
 
         if not searchResults.xpath('//h1[contains(@class, "section__title")]'):
             # if there is only one result returned by the search function it automatically redirects to the video page
-            titleNoFormatting = getTitle(searchResults)
+            titleNoFormatting = getTitle(searchResults, siteNum)
 
             url = searchResults.xpath('//a[contains(@class, "__pagination_button--more")]/@href')[0]
             curID = PAutils.Encode(url)
@@ -141,7 +138,7 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art):
     detailsPageElements = HTML.ElementFromString(req.text)
 
     # Title
-    metadata.title = getTitle(detailsPageElements)
+    metadata.title = getTitle(detailsPageElements, siteNum)
 
     # Summary
     description = detailsPageElements.xpath('//div[text()="Description:"]/following-sibling::div')
@@ -204,7 +201,7 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art):
     return metadata
 
 
-def getTitle(htmlElements):
-    titleNoFormatting = htmlElements.xpath('//title')[0].text_content().strip()
+def getTitle(htmlElements, siteNum):
+    titleNoFormatting = PAutils.parseTitle(htmlElements.xpath('//title')[0].text_content().strip(), siteNum)
 
     return re.sub(r' - PornWorld$', '', titleNoFormatting)

docs/sitelist.md

@@ -333,6 +333,7 @@ If you're having difficulty finding the SceneID, double-check [PAsiteList.py](..
   - BCM.XXX
   - Britney Amber
   - Busted
+  - Bush
   - Cheese.XXX
   - Cherry Pimps
   - Cherry Spot
@@ -341,6 +342,7 @@ If you're having difficulty finding the SceneID, double-check [PAsiteList.py](..
   - Drilled.XXX
   - Femme
   - Fresh
+  - Ginger
   - Petite.XXX
   - Taboo (formerly Family.XXX)
   - Wild on Cam
@@ -424,17 +426,18 @@ If you're having difficulty finding the SceneID, double-check [PAsiteList.py](..
   - Scenes
   - Movies
   - Movie Scene
-+ #### DDFNetwork | ✅
++ #### PornWorld | ✅
   - Cherry Jul
   - DDF Babes
   - DDF Hardcore
   - DDF Network VR
   - DDF Xtreme
   - Eve Angel Official
   - Hairy Twatter
+  - PornWorld
   - Sandy's Fantasies
   - Sex Video Casting
-+ #### DDFNetwork Other Sites | ✅
++ #### PornWorld Other Sites | ✅
   - 1By-Day
   - DDF Busty
   - Euro Girls on Girls
@@ -1189,6 +1192,7 @@ If you're having difficulty finding the SceneID, double-check [PAsiteList.py](..
   - Benefit Monkey
   - BJRAW
   - ComeInside - **Actor Name Only**
+  - Divine-DD
   - GotFilled
   - Inserted
   - JAV888
@@ -1503,6 +1507,7 @@ If you're having difficulty finding the SceneID, double-check [PAsiteList.py](..
   - Porn Mega Load
   - Scoreland
   - Scoreland2
+  - ScoreVideos
   - XL Girls
 + #### Thick Cash Network | ✅ - **Actor only, Date Add**
   - Ebony Tugs