Revert Naming Changes

CHANGELOG.md

@@ -141,22 +141,22 @@
 - 2019-02-08 8:00AM CST - Added other JulesJordan sites
 - 2019-02-07 10:45AM CST - Updates to Kink.com network to fix searching, clean up the Title and Summary, fix Actors, add Shoot ID search functionality
 - 2019-02-06 11:00AM CST - Added Kink.com network of sites
-- 2019-02-06 8:00AM CST - Bugfix for Joymii photo set results, added several aliases for Joymii to PAcastCrew
+- 2019-02-06 8:00AM CST - Bugfix for Joymii photo set results, added several aliases for Joymii to PAactors
 - 2019-02-05 8:00AM CST - Added subsite to Bang Bros search results
 - 2019-02-04 2:30PM CST - Joymii bugfixes to update() function after allowing photo sets in the search results
 - 2019-02-04 11:30AM CST - Moved posterAlreadyExists() function into PAsearchSites, deleted all other copies of that function throughout the code and pointed all references to it to PAsearchSites.posterAlreadyExists()
 - 2019-02-04 10:00AM CST - Added actor count Genres to all sites that have manual Genres
 - 2019-02-04 8:00AM CST - Changed Joymii search to include photo results, as most (all?) photo sets on that site also have an accompanying video, and some releases were only listed in the search results as photo sets
 - 2019-02-03 3:45PM CST - Merged Greg Lansky sites (Blacked/Tushy/Vixen/*Raw) into networkStrike3.py
 - 2019-02-01 8:30AM CST - LegalPorno bugfix, they added forum links amid their Actor lists
-- 2019-01-31 11:00AM CST - Joymii bugfixes, set delposibl's actorDBfinder() function to automatically search any actor passed into PAcastCrew that doesn't have a photo, and to search AFTER being processed by PAcastCrew name replacements
+- 2019-01-31 11:00AM CST - Joymii bugfixes, set delposibl's actorDBfinder() function to automatically search any actor passed into PAactors that doesn't have a photo, and to search AFTER being processed by PAactors name replacements
 - 2019-01-30 11:00AM CST - Added Release Date scoring anywhere I could easily (I'll get the rest as I continue to convert all the search results to common format), removed the useless variable lowerResultTitle and searchAll across the board
 - 2019-01-29 10:00AM CST - Uniformity of the releaseDate variable name across all files, removed individual PornPros files now that they're converged, cleanup of formatting on siteJoymii and networkPornPros, fix for RealityKings release date to pass it from the search function to the update function in the curID, standardized the use of siteNum instead of searchSiteID across all files that address multiple sites, adjusted a few search result formats for uniformity
-- 2019-01-27 5:15PM CST - Merged delposibl's code for additional VR sites, Joymii, another addition to PAcastCrew, consolidation of the PornPros sites, and a function to find actor photos when the site doesn't have them
+- 2019-01-27 5:15PM CST - Merged delposibl's code for additional VR sites, Joymii, another addition to PAactors, consolidation of the PornPros sites, and a function to find actor photos when the site doesn't have them
 - 2019-01-25 2:45PM CST - Spizoo bugfixes and Gamma Ent release date fix
 - 2019-01-25 8:15AM CST - Twistys search result consistency, bugfixes, and additional posters
 - 2019-01-24 1:15PM CST - Gamma Ent bugfix for sites that don't list DVDs (which is most of them)
-- 2019-01-23 7:30AM CST - Merged delposibl's code for 2 new NaughtyAmerica sites, and several new VR sites, additional PAcastCrew
+- 2019-01-23 7:30AM CST - Merged delposibl's code for 2 new NaughtyAmerica sites, and several new VR sites, additional PAactors
 - 2019-01-22 8:15AM CST - Consolidated PornFidelity sites to one file, updated search to return in standard format
 - 2019-01-21 9:00AM CST - Cleaned up the search section of init, a few other bugfixes
 - 2019-01-20 5:15PM CST - Merged blackibanez's code for JulesJordan, Dogfart Network, DDF Network, and the Perfect Gonzo network. Added 21Sextreme network to the existing GammaEnt file.
@@ -178,7 +178,7 @@
 - 2018-12-28 4:30PM CST - Updated Brazzers to add a Collection for the Series if a file is part of a series, along with some minor tweaks to Blacked and BlackedRaw Studio/Tagline
 - 2018-12-28 11:15AM CST - Fixed Blacked and BlackedRaw search results
 - 2018-12-27 2:00PM CST - Updated Brazzers and RealityKings search results to include subsite and release date, added support for SexyHub sites
-- 2018-12-26 1:30PM CST - Added PAcastCrew.py to help clean and match Actors
+- 2018-12-26 1:30PM CST - Added PAactors.py to help clean and match Actors
 - 2018-12-22 8:45PM CST - Updated Girlsway to match the rest of the XEmpire code
 - 2018-12-22 8:30PM CST - Added SweetSinner
 - 2018-12-22 8:15PM CST - Added Nuru Massage

Contents/Code/PAcastCrew.py → Contents/Code/PAactors.py

@@ -1,9 +1,9 @@
 import PAutils
-import PAdatabaseCastCrew
+import PAdatabaseActors
 import PAsearchSites
 
 
-class PhoenixCastCrew:
+class PhoenixActors:
     actorsTable = []
     directorsTable = []
     producersTable = []
@@ -66,14 +66,14 @@ def processActors(self, metadata, siteNum):
 
             if not skip:
                 searchStudioIndex = None
-                for studioIndex, studioList in PAdatabaseCastCrew.CastCrewStudioIndexes.items():
+                for studioIndex, studioList in PAdatabaseActors.ActorsStudioIndexes.items():
                     if not siteNum == 684 and metadata.studio.lower() in map(str.lower, studioList) or PAsearchSites.getSearchSiteName(siteNum).lower() in map(str.lower, studioList):
                         searchStudioIndex = studioIndex
                         break
 
                 searchActorName = actorName.lower()
-                if searchStudioIndex is not None and searchStudioIndex in PAdatabaseCastCrew.CastCrewReplaceStudios:
-                    for newActorName, aliases in PAdatabaseCastCrew.CastCrewReplaceStudios[searchStudioIndex].items():
+                if searchStudioIndex is not None and searchStudioIndex in PAdatabaseActors.ActorsReplaceStudios:
+                    for newActorName, aliases in PAdatabaseActors.ActorsReplaceStudios[searchStudioIndex].items():
                         if searchActorName == newActorName.lower() or searchActorName in map(str.lower, aliases):
                             actorName = newActorName
 
@@ -82,7 +82,7 @@ def processActors(self, metadata, siteNum):
 
                             break
 
-                for newActorName, aliases in PAdatabaseCastCrew.CastCrewReplace.items():
+                for newActorName, aliases in PAdatabaseActors.ActorsReplace.items():
                     if searchActorName == newActorName.lower() or searchActorName in map(str.lower, aliases):
                         actorName = newActorName
                         break
@@ -147,14 +147,14 @@ def processDirectors(self, metadata, siteNum):
 
             if not skip:
                 searchStudioIndex = None
-                for studioIndex, studioList in PAdatabaseCastCrew.CastCrewStudioIndexes.items():
+                for studioIndex, studioList in PAdatabaseActors.ActorsStudioIndexes.items():
                     if not siteNum == 684 and metadata.studio.lower() in map(str.lower, studioList) or PAsearchSites.getSearchSiteName(siteNum).lower() in map(str.lower, studioList):
                         searchStudioIndex = studioIndex
                         break
 
                 searchDirectorName = directorName.lower()
-                if searchStudioIndex is not None and searchStudioIndex in PAdatabaseCastCrew.CastCrewReplaceStudios:
-                    for newDirectorName, aliases in PAdatabaseCastCrew.CastCrewReplaceStudios[searchStudioIndex].items():
+                if searchStudioIndex is not None and searchStudioIndex in PAdatabaseActors.ActorsReplaceStudios:
+                    for newDirectorName, aliases in PAdatabaseActors.ActorsReplaceStudios[searchStudioIndex].items():
                         if searchDirectorName == newDirectorName.lower() or searchDirectorName in map(str.lower, aliases):
                             directorName = newDirectorName
 
@@ -163,7 +163,7 @@ def processDirectors(self, metadata, siteNum):
 
                             break
 
-                for newDirectorName, aliases in PAdatabaseCastCrew.CastCrewReplace.items():
+                for newDirectorName, aliases in PAdatabaseActors.ActorsReplace.items():
                     if searchDirectorName == newDirectorName.lower() or searchDirectorName in map(str.lower, aliases):
                         directorName = newDirectorName
                         break
@@ -215,14 +215,14 @@ def processProducers(self, metadata, siteNum):
 
             if not skip:
                 searchStudioIndex = None
-                for studioIndex, studioList in PAdatabaseCastCrew.CastCrewStudioIndexes.items():
+                for studioIndex, studioList in PAdatabaseActors.ActorsStudioIndexes.items():
                     if not siteNum == 684 and metadata.studio.lower() in map(str.lower, studioList) or PAsearchSites.getSearchSiteName(siteNum).lower() in map(str.lower, studioList):
                         searchStudioIndex = studioIndex
                         break
 
                 searchProducerName = producerName.lower()
-                if searchStudioIndex is not None and searchStudioIndex in PAdatabaseCastCrew.CastCrewReplaceStudios:
-                    for newProducerName, aliases in PAdatabaseCastCrew.CastCrewReplaceStudios[searchStudioIndex].items():
+                if searchStudioIndex is not None and searchStudioIndex in PAdatabaseActors.ActorsReplaceStudios:
+                    for newProducerName, aliases in PAdatabaseActors.ActorsReplaceStudios[searchStudioIndex].items():
                         if searchProducerName == newProducerName.lower() or searchProducerName in map(str.lower, aliases):
                             producerName = newProducerName
 
@@ -231,7 +231,7 @@ def processProducers(self, metadata, siteNum):
 
                             break
 
-                for newProducerName, aliases in PAdatabaseCastCrew.CastCrewReplace.items():
+                for newProducerName, aliases in PAdatabaseActors.ActorsReplace.items():
                     if searchProducerName == newProducerName.lower() or searchProducerName in map(str.lower, aliases):
                         producerName = newProducerName
                         break
@@ -515,7 +515,7 @@ def getFromJavBus(actorName, actorEncoded, metadata):
     actorPhotoURL = ''
     actorID = ''
 
-    for id, names in PAdatabaseCastCrew.CastCrewReplaceJavBusSearch.items():
+    for id, names in PAdatabaseActors.ActorsReplaceJavBusSearch.items():
         if actorName.lower() in map(str.lower, names):
             actorID = id
             break

Contents/Code/PAdatabaseCastCrew.py → Contents/Code/PAdatabaseActors.py

@@ -1,4 +1,4 @@
-CastCrewReplace = {
+ActorsReplace = {
     'Abbey Rain': ['Abby Rains', 'Julie Snow'],
     'Abby Lee Brazil': ['Abby Lee'],
     'Abella Danger': ['Bella Danger'],
@@ -329,7 +329,7 @@
     'Zoe Bloom': ['Zoey Bloom'],
 }
 
-CastCrewReplaceStudios = {
+ActorsReplaceStudios = {
     0: {  # 21 Sextury, 21Sextury, Footsie Babes
         'Camilla Moon': ['Ambica'],
         'Eva Smolina': ['Una'],
@@ -6038,7 +6038,7 @@
     },
 }
 
-CastCrewStudioIndexes = {
+ActorsStudioIndexes = {
     0: ['21 Sextury', '21Sextury', 'Footsie Babes'],
     1: ['Babes'],
     2: ['Bang Bros'],
@@ -6111,7 +6111,7 @@
 }
 
 
-CastCrewReplaceJavBusSearch = {
+ActorsReplaceJavBusSearch = {
     'm2c': ['Abeno Miku'],
     'mxo': ['Aihara Sarii'],
     '9qk': ['Aiki Yuu'],

Contents/Code/__init__.py

@@ -16,7 +16,7 @@
 from PIL import Image
 from slugify import slugify
 from traceback import format_exc
-import PAcastCrew
+import PAactors
 import PAgenres
 import PAsearchSites
 import PAsiteList
@@ -126,7 +126,7 @@ def search(self, results, media, lang, manual):
 
     def update(self, metadata, media, lang):
         movieGenres = PAgenres.PhoenixGenres()
-        movieCastCrew = PAcastCrew.PhoenixCastCrew()
+        movieActors = PAactors.PhoenixActors()
         valid_images = list()
 
         HTTP.ClearCache()
@@ -150,7 +150,7 @@ def update(self, metadata, media, lang):
         if provider is not None:
             providerName = getattr(provider, '__name__')
             Log('Provider: %s' % providerName)
-            provider.update(metadata, lang, siteNum, movieGenres, movieCastCrew, valid_images)
+            provider.update(metadata, lang, siteNum, movieGenres, movieActors, valid_images)
 
         # Cleanup Genres and Add
         Log('Genres')
@@ -159,15 +159,15 @@ def update(self, metadata, media, lang):
 
         # Cleanup Actors and Add
         Log('Actors')
-        movieCastCrew.processActors(metadata, siteNum)
+        movieActors.processActors(metadata, siteNum)
 
         # Cleanup Directors and Add
         Log('Directors')
-        movieCastCrew.processDirectors(metadata, siteNum)
+        movieActors.processDirectors(metadata, siteNum)
 
         # Cleanup Producers and Add
         Log('Producers')
-        movieCastCrew.processProducers(metadata, siteNum)
+        movieActors.processProducers(metadata, siteNum)
 
         # Add Content Rating
         metadata.content_rating = 'XXX'

Contents/Code/addActors.py

@@ -39,7 +39,7 @@ def search(results, lang, siteNum, searchData):
     return results
 
 
-def update(metadata, lang, siteNum, movieGenres, movieCastCrew, art):
+def update(metadata, lang, siteNum, movieGenres, movieActors, art):
     metadata_id = str(metadata.id).split('|')
     sceneActors = PAutils.Decode(metadata_id[0])
     sceneDate = metadata_id[2]
@@ -78,11 +78,11 @@ def update(metadata, lang, siteNum, movieGenres, movieCastCrew, art):
         movieGenres.addGenre(genreName)
 
     # Actor(s)
-    movieCastCrew.clearActors()
+    movieActors.clearActors()
     for actorLink in sceneActors.split(','):
         actorName = actorLink.strip()
         actorPhotoURL = ''
 
-        movieCastCrew.addActor(actorName, actorPhotoURL)
+        movieActors.addActor(actorName, actorPhotoURL)
 
     return metadata

Contents/Code/network18.py

@@ -33,7 +33,7 @@ def search(results, lang, siteNum, searchData):
     return results
 
 
-def update(metadata, lang, siteNum, movieGenres, movieCastCrew, art):
+def update(metadata, lang, siteNum, movieGenres, movieActors, art):
     metadata_id = str(metadata.id).split('|')
     videoId = PAutils.Decode(metadata_id[0])
     sceneDate = metadata_id[2]
@@ -75,15 +75,15 @@ def update(metadata, lang, siteNum, movieGenres, movieCastCrew, art):
         movieGenres.addGenre(genreName)
 
     # Actor(s)
-    movieCastCrew.clearActors()
+    movieActors.clearActors()
     for actorLink in detailsPageElements['talent']:
         actorPhoto = []
         actorName = actorLink['talent']['name']
 
         actorPhoto.append('/members/models/%s/profile-sm.jpg' % actorLink['talent']['talentId'])
         actorPhotoURL = getGraphQL(assetQuery, 'paths', actorPhoto, siteNum)['asset']['batch']['result'][0]['serve']['uri']
 
-        movieCastCrew.addActor(actorName, actorPhotoURL)
+        movieActors.addActor(actorName, actorPhotoURL)
 
     # Posters
     images = []

Contents/Code/network1service.py

@@ -77,7 +77,7 @@ def search(results, lang, siteNum, searchData):
     return results
 
 
-def update(metadata, lang, siteNum, movieGenres, movieCastCrew, art):
+def update(metadata, lang, siteNum, movieGenres, movieActors, art):
     metadata_id = str(metadata.id).split('|')
     sceneID = metadata_id[0]
     sceneType = metadata_id[2]
@@ -145,7 +145,7 @@ def update(metadata, lang, siteNum, movieGenres, movieCastCrew, art):
         movieGenres.addGenre(genreName)
 
     # Actor(s)
-    movieCastCrew.clearActors()
+    movieActors.clearActors()
     actors = detailsPageElements['actors']
     for actorLink in actors:
         actorPageURL = PAsearchSites.getSearchSearchURL(siteNum) + '/v1/actors?id=%d' % actorLink['id']
@@ -158,7 +158,7 @@ def update(metadata, lang, siteNum, movieGenres, movieCastCrew, art):
         if actorData['images'] and actorData['images']['profile']:
             actorPhotoURL = actorData['images']['profile']['0']['xs']['url']
 
-        movieCastCrew.addActor(actorName, actorPhotoURL)
+        movieActors.addActor(actorName, actorPhotoURL)
 
     # Posters
     for imageType in ['poster', 'cover']:

Contents/Code/network5Kporn.py

@@ -18,7 +18,7 @@ def search(results, lang, siteNum, searchData):
     return results
 
 
-def update(metadata, lang, siteNum, movieGenres, movieCastCrew, art):
+def update(metadata, lang, siteNum, movieGenres, movieActors, art):
     metadata_id = str(metadata.id).split('|')
     sceneURL = PAutils.Decode(metadata_id[0])
 
@@ -51,7 +51,7 @@ def update(metadata, lang, siteNum, movieGenres, movieCastCrew, art):
     movieGenres.clearGenres()
 
     # Actor(s)
-    movieCastCrew.clearActors()
+    movieActors.clearActors()
     actors = detailsPageElements.xpath('//h5[contains(., "Starring")]/a')
     for actorLink in actors:
         actorName = actorLink.text_content().strip()
@@ -65,7 +65,7 @@ def update(metadata, lang, siteNum, movieGenres, movieCastCrew, art):
         if img:
             actorPhotoURL = img[0]
 
-        movieCastCrew.addActor(actorName, actorPhotoURL)
+        movieActors.addActor(actorName, actorPhotoURL)
 
     # Posters
     xpaths = [

Contents/Code/networkAbbyWinters.py

@@ -61,7 +61,7 @@ def search(results, lang, siteNum, searchData):
     return results
 
 
-def update(metadata, lang, siteNum, movieGenres, movieCastCrew, art):
+def update(metadata, lang, siteNum, movieGenres, movieActors, art):
     metadata_id = str(metadata.id).split('|')
     sceneURL = PAutils.Decode(metadata_id[0])
     sceneDate = metadata_id[2]
@@ -98,7 +98,7 @@ def update(metadata, lang, siteNum, movieGenres, movieCastCrew, art):
         movieGenres.addGenre(genreName)
 
     # Actor(s)
-    movieCastCrew.clearActors()
+    movieActors.clearActors()
     for actorLink in detailsPageElements.xpath('//tr[contains(., "Scene")]//a'):
         actorName = actorLink.text_content().strip()
         actorPhotoURL = ''
@@ -108,7 +108,7 @@ def update(metadata, lang, siteNum, movieGenres, movieCastCrew, art):
         actorPageElements = HTML.ElementFromString(req.text)
         actorPhotoURL = actorPageElements.xpath('//img[@class="img-responsive"]/@src')[0]
 
-        movieCastCrew.addActor(actorName, actorPhotoURL)
+        movieActors.addActor(actorName, actorPhotoURL)
 
     # Posters
     xpaths = [

Contents/Code/networkAdultEmpireCash.py

@@ -45,7 +45,7 @@ def search(results, lang, siteNum, searchData):
     return results
 
 
-def update(metadata, lang, siteNum, movieGenres, movieCastCrew, art):
+def update(metadata, lang, siteNum, movieGenres, movieActors, art):
     metadata_id = str(metadata.id).split('|')
     sceneURL = PAutils.Decode(metadata_id[0])
     if not sceneURL.startswith('http'):
@@ -86,29 +86,29 @@ def update(metadata, lang, siteNum, movieGenres, movieCastCrew, art):
         movieGenres.addGenre(genreName)
 
     # Actor(s)
-    movieCastCrew.clearActors()
+    movieActors.clearActors()
     for actorLink in detailsPageElements.xpath('//div[@class="video-performer"]//img'):
         actorName = actorLink.get('title')
         actorPhotoURL = actorLink.get('data-bgsrc')
 
-        movieCastCrew.addActor(actorName, actorPhotoURL)
+        movieActors.addActor(actorName, actorPhotoURL)
 
     if 'filthykings' and '796896' in sceneURL:
-        movieCastCrew.addActor('Alice Visby', '')
+        movieActors.addActor('Alice Visby', '')
 
     if 'spankmonster' and '845218' in sceneURL:
-        movieCastCrew.addActor('Cecilia Taylor', '')
+        movieActors.addActor('Cecilia Taylor', '')
 
     if 'spankmonster' and '893455' in sceneURL:
-        movieCastCrew.addActor('Rhea Radford', '')
+        movieActors.addActor('Rhea Radford', '')
 
     # Director
-    movieCastCrew.clearDirectors()
+    movieActors.clearDirectors()
     directorElement = detailsPageElements.xpath('//div[@class="director"]/text()')
     if directorElement:
         directorName = directorElement[0].strip()
 
-        movieCastCrew.addDirector(directorName, '')
+        movieActors.addDirector(directorName, '')
 
     # Posters
     for poster in detailsPageElements.xpath('//div[@id="dv_frames"]//img/@src'):