diff --git a/Contents/Code/__init__.py b/Contents/Code/__init__.py index 1ef96a634..4f1682c30 100644 --- a/Contents/Code/__init__.py +++ b/Contents/Code/__init__.py @@ -131,10 +131,18 @@ def update(self, metadata, media, lang): HTTP.ClearCache() metadata.collections.clear() + metadata.genres.clear() + movieGenres.clearGenres() + metadata.roles.clear() + movieActors.clearActors() + metadata.directors.clear() + movieActors.clearDirectors() + metadata.producers.clear() + movieActors.clearProducers() Log('******UPDATE CALLED*******') diff --git a/Contents/Code/addActors.py b/Contents/Code/addActors.py index e88f563c4..704760eea 100644 --- a/Contents/Code/addActors.py +++ b/Contents/Code/addActors.py @@ -71,14 +71,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in sceneGenres.split(','): genreName = genreLink.strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in sceneActors.split(','): actorName = actorLink.strip() actorPhotoURL = '' diff --git a/Contents/Code/network18.py b/Contents/Code/network18.py index c075961a9..79753a6ea 100644 --- a/Contents/Code/network18.py +++ b/Contents/Code/network18.py @@ -68,14 +68,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in PAutils.getDictValuesFromKey(genresDB, PAsearchSites.getSearchSiteName(siteNum)): genreName = genreLink.strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements['talent']: actorPhoto = [] actorName = actorLink['talent']['name'] diff --git a/Contents/Code/network1service.py b/Contents/Code/network1service.py index 0e257b478..c21c454ec 100644 --- a/Contents/Code/network1service.py +++ b/Contents/Code/network1service.py @@ -137,7 +137,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genres = detailsPageElements['tags'] for genreLink in genres: genreName = genreLink['name'] @@ -145,7 +144,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements['actors'] for actorLink in actors: actorPageURL = PAsearchSites.getSearchSearchURL(siteNum) + '/v1/actors?id=%d' % actorLink['id'] diff --git a/Contents/Code/network5Kporn.py b/Contents/Code/network5Kporn.py index d559de010..e64d66a10 100644 --- a/Contents/Code/network5Kporn.py +++ b/Contents/Code/network5Kporn.py @@ -48,10 +48,8 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//h5[contains(., "Starring")]/a') for actorLink in actors: actorName = actorLink.text_content().strip() diff --git a/Contents/Code/networkAbbyWinters.py b/Contents/Code/networkAbbyWinters.py index 92d29e8a8..6b4126cbb 100644 --- a/Contents/Code/networkAbbyWinters.py +++ b/Contents/Code/networkAbbyWinters.py @@ -91,14 +91,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//aside/div[contains(@class, "description")]//a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//tr[contains(., "Scene")]//a'): actorName = actorLink.text_content().strip() actorPhotoURL = '' diff --git a/Contents/Code/networkAdultEmpireCash.py b/Contents/Code/networkAdultEmpireCash.py index c500e7a00..f8dc13227 100644 --- a/Contents/Code/networkAdultEmpireCash.py +++ b/Contents/Code/networkAdultEmpireCash.py @@ -81,12 +81,10 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreName in detailsPageElements.xpath('//div[@class="tags"]//a/text()'): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="video-performer"]//img'): actorName = actorLink.get('title') actorPhotoURL = actorLink.get('data-bgsrc') @@ -103,7 +101,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor('Rhea Radford', '') # Director - movieActors.clearDirectors() directorElement = detailsPageElements.xpath('//div[@class="director"]/text()') if directorElement: directorName = directorElement[0].strip() diff --git a/Contents/Code/networkAdultPrime.py b/Contents/Code/networkAdultPrime.py index 6e0474b79..9f62497ed 100644 --- a/Contents/Code/networkAdultPrime.py +++ b/Contents/Code/networkAdultPrime.py @@ -99,14 +99,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//p[@class="update-info-line regular"][./b[contains(., "Niches")]]')[0].text_content().split(':')[-1].split(','): genreName = PAutils.parseTitle(genreLink.strip(), siteNum) movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//p[@class="update-info-line regular"][./b[contains(., "Performer")]]/a') for actorLink in actors: actorName = actorLink.text_content().strip() diff --git a/Contents/Code/networkAuntJudys.py b/Contents/Code/networkAuntJudys.py index 2bbb11926..f2e415875 100644 --- a/Contents/Code/networkAuntJudys.py +++ b/Contents/Code/networkAuntJudys.py @@ -60,14 +60,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//span[@class="update_tags"]/a'): genreName = PAutils.parseTitle(genreLink.text_content().strip(), siteNum) movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//p/span[@class="update_models"]/a') for actorLink in actors: actorName = actorLink.text_content().strip() diff --git a/Contents/Code/networkBadoinkVR.py b/Contents/Code/networkBadoinkVR.py index 3088000a1..2b71a6dcd 100644 --- a/Contents/Code/networkBadoinkVR.py +++ b/Contents/Code/networkBadoinkVR.py @@ -72,14 +72,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//a[@class="video-tag"]'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//a[contains(@class, "video-actor-link")]'): actorName = actorLink.text_content().strip() diff --git a/Contents/Code/networkBang.py b/Contents/Code/networkBang.py index 966c0a6bc..4c97904fe 100644 --- a/Contents/Code/networkBang.py +++ b/Contents/Code/networkBang.py @@ -118,7 +118,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() if siteNum == 1365: actorXPATH = '//div[contains(@class, "clear-both")]//a[contains(@href, "pornstar")]' else: @@ -143,7 +142,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="actions"]/a | //a[@class="genres"]'): genreName = genreLink.text_content() diff --git a/Contents/Code/networkBangBrosOther.py b/Contents/Code/networkBangBrosOther.py index 28683adbf..828d3e523 100644 --- a/Contents/Code/networkBangBrosOther.py +++ b/Contents/Code/networkBangBrosOther.py @@ -60,7 +60,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//*[.//@class="fa fa-tag"]/text()') for genreLink in genres: genreName = genreLink.strip() @@ -68,7 +67,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//*[.//@class="fa fa-star"]/text()'): actorName = actorLink.strip() actorPhotoURL = '' diff --git a/Contents/Code/networkBellaPass.py b/Contents/Code/networkBellaPass.py index 8d4633271..173ff1691 100644 --- a/Contents/Code/networkBellaPass.py +++ b/Contents/Code/networkBellaPass.py @@ -80,14 +80,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[contains(@class, "featuring")]//a[contains(@href, "/categories/")]'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[contains(@class, "featuring")]//a[contains(@href, "/models/")]') if actors: if len(actors) == 3: diff --git a/Contents/Code/networkBlurredMedia.py b/Contents/Code/networkBlurredMedia.py index ba46eef66..8786b6405 100644 --- a/Contents/Code/networkBlurredMedia.py +++ b/Contents/Code/networkBlurredMedia.py @@ -49,14 +49,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//a[@class="video__tag"]'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//section[@name="modelsBio"]/article/figure'): actorName = actorLink.xpath('.//p/a')[0].text_content().strip() actorPhotoURL = actorLink.xpath('.//img//@src')[0] diff --git a/Contents/Code/networkCherryPimps.py b/Contents/Code/networkCherryPimps.py index 60fcf9455..917bab14a 100644 --- a/Contents/Code/networkCherryPimps.py +++ b/Contents/Code/networkCherryPimps.py @@ -63,14 +63,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="info-block"]//a | //ul[@class="tags"]//a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="info-block_data"]//a | //div[contains(@class, "model-list-item")]//a') if actors: if len(actors) == 3: diff --git a/Contents/Code/networkCouplesCinema.py b/Contents/Code/networkCouplesCinema.py index ac7c9ec42..8eba60f0b 100644 --- a/Contents/Code/networkCouplesCinema.py +++ b/Contents/Code/networkCouplesCinema.py @@ -78,11 +78,7 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): year = detailsPageElements.xpath('//span[contains(@class, "type")]')[0].text_content().split('|')[1].strip() metadata.year = int(year) - # Genres - movieGenres.clearGenres() - # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[contains(@class, "cast")]/a'): actorName = actorLink.text_content().strip() actorPhotoURL = '' diff --git a/Contents/Code/networkCzechAV.py b/Contents/Code/networkCzechAV.py index a9fe0d782..76d37dd1d 100644 --- a/Contents/Code/networkCzechAV.py +++ b/Contents/Code/networkCzechAV.py @@ -94,14 +94,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//ul[@class="tags"]/li'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() if siteNum == 1583: actorName = '%s %s' % (title, detailsPageElements.xpath('//span[@class="age"]')[0].text_content().strip()) movieActors.addActor(actorName, detailsPageElements.xpath('//div[contains(@class, "gallery")]//@href')[0]) diff --git a/Contents/Code/networkCzechVR.py b/Contents/Code/networkCzechVR.py index fb5b1a4f7..46ffcf02d 100644 --- a/Contents/Code/networkCzechVR.py +++ b/Contents/Code/networkCzechVR.py @@ -66,14 +66,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="tag"]//a'): genreName = genreLink.text_content().lower().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('(//div[contains(@class, "nazev")])[1]//div[@class="featuring"]//a'): actorName = actorLink.text_content().strip() actorPhotoURL = '' diff --git a/Contents/Code/networkDerangedDollars.py b/Contents/Code/networkDerangedDollars.py index e0b7c7207..60362e46b 100644 --- a/Contents/Code/networkDerangedDollars.py +++ b/Contents/Code/networkDerangedDollars.py @@ -63,14 +63,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//p[@class="tags"]/a'): genreName = PAutils.parseTitle(genreLink.text_content().strip(), siteNum) movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="lch"]/span')[0].text_content().rsplit(',', 2)[0] if ':' in actors: actors = re.split(',|&|/|And', actors.split(':', 1)[1]) diff --git a/Contents/Code/networkDirtyFlix.py b/Contents/Code/networkDirtyFlix.py index 87c3cfa8d..86d89b7a4 100644 --- a/Contents/Code/networkDirtyFlix.py +++ b/Contents/Code/networkDirtyFlix.py @@ -102,13 +102,11 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genres = PAutils.getDictValuesFromKey(genresDB, PAsearchSites.getSearchSiteName(siteNum)) for genreName in genres: movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = PAutils.getDictKeyFromValues(sceneActorsDB, sceneID) for actor in actors: actorName = actor.strip() diff --git a/Contents/Code/networkDirtyHardDrive.py b/Contents/Code/networkDirtyHardDrive.py index 060d80290..70b83aa43 100644 --- a/Contents/Code/networkDirtyHardDrive.py +++ b/Contents/Code/networkDirtyHardDrive.py @@ -63,7 +63,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Actor(s) - movieActors.clearActors() actorLink = detailsPageElements.xpath('//div[@id="video-specs"]//span') if actorLink: actorName = actorLink[-1].text_content().strip() diff --git a/Contents/Code/networkEvolvedFights.py b/Contents/Code/networkEvolvedFights.py index 0a0f70ef7..9015b7ff1 100644 --- a/Contents/Code/networkEvolvedFights.py +++ b/Contents/Code/networkEvolvedFights.py @@ -52,14 +52,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(metadata.studio) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//span[(contains(@class, "tour_update_tags"))]/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[(contains(@class, "update_block_info model_update_block_info"))]/span[(contains(@class, "tour_update_models"))]/a'): actorName = actorLink.text_content().strip() actorPageURL = actorLink.get('href') diff --git a/Contents/Code/networkFAKings.py b/Contents/Code/networkFAKings.py index d180cbb27..8c9a20fe1 100644 --- a/Contents/Code/networkFAKings.py +++ b/Contents/Code/networkFAKings.py @@ -82,7 +82,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//strong[contains(., "Categori")]//following-sibling::a'): genreName = genreLink.text_content().strip() @@ -98,7 +97,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): img = '' # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//strong[contains(., "Actr")]//following-sibling::a'): actorName = actorLink.text_content().strip() diff --git a/Contents/Code/networkFTV.py b/Contents/Code/networkFTV.py index 3ea836b75..46f8981a8 100644 --- a/Contents/Code/networkFTV.py +++ b/Contents/Code/networkFTV.py @@ -76,7 +76,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genres = [] if tagline == 'FTVGirls': genres = ['Teen', 'Solo', 'Public'] @@ -87,7 +86,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = [] for idx, actorLink in enumerate(detailsPageElements.xpath('//div[@id="ModelDescription"]//h1')): diff --git a/Contents/Code/networkFemdomEmpire.py b/Contents/Code/networkFemdomEmpire.py index 293371f32..9c22e665d 100644 --- a/Contents/Code/networkFemdomEmpire.py +++ b/Contents/Code/networkFemdomEmpire.py @@ -88,7 +88,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre('Femdom') # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[contains(@class, "featuring")][1]/ul/li'): actorName = actorLink.text_content().strip().replace('Featuring:', '') actorPhotoURL = '' diff --git a/Contents/Code/networkFuelVirtual.py b/Contents/Code/networkFuelVirtual.py index 22db39829..9d4eb61e8 100644 --- a/Contents/Code/networkFuelVirtual.py +++ b/Contents/Code/networkFuelVirtual.py @@ -57,7 +57,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//td[@class="plaintext"]/a[@class="model_category_link"]'): genreName = genreLink.text_content().strip() @@ -66,7 +65,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre('18-Year-Old') # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@id="description"]//td[@align="left"]/a') if actors: if len(actors) == 3: diff --git a/Contents/Code/networkFullPornNetwork.py b/Contents/Code/networkFullPornNetwork.py index 98c0edc26..ee3cb6b44 100644 --- a/Contents/Code/networkFullPornNetwork.py +++ b/Contents/Code/networkFullPornNetwork.py @@ -114,14 +114,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[contains(@class, "video-info")]//a[contains(@href, "/categories/")]/text()'): genreName = genreLink.strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[contains(@class, "video-info")]//a[contains(@href, "/models/")]'): actorName = actorLink.text_content().strip() actorLink = actorLink.xpath('./@href')[0].strip() diff --git a/Contents/Code/networkGammaEnt.py b/Contents/Code/networkGammaEnt.py index 82b99c8e9..76a50bb8c 100644 --- a/Contents/Code/networkGammaEnt.py +++ b/Contents/Code/networkGammaEnt.py @@ -254,8 +254,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): req = PAutils.HTTPRequest(sceneURL) detailsPageElements = HTML.ElementFromString(req.text) - movieActors.clearDirectors() - if siteNum == 278 or (siteNum >= 285 and siteNum <= 287) or siteNum == 843: metadata.studio = 'XEmpire' movieActors.addDirector('Mason', '') @@ -332,7 +330,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): dvdTitle = 'This is some damn nonsense that should never match the scene title' # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//div[@class="sceneCol sceneColCategories"]//a | //div[@class="sceneCategories"]//a | //p[@class="dvdCol"]/a') for genreLink in genres: genreName = genreLink.text_content().strip('\n').lower() @@ -368,7 +365,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): pass # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="sceneCol sceneColActors"]//a | //div[@class="sceneCol sceneActors"]//a | //div[@class="pornstarNameBox"]/a[@class="pornstarName"] | //div[@id="slick_DVDInfoActorCarousel"]//a | //div[@id="slick_sceneInfoPlayerActorCarousel"]//a') if metadata.title == 'Kennedy Leigh' and metadata.tagline == 'Only Teen Blowjobs': movieActors.addActor('Kennedy Leigh', 'https://imgs1cdn.adultempire.com/actors/649607h.jpg') @@ -466,7 +462,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.title = title # Posters - # Video trailer background image try: twitterBG = detailsPageElements.xpath('//meta[@name="twitter:image"]/@content')[0] diff --git a/Contents/Code/networkGammaEntOther.py b/Contents/Code/networkGammaEntOther.py index 0b1cb099b..ee9f995f1 100644 --- a/Contents/Code/networkGammaEntOther.py +++ b/Contents/Code/networkGammaEntOther.py @@ -149,7 +149,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements['categories']: genreName = genreLink['name'] if genreName: @@ -163,7 +162,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() female = [] male = [] for actorLink in detailsPageElements['actors']: diff --git a/Contents/Code/networkGrooby.py b/Contents/Code/networkGrooby.py index 3a57e1751..de56722b4 100644 --- a/Contents/Code/networkGrooby.py +++ b/Contents/Code/networkGrooby.py @@ -70,7 +70,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="trailer_videoinfo"]//p[contains(., "Featuring")]//a | //div[@class="setdesc"]//a[contains(@href, "/models/")]'): actorName = actorLink.text_content().strip() diff --git a/Contents/Code/networkHighTechVR.py b/Contents/Code/networkHighTechVR.py index d4d8fc9a6..803514c4f 100644 --- a/Contents/Code/networkHighTechVR.py +++ b/Contents/Code/networkHighTechVR.py @@ -96,14 +96,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath(siteXPath['tags']): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath(siteXPath['actor']): actorName = actorLink.text_content().strip() actorPageURL = PAsearchSites.getSearchBaseURL(siteNum) + actorLink.get('href') diff --git a/Contents/Code/networkIntersec.py b/Contents/Code/networkIntersec.py index 5d656d465..8f89d4db6 100644 --- a/Contents/Code/networkIntersec.py +++ b/Contents/Code/networkIntersec.py @@ -70,11 +70,9 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() movieGenres.addGenre('BDSM') # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[contains(@class, "has-text-white-ter")][1]//a[contains(@class, "is-dark")][position() < last()]/text()') if actors: if len(actors) == 3: diff --git a/Contents/Code/networkJavBus.py b/Contents/Code/networkJavBus.py index 192c83989..087deba98 100644 --- a/Contents/Code/networkJavBus.py +++ b/Contents/Code/networkJavBus.py @@ -104,13 +104,11 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//span[@class="genre"]//a[contains(@href, "/genre/")]'): genreName = genreLink.text_content().lower().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//a[@class="avatar-box"]'): fullActorName = actorLink.xpath('./div/img/@title')[0] actorPhotoURL = detailsPageElements.xpath('//a[@class="avatar-box"]/div[@class="photo-frame"]/img[contains(@title, "%s")]/@src' % (fullActorName))[0] @@ -123,7 +121,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(fullActorName, actorPhotoURL) # Director - movieActors.clearDirectors() directorLink = detailsPageElements.xpath('//p/a[contains(@href, "/director/")]') if directorLink: directorName = directorLink[0].text_content().strip() diff --git a/Contents/Code/networkKink.py b/Contents/Code/networkKink.py index 00b40ccaf..1044ef1c0 100644 --- a/Contents/Code/networkKink.py +++ b/Contents/Code/networkKink.py @@ -155,7 +155,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//p[@class="tag-list category-tag-list"]//a') for genreLink in genres: genreName = genreLink.text_content().replace(',', '').strip().title() @@ -163,7 +162,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//p[@class="starring"]//a') if actors: if len(actors) == 3: @@ -183,7 +181,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Director(s) - movieActors.clearDirectors() try: directors = detailsPageElements.xpath('//span[@class="director-name"]/a') for directorLink in directors: diff --git a/Contents/Code/networkLoveHerFilms.py b/Contents/Code/networkLoveHerFilms.py index e06e398e6..008b2b7e8 100644 --- a/Contents/Code/networkLoveHerFilms.py +++ b/Contents/Code/networkLoveHerFilms.py @@ -28,9 +28,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): req = PAutils.HTTPRequest(sceneURL) detailsPageElements = HTML.ElementFromString(req.text) - movieGenres.clearGenres() - movieActors.clearActors() - # Title metadata.title = PAutils.parseTitle(detailsPageElements.xpath('//div[@class="main-info-left"]/h1')[0].text_content().strip(), siteNum) @@ -53,7 +50,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="video-tags"]/a'): genreName = genreLink.text_content().strip() @@ -61,7 +57,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre('Foot Sex') # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="featured"]/a') if actors: if len(actors) == 3: diff --git a/Contents/Code/networkMYLF.py b/Contents/Code/networkMYLF.py index 6fc85c9c4..d99d76958 100644 --- a/Contents/Code/networkMYLF.py +++ b/Contents/Code/networkMYLF.py @@ -94,7 +94,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actors = detailsPageElements['models'] for actorLink in actors: actorID = actorLink['modelId'] @@ -108,7 +107,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Genres - movieGenres.clearGenres() genres = ['MILF', 'Mature'] if 'tags' in detailsPageElements and detailsPageElements['tags']: diff --git a/Contents/Code/networkMetArt.py b/Contents/Code/networkMetArt.py index b0977756e..2e126160b 100644 --- a/Contents/Code/networkMetArt.py +++ b/Contents/Code/networkMetArt.py @@ -53,7 +53,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements['tags']: genreName = genreLink.title() @@ -61,7 +60,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre('Glamorous') # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements['models']: actorName = actorLink['name'] actorPhotoURL = PAsearchSites.getSearchBaseURL(siteNum) + actorLink['headshotImagePath'] @@ -69,7 +67,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Director(s) - movieActors.clearDirectors() for directorLink in detailsPageElements['photographers']: directorName = directorLink['name'] diff --git a/Contents/Code/networkMetadataAPI.py b/Contents/Code/networkMetadataAPI.py index 94e5e412f..00d4070fc 100644 --- a/Contents/Code/networkMetadataAPI.py +++ b/Contents/Code/networkMetadataAPI.py @@ -87,7 +87,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() if 'tags' in detailsPageElements: for genreLink in detailsPageElements['tags']: genreName = genreLink['name'] @@ -95,7 +94,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements['performers']: actorName = actorLink['name'] actorPhotoURL = actorLink['image'] diff --git a/Contents/Code/networkModelCentro.py b/Contents/Code/networkModelCentro.py index 11256a1ea..9745fdf7b 100644 --- a/Contents/Code/networkModelCentro.py +++ b/Contents/Code/networkModelCentro.py @@ -87,8 +87,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() - movieActors.clearActors() if 'tags' in detailsPageElements: genres = detailsPageElements['tags']['collection'] diff --git a/Contents/Code/networkNVG.py b/Contents/Code/networkNVG.py index 07129337f..1a6ca9982 100644 --- a/Contents/Code/networkNVG.py +++ b/Contents/Code/networkNVG.py @@ -110,10 +110,8 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() # Actor(s) - movieActors.clearActors() for actor in actors.split(' and '): actorName = actor.strip() actorPhotoURL = '' diff --git a/Contents/Code/networkNubiles.py b/Contents/Code/networkNubiles.py index a2bb783a3..e6decbd8b 100644 --- a/Contents/Code/networkNubiles.py +++ b/Contents/Code/networkNubiles.py @@ -79,14 +79,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="categories"]/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[contains(@class, "content-pane-performer")]/a'): actorName = actorLink.text_content().strip() diff --git a/Contents/Code/networkPerfectGonzo.py b/Contents/Code/networkPerfectGonzo.py index 034f9f203..dc68b7810 100644 --- a/Contents/Code/networkPerfectGonzo.py +++ b/Contents/Code/networkPerfectGonzo.py @@ -77,14 +77,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="col-sm-8 col-md-8 no-padding-side tag-container"]//a'): genreName = genreLink.text_content().strip().lower() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="col-sm-3 col-md-3 col-md-offset-1 no-padding-side"]/p/a'): actorName = actorLink.text_content().strip() diff --git a/Contents/Code/networkPervCity.py b/Contents/Code/networkPervCity.py index 8324a9413..c9949eb9b 100644 --- a/Contents/Code/networkPervCity.py +++ b/Contents/Code/networkPervCity.py @@ -57,11 +57,9 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(metadata.tagline) # Genres - movieGenres.clearGenres() # Actor(s) date = '' - movieActors.clearActors() actors = detailsPageElements.xpath('//h3/span/a') for actorLink in actors: actorName = actorLink.text_content().strip() diff --git a/Contents/Code/networkPornCZ.py b/Contents/Code/networkPornCZ.py index 2cb0cd9f8..6a7366e80 100644 --- a/Contents/Code/networkPornCZ.py +++ b/Contents/Code/networkPornCZ.py @@ -56,14 +56,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[contains(., "Genres")]/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[contains(., "Actors")]/a'): actorName = actorLink.text_content() diff --git a/Contents/Code/networkPornFidelity.py b/Contents/Code/networkPornFidelity.py index a96d8afde..9af70760c 100644 --- a/Contents/Code/networkPornFidelity.py +++ b/Contents/Code/networkPornFidelity.py @@ -56,12 +56,10 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() movieGenres.addGenre('Hardcore') movieGenres.addGenre('Heterosexual') # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//a[@class="is-underlined"]') if actors: if len(actors) == 3: diff --git a/Contents/Code/networkPornPros.py b/Contents/Code/networkPornPros.py index 4058c98ba..b5ff9a461 100644 --- a/Contents/Code/networkPornPros.py +++ b/Contents/Code/networkPornPros.py @@ -79,7 +79,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(siteName) # Actor(s) - movieActors.clearActors() if 'pornplus' in sceneURL: actors = detailsPageElements.xpath('//div[contains(@class, "space-y-4 p-4")]//a[contains(@href, "/models/")]') else: @@ -146,7 +145,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genres = PAutils.getDictValuesFromKey(genresDB, siteName) for genreLink in genres: genreName = genreLink.strip() diff --git a/Contents/Code/networkPornWorld.py b/Contents/Code/networkPornWorld.py index 30e904a22..71dd6b3ed 100644 --- a/Contents/Code/networkPornWorld.py +++ b/Contents/Code/networkPornWorld.py @@ -161,14 +161,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[contains(@class, "genres-list")]//a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//h1[contains(@class, "watch__title")]//a'): actorName = actorLink.text_content().strip() actorPhotoURL = '' diff --git a/Contents/Code/networkPuffy.py b/Contents/Code/networkPuffy.py index 91dbfd6d6..616987627 100644 --- a/Contents/Code/networkPuffy.py +++ b/Contents/Code/networkPuffy.py @@ -68,14 +68,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div/section[3]/div[2]/p/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div/section[2]/dl/dd[1]/a') if actors: if len(actors) == 3: diff --git a/Contents/Code/networkPureCFNM.py b/Contents/Code/networkPureCFNM.py index e73d610e1..267632c3e 100644 --- a/Contents/Code/networkPureCFNM.py +++ b/Contents/Code/networkPureCFNM.py @@ -76,7 +76,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() if subSite.lower() == 'AmateurCFNM'.lower(): for genreName in ['CFNM']: movieGenres.addGenre(genreName) @@ -102,7 +101,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actors = sceneActors.split(',') if actors: if len(actors) == 2: diff --git a/Contents/Code/networkRadicalCash.py b/Contents/Code/networkRadicalCash.py index beb46b5a7..caa7d9201 100644 --- a/Contents/Code/networkRadicalCash.py +++ b/Contents/Code/networkRadicalCash.py @@ -85,14 +85,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in content['tags']: genreName = genreLink.strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actor in video['models_thumbs']: actorName = actor['name'] actorPhotoURL = actor['thumb'] diff --git a/Contents/Code/networkRomero.py b/Contents/Code/networkRomero.py index bbd0b2b82..93ef794cf 100644 --- a/Contents/Code/networkRomero.py +++ b/Contents/Code/networkRomero.py @@ -79,14 +79,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="Cats"]//a/text()|//div[@class="zapdesc"]/div/div/div[contains(., "Including:")]/text()'): genreName = genreLink.strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[contains(@class, "inner")]//div[contains(@class, "tagsmodels")]/a'): actorName = actorLink.text_content().strip() actorPhotoURL = '' @@ -94,7 +92,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Director - movieActors.clearDirectors() directorLink = detailsPageElements.xpath('//div[contains(@class, "director")]//a/text()') if directorLink: directorName = directorLink[0].strip() diff --git a/Contents/Code/networkScoreGroup.py b/Contents/Code/networkScoreGroup.py index 61134739e..89475d395 100644 --- a/Contents/Code/networkScoreGroup.py +++ b/Contents/Code/networkScoreGroup.py @@ -105,7 +105,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div/span[@class="value"]/a'): actorName = actorLink.text_content().strip() actorPhotoURL = '' @@ -116,7 +115,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor('Christy Marks', '') # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="mb-3"]/a'): genreName = genreLink.text_content().strip() diff --git a/Contents/Code/networkSinX.py b/Contents/Code/networkSinX.py index 639a19dac..4f918cae8 100644 --- a/Contents/Code/networkSinX.py +++ b/Contents/Code/networkSinX.py @@ -46,14 +46,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div/section[4]/div/p/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/figure/figcaption/h4') if actors: if len(actors) == 3: diff --git a/Contents/Code/networkSteppedUp.py b/Contents/Code/networkSteppedUp.py index acaf7bac1..ca64a5d3f 100644 --- a/Contents/Code/networkSteppedUp.py +++ b/Contents/Code/networkSteppedUp.py @@ -69,14 +69,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements['tags']: genreName = genreLink.strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements['models_thumbs']: actorName = actorLink['name'].strip() actorPhotoURL = actorLink['thumb'] diff --git a/Contents/Code/networkStrike3.py b/Contents/Code/networkStrike3.py index 8b112d2e2..8685c0c5c 100644 --- a/Contents/Code/networkStrike3.py +++ b/Contents/Code/networkStrike3.py @@ -81,7 +81,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() if metadata.studio == 'Tushy' or metadata.studio == 'TushyRaw': movieGenres.addGenre('Anal') @@ -92,7 +91,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = video['models'] for actor in actors: actorName = actor['name'] @@ -103,7 +101,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Director - movieActors.clearDirectors() if video['directors']: directorName = video['directors'][0]['name'] diff --git a/Contents/Code/networkTeamSkeet.py b/Contents/Code/networkTeamSkeet.py index a92ab5459..0cde4c2d5 100644 --- a/Contents/Code/networkTeamSkeet.py +++ b/Contents/Code/networkTeamSkeet.py @@ -94,7 +94,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actors = detailsPageElements['models'] for actorLink in actors: actorID = actorLink['modelId'] @@ -108,7 +107,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Genres - movieGenres.clearGenres() genres = [] if 'tags' in detailsPageElements and detailsPageElements['tags']: diff --git a/Contents/Code/networkTeenCoreClub.py b/Contents/Code/networkTeenCoreClub.py index efae32f3f..2209279d9 100644 --- a/Contents/Code/networkTeenCoreClub.py +++ b/Contents/Code/networkTeenCoreClub.py @@ -58,7 +58,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Actor(s) - movieActors.clearActors() actors = [] for actorData in data['video']['actors']: actorName = actorData['name'] @@ -82,7 +81,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreData in data['video']['genres']: if genreData['title']['en']: genreName = genreData['title']['en'] diff --git a/Contents/Code/networkTeenMegaWorld.py b/Contents/Code/networkTeenMegaWorld.py index 2d8321dd3..4b9afbea4 100644 --- a/Contents/Code/networkTeenMegaWorld.py +++ b/Contents/Code/networkTeenMegaWorld.py @@ -56,7 +56,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="video"]//div[@class="site"]//a[position() > 1]'): actorName = actorLink.text_content().strip() @@ -68,7 +67,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//ul[@class="tag-list"]//a'): genreName = genreLink.text_content().strip() diff --git a/Contents/Code/networkThickCash.py b/Contents/Code/networkThickCash.py index 9bf238b23..b0ea114e4 100644 --- a/Contents/Code/networkThickCash.py +++ b/Contents/Code/networkThickCash.py @@ -67,7 +67,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() if subSite.lower() == 'Family Lust'.lower(): for genreName in ['Family Roleplay']: movieGenres.addGenre(genreName) @@ -87,7 +86,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actors - movieActors.clearActors() # Posters art.append(scenePoster) diff --git a/Contents/Code/networkThickCashOther.py b/Contents/Code/networkThickCashOther.py index a83e980db..25fce7469 100644 --- a/Contents/Code/networkThickCashOther.py +++ b/Contents/Code/networkThickCashOther.py @@ -56,7 +56,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//a[@class="tag"][contains(@href, "models")]'): actorName = actorLink.text_content().strip() actorPhotoURL = '' diff --git a/Contents/Code/networkTopWebModels.py b/Contents/Code/networkTopWebModels.py index 0ab03c8a0..0ab93210d 100644 --- a/Contents/Code/networkTopWebModels.py +++ b/Contents/Code/networkTopWebModels.py @@ -90,14 +90,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements['tags']: genreName = genreLink['name'] movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements['models']: actorName = actorLink['name'] actorPhotoURL = actorLink['thumb'] diff --git a/Contents/Code/networkTwoWebMedia.py b/Contents/Code/networkTwoWebMedia.py index 33480d796..cf692bba0 100644 --- a/Contents/Code/networkTwoWebMedia.py +++ b/Contents/Code/networkTwoWebMedia.py @@ -55,14 +55,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//span[@class="meta_videotag meta_category"]/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//span[@class="meta_modelcategory meta_category"]/a'): actorName = actorLink.text_content().strip() actorPhotoURL = '' diff --git a/Contents/Code/networkVIP4K.py b/Contents/Code/networkVIP4K.py index 0834c1274..c63920913 100644 --- a/Contents/Code/networkVIP4K.py +++ b/Contents/Code/networkVIP4K.py @@ -109,7 +109,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//a[@class="player-description__model model ph_register"]'): actorName = actorLink.xpath('.//div[@class="model__name"]')[0].text_content().strip() actorPhotoURL = '' @@ -117,7 +116,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Genres - movieGenres.clearGenres() genres = PAutils.getDictValuesFromKey(genresDB, tagline) for genreLink in detailsPageElements.xpath('//div[@class="tags"]/a'): genreName = genreLink.text_content().replace('#', '').strip() diff --git a/Contents/Code/networkVNA.py b/Contents/Code/networkVNA.py index 2b0c9225a..e17fbebfa 100644 --- a/Contents/Code/networkVNA.py +++ b/Contents/Code/networkVNA.py @@ -73,7 +73,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//h4[@class="customhcolor"]')[0].text_content().strip() for genreLink in genres.split(','): genreName = genreLink.strip() @@ -81,7 +80,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//h3[@class="customhcolor"]')[0].text_content().strip() # Fixing previous values to compensate for broken html tags diff --git a/Contents/Code/networkWankz.py b/Contents/Code/networkWankz.py index 7b08e9164..cd693da4f 100644 --- a/Contents/Code/networkWankz.py +++ b/Contents/Code/networkWankz.py @@ -46,7 +46,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[contains(@class, "actors")]//a[@class="model"]'): actorName = actorLink.xpath('.//span')[0].text_content().strip() actorPhotoURL = actorLink.xpath('.//img/@src')[0] @@ -54,7 +53,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//a[@class="cat"] | //p[@style]/a'): genreName = genreLink.text_content().strip() diff --git a/Contents/Code/networkWowNetwork.py b/Contents/Code/networkWowNetwork.py index 69b49621b..270aa1dbb 100644 --- a/Contents/Code/networkWowNetwork.py +++ b/Contents/Code/networkWowNetwork.py @@ -52,7 +52,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//div[@class="tags-list"]/a//i[@class="fa fa-folder-open"]/..') for genreLink in genres: genreName = genreLink.text_content().replace('Movies', '').strip() @@ -60,7 +59,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@id="video-actors"]//a') for actorLink in actors: actorName = actorLink.text_content().strip() diff --git a/Contents/Code/siteATKGirlfriends.py b/Contents/Code/siteATKGirlfriends.py index 25df0a904..ac7c25c95 100644 --- a/Contents/Code/siteATKGirlfriends.py +++ b/Contents/Code/siteATKGirlfriends.py @@ -84,7 +84,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actorName = sceneActor actorPhotoURL = '' @@ -92,7 +91,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Genres - movieGenres.clearGenres() movieGenres.addGenre('Girlfriend Experience') # If scenePage is valid, try to load it to scrape genres try: diff --git a/Contents/Code/siteAdultEmpire.py b/Contents/Code/siteAdultEmpire.py index 7bebb84c5..af3c13c43 100644 --- a/Contents/Code/siteAdultEmpire.py +++ b/Contents/Code/siteAdultEmpire.py @@ -265,13 +265,11 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//li//a[@label="Category"]'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = [] if splitScene: scenes = detailsPageElements.xpath('//div[@class="row"][.//h3]')[sceneIndex] @@ -294,7 +292,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Director(s) - movieActors.clearDirectors() directors = detailsPageElements.xpath('//div[./a[@name="cast"]]//li[./*[contains(., "Director")]]/a/text()') for directorLink in directors: directorName = directorLink.strip() @@ -307,7 +304,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addDirector(directorName, directorPhotoURL) # Producer(s) - movieActors.clearProducers() producers = detailsPageElements.xpath('//div[./a[@name="cast"]]//li[./*[contains(., "Producer")]]/text()') for producerLink in producers: producerName = producerLink.strip() diff --git a/Contents/Code/siteAlettaOceanLive.py b/Contents/Code/siteAlettaOceanLive.py index 16b9dae93..50eb5db1d 100644 --- a/Contents/Code/siteAlettaOceanLive.py +++ b/Contents/Code/siteAlettaOceanLive.py @@ -62,10 +62,8 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() # Actor(s) - movieActors.clearActors() movieActors.addActor('Aletta Ocean', '') # Posters diff --git a/Contents/Code/siteAllureMedia.py b/Contents/Code/siteAllureMedia.py index 599f191a5..24186f916 100644 --- a/Contents/Code/siteAllureMedia.py +++ b/Contents/Code/siteAllureMedia.py @@ -80,7 +80,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//span[@class="update_tags"]//a'): genreName = genreLink.text_content().strip('\n').lower() @@ -88,7 +87,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre('Amateur') # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="backgroundcolor_info"]//span[@class="update_models"]/a'): actorName = actorLink.text_content().strip() actorPhotoURL = '' diff --git a/Contents/Code/siteAlsAngels.py b/Contents/Code/siteAlsAngels.py index 77dd9990e..1b70fe5a2 100644 --- a/Contents/Code/siteAlsAngels.py +++ b/Contents/Code/siteAlsAngels.py @@ -69,11 +69,9 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() movieGenres.addGenre(subject) # Actor(s) - movieActors.clearActors() actorPhotoURL = detailsPageElements.xpath('.//div[@id="modelbioheadshot"]/img/@src')[0].replace('..', searchBaseUrl) movieActors.addActor(model, actorPhotoURL) diff --git a/Contents/Code/siteAmourAngels.py b/Contents/Code/siteAmourAngels.py index 95372b829..299d3405f 100644 --- a/Contents/Code/siteAmourAngels.py +++ b/Contents/Code/siteAmourAngels.py @@ -48,7 +48,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() movieGenres.addGenre('Softcore') movieGenres.addGenre('European Girls') @@ -60,7 +59,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//td[@class="modinfo"]//a'): actorName = actorLink.text_content().title().strip() actorPhotoURL = '' diff --git a/Contents/Code/siteAnalVids.py b/Contents/Code/siteAnalVids.py index 81c489431..7ac56137e 100644 --- a/Contents/Code/siteAnalVids.py +++ b/Contents/Code/siteAnalVids.py @@ -81,7 +81,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//div[contains(@class, "genres-list")]/a[contains(@href, "/genre/")]') for genreLink in genres: @@ -89,7 +88,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//a[contains(@href, "/model/") and not(contains(@href, "forum"))]') for actorLink in actors: actorName = actorLink.text_content() @@ -101,7 +99,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Director(s) - movieActors.clearDirectors() if tagline == 'Giorgio Grandi' or tagline == 'Giorgio\'s Lab': directorName = 'Giorgio Grandi' diff --git a/Contents/Code/siteAngelaWhite.py b/Contents/Code/siteAngelaWhite.py index 29dbc8ddf..274949a28 100644 --- a/Contents/Code/siteAngelaWhite.py +++ b/Contents/Code/siteAngelaWhite.py @@ -47,7 +47,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//meta[@name="keywords"]/@content')[0].replace('.', '').split(',') for genreLink in genres: genreName = genreLink.strip() @@ -59,7 +58,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actorstr = metadata.title.replace('BTS', '') actorstr = (''.join(i for i in list(actorstr) if not i.isdigit())).strip() actors = actorstr.split(' X ') diff --git a/Contents/Code/siteArchAngel.py b/Contents/Code/siteArchAngel.py index 2fc11209c..886f50917 100644 --- a/Contents/Code/siteArchAngel.py +++ b/Contents/Code/siteArchAngel.py @@ -40,7 +40,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(metadata.studio) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//ul[@class="tags"]//a'): genreName = genreLink.text_content().strip() @@ -54,7 +53,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="info"]/p/a'): actorName = actorLink.text_content().strip() actorPhotoURL = '' diff --git a/Contents/Code/siteAussieAss.py b/Contents/Code/siteAussieAss.py index d48bd72ee..b6fabccb7 100644 --- a/Contents/Code/siteAussieAss.py +++ b/Contents/Code/siteAussieAss.py @@ -114,7 +114,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(metadata.studio) # Actor(s) - movieActors.clearActors() if 'webmasters' in sceneURL: actors = detailsPageElements.xpath('//spam[@class="key-words"]//a') else: @@ -176,7 +175,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in genres.split(','): genreName = genreLink.strip() diff --git a/Contents/Code/siteBAMVisions.py b/Contents/Code/siteBAMVisions.py index e0a12faf1..fdb233c18 100644 --- a/Contents/Code/siteBAMVisions.py +++ b/Contents/Code/siteBAMVisions.py @@ -50,12 +50,10 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() movieGenres.addGenre('Anal') movieGenres.addGenre('Hardcore') # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="item-info"]/h5/a') for actorLink in actors: actorName = actorLink.text_content().strip() diff --git a/Contents/Code/siteBelAmi.py b/Contents/Code/siteBelAmi.py index 25ce2721d..f0b447d18 100644 --- a/Contents/Code/siteBelAmi.py +++ b/Contents/Code/siteBelAmi.py @@ -49,14 +49,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() labels = detailsPageElements.xpath('//div[contains(@class, "video_detail")]//span[contains(@id, "ContentPlaceHolder1_LabelTags")]//a') if labels: for label in labels: movieGenres.addGenre(label.text_content()) # Actor(s) - movieActors.clearActors() # Use div class="right" because the actors are actually listed twice on the page actors = detailsPageElements.xpath('//div[contains(@class, "video_detail")]//div[contains(@class, "right")]//div[contains(@class, "actors_list")]//div[contains(@class, "actor")]//a') actorName = '' diff --git a/Contents/Code/siteBlackPayBack.py b/Contents/Code/siteBlackPayBack.py index d41ba4164..3bd5bf587 100644 --- a/Contents/Code/siteBlackPayBack.py +++ b/Contents/Code/siteBlackPayBack.py @@ -67,14 +67,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="featuring clear"]//li[./a]'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in actors: actorName = actorLink.text_content().strip() actorPhotoURL = actorLink.xpath('.//img/@src')[0] diff --git a/Contents/Code/siteBoundHoneys.py b/Contents/Code/siteBoundHoneys.py index 94ded92b8..cb66b53ce 100755 --- a/Contents/Code/siteBoundHoneys.py +++ b/Contents/Code/siteBoundHoneys.py @@ -52,14 +52,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="updateCategoriesList"]/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="updateModelsList"]/a') if actors: if len(actors) == 3: diff --git a/Contents/Code/siteCaribbeancom.py b/Contents/Code/siteCaribbeancom.py index 1df3ee6c2..8673cbf64 100644 --- a/Contents/Code/siteCaribbeancom.py +++ b/Contents/Code/siteCaribbeancom.py @@ -40,14 +40,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() section = detailsPageElements.xpath('//a[@itemprop="actor"]') for actor_section in section: for actor_name in actor_section.xpath('//span[@itemprop="name"]')[0].text_content().split(','): movieActors.addActor(actor_name, "") # Genres - movieGenres.clearGenres() for genre_link in detailsPageElements.xpath('//a[@itemprop="genre"]'): genre_name = genre_link.text_content().strip() diff --git a/Contents/Code/siteClips4Sale.py b/Contents/Code/siteClips4Sale.py index c4c456b85..a58eea4cb 100644 --- a/Contents/Code/siteClips4Sale.py +++ b/Contents/Code/siteClips4Sale.py @@ -62,9 +62,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): req = PAutils.HTTPRequest(sceneURL) detailsPageElements = HTML.ElementFromString(req.text) - movieGenres.clearGenres() - movieActors.clearActors() - # Title metadata.title = getCleanTitle(detailsPageElements.xpath('//h3')[0].text_content()) diff --git a/Contents/Code/siteClubFilly.py b/Contents/Code/siteClubFilly.py index fc8888463..9d8168471 100644 --- a/Contents/Code/siteClubFilly.py +++ b/Contents/Code/siteClubFilly.py @@ -50,11 +50,9 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() movieGenres.addGenre('Lesbian') # Actor(s) - movieActors.clearActors() actorText = detailsPageElements.xpath('//p[@class="starring"]')[0].text_content().replace('Starring:', '').strip() actors = actorText.split(',') if len(actors) > 0: diff --git a/Contents/Code/siteColette.py b/Contents/Code/siteColette.py index fbd34c440..4b6d98bec 100644 --- a/Contents/Code/siteColette.py +++ b/Contents/Code/siteColette.py @@ -54,7 +54,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[contains(@class, "info")]/h2/a') for actorLink in actors: actorName = actorLink.text_content().strip() @@ -66,7 +65,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Genre - movieGenres.clearGenres() if actors: if len(actors) == 3: movieGenres.addGenre('Threesome') diff --git a/Contents/Code/siteCumLouder.py b/Contents/Code/siteCumLouder.py index c97151f6d..bbfb4387a 100644 --- a/Contents/Code/siteCumLouder.py +++ b/Contents/Code/siteCumLouder.py @@ -42,7 +42,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//ul[@class="tags"]/li/a'): genreName = genreLink.text_content().strip() @@ -72,7 +71,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//a[@class="pornstar-link"]') if actors: if len(actors) == 3: diff --git a/Contents/Code/siteCumbizz.py b/Contents/Code/siteCumbizz.py index 3f4c0ca50..2c4e9724b 100644 --- a/Contents/Code/siteCumbizz.py +++ b/Contents/Code/siteCumbizz.py @@ -41,14 +41,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//span[@class="label label-primary"]/a'): genreName = genreLink.text_content().strip().lower() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="breadcrumbs"]/a'): actorName = str(actorLink.text_content().strip()) actorPhotoURL = '' diff --git a/Contents/Code/siteDarkRoomVR.py b/Contents/Code/siteDarkRoomVR.py index 94a5a27e6..df0c312c9 100644 --- a/Contents/Code/siteDarkRoomVR.py +++ b/Contents/Code/siteDarkRoomVR.py @@ -48,14 +48,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div/a[@class="tags__item"]'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="video-info__text"]/a'): actorName = actorLink.text_content().strip() diff --git a/Contents/Code/siteData18Empire.py b/Contents/Code/siteData18Empire.py index 0f91868ed..34ea362d5 100644 --- a/Contents/Code/siteData18Empire.py +++ b/Contents/Code/siteData18Empire.py @@ -246,13 +246,11 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="categories"]/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = [] if splitScene: @@ -275,7 +273,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Director - movieActors.clearDirectors() director = detailsPageElements.xpath('//div[@class="director"]/a/text()') if director: directorLink = director[0].text_content().split(':')[2].strip() diff --git a/Contents/Code/siteData18Movies.py b/Contents/Code/siteData18Movies.py index 3e133b8b9..0cc930dc5 100644 --- a/Contents/Code/siteData18Movies.py +++ b/Contents/Code/siteData18Movies.py @@ -264,14 +264,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): pass # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//p[./b[contains(., "Categories")]]//a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//b[contains(., "Cast")]//following::div//a[contains(@href, "/pornstars/")]//img') actors.extend(detailsPageElements.xpath('//b[contains(., "Cast")]//following::div//img[contains(@data-original, "user")]')) actors.extend(detailsPageElements.xpath('//h3[contains(., "Cast")]//following::div[@style]//img')) @@ -286,7 +284,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Director - movieActors.clearDirectors() director = detailsPageElements.xpath('//p[./b[contains(., "Director")]]') if director: directorLink = director[0].text_content().split(':')[-1].split('-')[0].strip() diff --git a/Contents/Code/siteData18Scenes.py b/Contents/Code/siteData18Scenes.py index d5b576c65..f2bede5e5 100644 --- a/Contents/Code/siteData18Scenes.py +++ b/Contents/Code/siteData18Scenes.py @@ -235,14 +235,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[./b[contains(., "Categories")]]//a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//h3[contains(., "Cast")]//following::div[./p[contains(., "No Profile")]]//span[@class]/text()') actors.extend(detailsPageElements.xpath('//h3[contains(., "Cast")]//following::div//a[contains(@href, "/name/")]/img/@alt')) for actor in actors: diff --git a/Contents/Code/siteDesperateAmateurs.py b/Contents/Code/siteDesperateAmateurs.py index 991a0121b..f67842012 100644 --- a/Contents/Code/siteDesperateAmateurs.py +++ b/Contents/Code/siteDesperateAmateurs.py @@ -54,7 +54,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//a[starts-with(@href, "sets")]'): actorName = actorLink.text_content().strip() @@ -66,7 +65,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//a[starts-with(@href, "category")]'): genreName = genreLink.text_content().strip() diff --git a/Contents/Code/siteDickDrainers.py b/Contents/Code/siteDickDrainers.py index 99ca8f802..6c7d551ea 100644 --- a/Contents/Code/siteDickDrainers.py +++ b/Contents/Code/siteDickDrainers.py @@ -53,14 +53,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//li[contains(., "Tags")]//parent::ul//a'): genreName = PAutils.parseTitle(genreLink.text_content().strip(), siteNum) movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//li[@class="update_models"]') # Manually Add Actors diff --git a/Contents/Code/siteDorcelClub.py b/Contents/Code/siteDorcelClub.py index dff9ba0b9..2d97c9b06 100644 --- a/Contents/Code/siteDorcelClub.py +++ b/Contents/Code/siteDorcelClub.py @@ -72,7 +72,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() movieGenres.addGenre('French porn') movieName = detailsPageElements.xpath('//span[@class="movie"]/a') @@ -81,7 +80,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre('Blockbuster Movie') # Actor(s) - movieActors.clearActors() if 'porn-movie' not in sceneURL: actors = detailsPageElements.xpath('//div[@class="actress"]/a') else: @@ -103,7 +101,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Director - movieActors.clearDirectors() directorLink = detailsPageElements.xpath('//span[@class="director"]') if directorLink: directorName = directorLink[0].text_content().replace('Director :', '').strip() diff --git a/Contents/Code/siteDorcelVision.py b/Contents/Code/siteDorcelVision.py index 29f2841f8..565cbbf41 100644 --- a/Contents/Code/siteDorcelVision.py +++ b/Contents/Code/siteDorcelVision.py @@ -67,10 +67,8 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = year # Genres - movieGenres.clearGenres() # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[contains(@class, "casting")]//div[contains(@class, "slider-xl")]//div[@class="col-xs-2"]'): actorName = actorLink.xpath('.//a/strong')[0].text_content().strip() actorPhotoURL = actorLink.xpath('.//img/@data-src')[0] diff --git a/Contents/Code/siteElegantAngel.py b/Contents/Code/siteElegantAngel.py index d1068fcf7..8c08779a7 100644 --- a/Contents/Code/siteElegantAngel.py +++ b/Contents/Code/siteElegantAngel.py @@ -49,14 +49,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="categories"]/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="scene-cast-list"]/a | //div[@class="video-performer"]/a'): actorName = actorLink.text_content().strip() actorPhotoURL = '' @@ -73,7 +71,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Director(s) - movieActors.clearDirectors() try: directors = detailsPageElements.xpath('//div[@class="director"]/a') for directorLink in directors: diff --git a/Contents/Code/siteExpliciteArt.py b/Contents/Code/siteExpliciteArt.py index f53f58569..00eb49f14 100644 --- a/Contents/Code/siteExpliciteArt.py +++ b/Contents/Code/siteExpliciteArt.py @@ -39,14 +39,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//span[@class="tags"]/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="player-info-row"]/a'): actorName = actorLink.text_content().strip() diff --git a/Contents/Code/siteFamilyTherapy.py b/Contents/Code/siteFamilyTherapy.py index bb454602d..121c1d9c5 100644 --- a/Contents/Code/siteFamilyTherapy.py +++ b/Contents/Code/siteFamilyTherapy.py @@ -108,7 +108,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//a[@rel="category tag"]/text()') for tag in genres: movieGenres.addGenre(tag.strip()) @@ -121,7 +120,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="entry-content"]/p[contains(text(),"starring") or contains(text(), "Starring")]/text()'): actorName = re.search(r'(?<=[Ss]tarring\s)\w*\s\w*(\s&\s\w*\s\w*)*', actorLink).group() actorPhotoURL = '' diff --git a/Contents/Code/siteFemjoy.py b/Contents/Code/siteFemjoy.py index f81e4679a..8efe2fcc0 100644 --- a/Contents/Code/siteFemjoy.py +++ b/Contents/Code/siteFemjoy.py @@ -94,7 +94,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genres = [] for genreLink in genres: @@ -103,7 +102,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() if 'actors' in detailsPageElements: actors = detailsPageElements['actors'] if len(actors) == 3: @@ -130,7 +128,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Director - movieActors.clearDirectors() if 'directors' in detailsPageElements: for directorLink in detailsPageElements['directors']: directorName = directorLink['name'] diff --git a/Contents/Code/siteFinishesTheJob.py b/Contents/Code/siteFinishesTheJob.py index 668356a50..aa5e00891 100644 --- a/Contents/Code/siteFinishesTheJob.py +++ b/Contents/Code/siteFinishesTheJob.py @@ -60,7 +60,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//h3[contains(., "Starring")]//a') for actorLink in actors: actorName = actorLink.text_content().strip() @@ -68,7 +67,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//p[contains(., "Categories")]//a') for genreLink in genres: genreName = genreLink.text_content().strip() diff --git a/Contents/Code/siteFirstAnalQuest.py b/Contents/Code/siteFirstAnalQuest.py index 0185283e4..6cbfea741 100644 --- a/Contents/Code/siteFirstAnalQuest.py +++ b/Contents/Code/siteFirstAnalQuest.py @@ -50,14 +50,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="media-body"]/ul[3]/li/a'): genreName = genreLink.text_content() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//ul[contains(text(), "Models:")]/li/a') if len(actors) > 0: if 'porn-movie' not in sceneURL and len(actors) == 3: diff --git a/Contents/Code/siteFittingRoom.py b/Contents/Code/siteFittingRoom.py index d963664bf..3fe35c5f5 100644 --- a/Contents/Code/siteFittingRoom.py +++ b/Contents/Code/siteFittingRoom.py @@ -81,7 +81,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actorLink = detailsPageElements.xpath('//a[@class="model"]/div[1]/img')[0] actorName = actorLink.get('alt').strip() actorPhotoURL = actorLink.get('src').strip() @@ -89,7 +88,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//meta[@property="article:tag"]/@content'): genreName = genreLink.replace(actorName, '').strip().lower() diff --git a/Contents/Code/siteFuckingAwesome.py b/Contents/Code/siteFuckingAwesome.py index 957b9a60c..bef102ed1 100644 --- a/Contents/Code/siteFuckingAwesome.py +++ b/Contents/Code/siteFuckingAwesome.py @@ -51,14 +51,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="tags"]/ul/li/a'): genreName = genreLink.text_content().strip().lower() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="pornstarnames"]/ul/li/a[contains(@href, "pornstars")]') if actors: if len(actors) == 3: diff --git a/Contents/Code/siteGirlsOutWest.py b/Contents/Code/siteGirlsOutWest.py index 51b49ee85..b4c2acb4a 100644 --- a/Contents/Code/siteGirlsOutWest.py +++ b/Contents/Code/siteGirlsOutWest.py @@ -59,12 +59,10 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() movieGenres.addGenre('Amateur') movieGenres.addGenre('Australian') # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="trailer topSpace"]/div[2]/p/a') if actors: if len(actors) == 3: diff --git a/Contents/Code/siteGirlsRimming.py b/Contents/Code/siteGirlsRimming.py index e74921bb8..4e7bc91ea 100644 --- a/Contents/Code/siteGirlsRimming.py +++ b/Contents/Code/siteGirlsRimming.py @@ -58,7 +58,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() actors = [] genres = detailsPageElements.xpath('//meta[@name="keywords"]/@content')[0].split(',') @@ -72,7 +71,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre('Rim Job') # Actor(s) - movieActors.clearActors() for actorLink in actors: actorLink = actorLink.split(' Id ') actorName = actorLink[0].strip() diff --git a/Contents/Code/siteGloryHoleSecrets.py b/Contents/Code/siteGloryHoleSecrets.py index 89115b67f..a51dfc54c 100644 --- a/Contents/Code/siteGloryHoleSecrets.py +++ b/Contents/Code/siteGloryHoleSecrets.py @@ -57,14 +57,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//h5[@class="video_categories"]//a'): genreName = genreLink.text_content().strip().lower() if 'cumshots' not in genreName: movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="video_details mb mt0"]/h5[1]/a'): actorName = actorLink.text_content().strip() diff --git a/Contents/Code/siteHegre.py b/Contents/Code/siteHegre.py index da60c5747..1795da84c 100644 --- a/Contents/Code/siteHegre.py +++ b/Contents/Code/siteHegre.py @@ -66,14 +66,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//a[@class="tag"]'): genreName = genreLink.text_content().strip().lower() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//a[@class="record-model"]') if actors: if len(actors) == 3: @@ -90,7 +88,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Director - movieActors.clearDirectors() directorName = 'Petter Hegre' directorPhoto = 'https://img.discogs.com/TafxhnwJE2nhLodoB6UktY6m0xM=/fit-in/180x264/filters:strip_icc():format(jpeg):mode_rgb():quality(90)/discogs-images/A-2236724-1305622884.jpeg.jpg' movieActors.addDirector(directorName, directorPhoto) diff --git a/Contents/Code/siteHollyRandall.py b/Contents/Code/siteHollyRandall.py index a636b0f8d..01307e7e1 100644 --- a/Contents/Code/siteHollyRandall.py +++ b/Contents/Code/siteHollyRandall.py @@ -45,7 +45,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//ul[@class="tags"]/li/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) @@ -56,7 +55,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="info"]/p')[0].text_content().split('\n')[3].replace('Featuring:', '').split(',') for actorLink in actors: actorName = actorLink.strip() diff --git a/Contents/Code/siteHoloGirlsVR.py b/Contents/Code/siteHoloGirlsVR.py index 16eb2228d..16195379c 100644 --- a/Contents/Code/siteHoloGirlsVR.py +++ b/Contents/Code/siteHoloGirlsVR.py @@ -66,14 +66,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="videopage-tags"]/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="col-xs-6 col-sm-4 col-md-3"]'): actorName = actorLink.xpath('.//div[@class="vidpage-mobilePad"]//a//strong/text()')[0].strip() actorPhotoURL = '' diff --git a/Contents/Code/siteHotwifeXXX.py b/Contents/Code/siteHotwifeXXX.py index d43661eba..5bf3c8ff0 100644 --- a/Contents/Code/siteHotwifeXXX.py +++ b/Contents/Code/siteHotwifeXXX.py @@ -54,7 +54,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() # Release Date date = detailsPageElements.xpath('//div[@class="trailerInfo"]/div[@class="released2 trailerStarr"]')[0].text_content().strip().split(',')[0] @@ -64,7 +63,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="trailerMInfo"]//span[@class="tour_update_models"]/a') if actors: if len(actors) == 3: diff --git a/Contents/Code/siteHucows.py b/Contents/Code/siteHucows.py index 2ca5316b9..b23cf9626 100644 --- a/Contents/Code/siteHucows.py +++ b/Contents/Code/siteHucows.py @@ -65,7 +65,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): pass # Genres - movieGenres.clearGenres() # Default Genres genres = ['HuCows', 'Breasts', 'Nipples', 'Nipple Torture', 'Breast Torture', 'Fetish', 'BDSM'] @@ -79,7 +78,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//a[@rel="tag"]'): actorName = actorLink.text_content().strip() actorPhotoURL = '' diff --git a/Contents/Code/siteInTheCrack.py b/Contents/Code/siteInTheCrack.py index 635913e9d..1e4f6cc3d 100644 --- a/Contents/Code/siteInTheCrack.py +++ b/Contents/Code/siteInTheCrack.py @@ -69,7 +69,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() movieGenres.addGenre('Solo') # Release Date @@ -80,7 +79,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actorstr = detailsPageElements.xpath('//title')[0].text_content().split('#')[1] actorstr = (''.join(i for i in list(actorstr) if not i.isdigit())).strip() actorstr = actorstr.replace(',', '&') diff --git a/Contents/Code/siteInterracialPass.py b/Contents/Code/siteInterracialPass.py index 13789a7e0..9ace26b59 100644 --- a/Contents/Code/siteInterracialPass.py +++ b/Contents/Code/siteInterracialPass.py @@ -59,14 +59,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//ul[@class="tags"]//li//a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[contains(@class, "models-list-thumbs")]//li'): actorName = actorLink.xpath('.//span/text()')[0] actorPhotoURL = actorLink.xpath('.//img//@src0_3x')[0] diff --git a/Contents/Code/siteJAVDatabase.py b/Contents/Code/siteJAVDatabase.py index 2a63559dd..aa58a1f19 100644 --- a/Contents/Code/siteJAVDatabase.py +++ b/Contents/Code/siteJAVDatabase.py @@ -99,14 +99,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//tr[./td[contains(., "Genre")]]//td[@class="tablevalue"]//a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actor in detailsPageElements.xpath('//div/div[./h2[contains(., "Featured Idols")]]//div[@class="idol-thumb"]'): actorName = actor.xpath('.//@alt')[0].strip().split('(')[0].replace(')', '') actorPhotoURL = actor.xpath('.//img/@src')[0].replace('melody-marks', 'melody-hina-marks') @@ -122,7 +120,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Director - movieActors.clearDirectors() directorLink = detailsPageElements.xpath('//tr[./td[contains(., "Director")]]//td[@class="tablevalue"]') if directorLink: directorName = directorLink[0].text_content().strip() diff --git a/Contents/Code/siteJVRPorn.py b/Contents/Code/siteJVRPorn.py index 732f5f79a..5921bbe4a 100644 --- a/Contents/Code/siteJVRPorn.py +++ b/Contents/Code/siteJVRPorn.py @@ -66,14 +66,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//td[contains(@class, "tags")]//span'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//a[@class="actress"]//span'): actorName = actorLink.text_content().strip() actorPhotoURL = '' diff --git a/Contents/Code/siteJacquieEtMichel.py b/Contents/Code/siteJacquieEtMichel.py index 6bd647853..3a2f17f9d 100644 --- a/Contents/Code/siteJacquieEtMichel.py +++ b/Contents/Code/siteJacquieEtMichel.py @@ -63,7 +63,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="content-detail__row"]//li[@class="content-detail__tag"]'): genreName = genreLink.text_content().replace(',', '').strip() if genreName == 'Sodomy': @@ -80,7 +79,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() for actorLink in getJMTVActors(sceneURL): actorName = actorLink actorPhotoURL = '' diff --git a/Contents/Code/siteJavLibrary.py b/Contents/Code/siteJavLibrary.py index 7125de9cc..e39c429d7 100644 --- a/Contents/Code/siteJavLibrary.py +++ b/Contents/Code/siteJavLibrary.py @@ -93,7 +93,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add('Japan Adult Video') # Director - movieActors.clearDirectors() directorLink = detailsPageElements.xpath('//td[contains(text(), "Director:")]/following-sibling::td/span/a') if directorLink: directorName = directorLink[0].text_content().strip() @@ -108,7 +107,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() # Manually Add Actors By JAV ID actors = [] @@ -125,7 +123,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, '') # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//a[@rel="category tag"]'): genreName = genreLink.text_content().strip() diff --git a/Contents/Code/siteJulesJordan.py b/Contents/Code/siteJulesJordan.py index 2c54d50ae..566c19d2f 100644 --- a/Contents/Code/siteJulesJordan.py +++ b/Contents/Code/siteJulesJordan.py @@ -74,14 +74,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//span[contains(text(), "Categories")]/a'): genreName = genreLink.text_content().strip().lower() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() if PAsearchSites.getSearchSiteName(siteNum) == "GirlGirl": actors = detailsPageElements.xpath('//div[@class="item"]/span/div/a') else: diff --git a/Contents/Code/siteKarups.py b/Contents/Code/siteKarups.py index fd6b78474..f7bd13f5a 100644 --- a/Contents/Code/siteKarups.py +++ b/Contents/Code/siteKarups.py @@ -65,7 +65,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() if tagline == 'KarupsHA': genres = ['Amateur'] if tagline == 'KarupsPC': @@ -79,7 +78,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//span[@class="models"]//a'): actorName = actorLink.text_content().strip() diff --git a/Contents/Code/siteKillergram.py b/Contents/Code/siteKillergram.py index d66853a06..0e18e6b19 100644 --- a/Contents/Code/siteKillergram.py +++ b/Contents/Code/siteKillergram.py @@ -81,11 +81,9 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() movieGenres.addGenre('British') # Actor(s) - movieActors.clearActors() for actor in extractActors(detailsPageElements): movieActors.addActor(actor, '') diff --git a/Contents/Code/siteKin8tengoku.py b/Contents/Code/siteKin8tengoku.py index da474d107..8b090284b 100644 --- a/Contents/Code/siteKin8tengoku.py +++ b/Contents/Code/siteKin8tengoku.py @@ -79,14 +79,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//tr[./*[contains(., "Category")]]//a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//tr[./*[contains(., "Model")]]//a'): actorName = actorLink.text_content().strip() actorPhotoURL = '' diff --git a/Contents/Code/siteLethalHardcoreVR.py b/Contents/Code/siteLethalHardcoreVR.py index fc3cf6b3f..7156f3497 100644 --- a/Contents/Code/siteLethalHardcoreVR.py +++ b/Contents/Code/siteLethalHardcoreVR.py @@ -50,14 +50,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//meta[@name="Keywords"]/@content')[0].split(','): genreName = genreLink movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@id="bodyShotModal"]'): maybeActorName = actorLink.xpath('.//img/@title') if maybeActorName: diff --git a/Contents/Code/siteLittleCaprice.py b/Contents/Code/siteLittleCaprice.py index 53a68f1f9..7ec768a4f 100644 --- a/Contents/Code/siteLittleCaprice.py +++ b/Contents/Code/siteLittleCaprice.py @@ -45,7 +45,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.summary = detailsPageElements.xpath('//div[@class="desc-text"]')[0].text_content().strip() # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="project-tags"]/div[@class="list"]/a') + galleryPageElements.xpath('//div[@class="project-tags"]/div[@class="list"]/a'): genreName = genreLink.text_content().lower() @@ -88,7 +87,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="project-models"]//a') if actors: if len(actors) == 3: diff --git a/Contents/Code/siteLustReality.py b/Contents/Code/siteLustReality.py index 43473d1f3..bb7c93073 100644 --- a/Contents/Code/siteLustReality.py +++ b/Contents/Code/siteLustReality.py @@ -58,14 +58,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//a[contains(@href, "/list/category/")]'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//a[contains(@href, "/pornstars/model/")]'): actorPageURL = PAsearchSites.getSearchBaseURL(siteNum) + actorLink.get('href') req = PAutils.HTTPRequest(actorPageURL) diff --git a/Contents/Code/siteLustomic.py b/Contents/Code/siteLustomic.py index d66749db6..e54e8045f 100644 --- a/Contents/Code/siteLustomic.py +++ b/Contents/Code/siteLustomic.py @@ -50,10 +50,8 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//p[contains(text(), "Starring")]/span')[0].text_content().split(';') if actors: if len(actors) == 3: diff --git a/Contents/Code/siteManyvids.py b/Contents/Code/siteManyvids.py index afe978189..2926f31ce 100644 --- a/Contents/Code/siteManyvids.py +++ b/Contents/Code/siteManyvids.py @@ -71,14 +71,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in videoPageElements['tags']: genreName = genreLink.strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actorName = detailsPageElements.xpath('//a[contains(@class, "username ")]')[0].text_content() actorPhotoURL = '' diff --git a/Contents/Code/siteMeanaWolf.py b/Contents/Code/siteMeanaWolf.py index d4143cebf..ecda8d028 100644 --- a/Contents/Code/siteMeanaWolf.py +++ b/Contents/Code/siteMeanaWolf.py @@ -48,8 +48,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieActors.clearActors() - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="videoContent"]/ul/li[position()=last()]/a'): genreName = genreLink.text_content().strip() diff --git a/Contents/Code/siteMelenaMariaRya.py b/Contents/Code/siteMelenaMariaRya.py index 109f3907d..842fa5daf 100644 --- a/Contents/Code/siteMelenaMariaRya.py +++ b/Contents/Code/siteMelenaMariaRya.py @@ -63,11 +63,9 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() movieGenres.addGenre('European') # Actor(s) - movieActors.clearActors() movieActors.addActor('Melena Maria Rya', '') # with..? diff --git a/Contents/Code/siteMilfVR.py b/Contents/Code/siteMilfVR.py index 2f15e5bd4..a0923ba85 100644 --- a/Contents/Code/siteMilfVR.py +++ b/Contents/Code/siteMilfVR.py @@ -74,7 +74,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//div[contains(@class, "tag-list")]//a') for genreLink in genres: genreName = genreLink.text_content().strip() @@ -82,7 +81,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) / possible posters - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="detail__models"]//a') for actorLink in actors: actorName = actorLink.text_content().strip() diff --git a/Contents/Code/siteMissaX.py b/Contents/Code/siteMissaX.py index 887f69fd5..3f0ee1f18 100644 --- a/Contents/Code/siteMissaX.py +++ b/Contents/Code/siteMissaX.py @@ -73,7 +73,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="update_block"]//span[@class="tour_update_models"]//a | //p[@class="dvd-scenes__data"][1]//a') for actorLink in actors: actorName = actorLink.text_content().strip() @@ -94,7 +93,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//span[contains(@class, "update_tags")]//a | //p[@class="dvd-scenes__data"][2]//a') for genreLink in genres: genreName = genreLink.text_content() diff --git a/Contents/Code/siteMomComesFirst.py b/Contents/Code/siteMomComesFirst.py index c7852567b..bb3761a7c 100644 --- a/Contents/Code/siteMomComesFirst.py +++ b/Contents/Code/siteMomComesFirst.py @@ -61,7 +61,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() actors = [] for genreLink in detailsPageElements.xpath('//a[contains(@rel, "tag")]'): genreName = PAutils.parseTitle(genreLink.text_content().strip(), siteNum) @@ -74,7 +73,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() try: actorSubtitle = detailsPageElements.xpath('//div[@class="entry-content"]/p')[-1] if 'starring' in actorSubtitle.text_content().lower(): diff --git a/Contents/Code/siteMomPOV.py b/Contents/Code/siteMomPOV.py index aa2b96892..01b97dbfc 100644 --- a/Contents/Code/siteMomPOV.py +++ b/Contents/Code/siteMomPOV.py @@ -58,11 +58,9 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() movieGenres.addGenre('MILF') # Actor(s) - movieActors.clearActors() # Posters xpaths = [ diff --git a/Contents/Code/siteMormonGirlz.py b/Contents/Code/siteMormonGirlz.py index 7c7c2bc4e..ee2fd5944 100644 --- a/Contents/Code/siteMormonGirlz.py +++ b/Contents/Code/siteMormonGirlz.py @@ -53,7 +53,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() xpaths = [ '//h1[contains(text(), "more of") and not(contains(text(), "Mormon Girls"))]' ] @@ -64,7 +63,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() # Posters xpaths = [ diff --git a/Contents/Code/siteMyDirtyHobby.py b/Contents/Code/siteMyDirtyHobby.py index c20863c5d..7c7e89ccf 100644 --- a/Contents/Code/siteMyDirtyHobby.py +++ b/Contents/Code/siteMyDirtyHobby.py @@ -72,14 +72,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//dd/a[@title and contains(@href, "/videos/")]'): genreName = genreLink.text_content().strip().lower() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[contains(@class, "profile-head-wrapper")]'): actorName = actorLink.xpath('.//span[contains(@class, "profile")]')[0].text_content().strip() actorPhotoURL = actorLink.xpath('.//div[@id="profile-avatar"]//img/@src')[0] diff --git a/Contents/Code/siteNaughtyAmerica.py b/Contents/Code/siteNaughtyAmerica.py index 1686e4176..c10527ad2 100644 --- a/Contents/Code/siteNaughtyAmerica.py +++ b/Contents/Code/siteNaughtyAmerica.py @@ -126,14 +126,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements['fantasies']: genreName = genreLink movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements['performers']: actorName = actorLink actorPhotoURL = '' diff --git a/Contents/Code/siteNewSensations.py b/Contents/Code/siteNewSensations.py index be58c5a44..8dc2860c9 100644 --- a/Contents/Code/siteNewSensations.py +++ b/Contents/Code/siteNewSensations.py @@ -48,9 +48,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): else: sceneType = 'Scene' - movieGenres.clearGenres() - movieActors.clearActors() - # Studio metadata.studio = 'New Sensations' diff --git a/Contents/Code/siteNewSensationsOther.py b/Contents/Code/siteNewSensationsOther.py index 5a542eeb4..9f38f9aa7 100644 --- a/Contents/Code/siteNewSensationsOther.py +++ b/Contents/Code/siteNewSensationsOther.py @@ -56,14 +56,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//span[@class="update_tags"]/a'): genreName = PAutils.parseTitle(genreLink.text_content().replace('-', '').strip(), siteNum) movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//span[@class="update_models"]/a'): actorName = actorLink.text_content().strip() diff --git a/Contents/Code/sitePJGirls.py b/Contents/Code/sitePJGirls.py index 64e6eabd3..fa68afa4a 100644 --- a/Contents/Code/sitePJGirls.py +++ b/Contents/Code/sitePJGirls.py @@ -50,14 +50,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="detailTagy clear"]/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="info"]/h3[3]/a'): actorName = actorLink.text_content().strip() actorPhotoURL = '' diff --git a/Contents/Code/sitePOVR.py b/Contents/Code/sitePOVR.py index f5a6d681d..e1de0a020 100644 --- a/Contents/Code/sitePOVR.py +++ b/Contents/Code/sitePOVR.py @@ -48,7 +48,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() for actor_link in scene_data['actor']: actor_name = actor_link['name'] actor_page = actor_link['@id'] @@ -60,7 +59,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actor_name, actor_photo_url) # Genres - movieGenres.clearGenres() for genre_link in detailsPageElements.xpath('//ul[@class="category-link mb-2"]/li/a'): genre_name = genre_link.text_content().strip() movieGenres.addGenre(genre_name) diff --git a/Contents/Code/sitePenthouseGold.py b/Contents/Code/sitePenthouseGold.py index 6059e6a99..0b3697105 100644 --- a/Contents/Code/sitePenthouseGold.py +++ b/Contents/Code/sitePenthouseGold.py @@ -66,7 +66,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): pass # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//ul[contains(@class, "scene-tags")]/li'): genreName = genreLink.xpath('.//a')[0].text_content().lower() @@ -84,7 +83,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() for actorPage in detailsPageElements.xpath('//ul[@id="featured_pornstars"]//div[@class="model"]'): actorName = actorPage.xpath('.//h3')[0].text_content().strip() actorPhotoURL = actorPage.xpath('.//img/@src')[0] diff --git a/Contents/Code/sitePlayboyPlus.py b/Contents/Code/sitePlayboyPlus.py index 58ce46846..008254c75 100644 --- a/Contents/Code/sitePlayboyPlus.py +++ b/Contents/Code/sitePlayboyPlus.py @@ -50,11 +50,9 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() movieGenres.addGenre('Glamour') # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//p[@class="contributorName"]//a'): actorName = actorLink.text_content().strip() actorPhotoURL = '' diff --git a/Contents/Code/sitePlumperPass.py b/Contents/Code/sitePlumperPass.py index e3a386368..104662a09 100644 --- a/Contents/Code/sitePlumperPass.py +++ b/Contents/Code/sitePlumperPass.py @@ -94,7 +94,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() if detailsPageElements.xpath('//p[@class="tags clearfix"]/a/text()'): genres = detailsPageElements.xpath('//p[@class="tags clearfix"]/a/text()') else: @@ -105,7 +104,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//h3[@class="releases"]/a') if actors: if len(actors) == 3: diff --git a/Contents/Code/sitePorndoePremium.py b/Contents/Code/sitePorndoePremium.py index 7698dfde1..93f272493 100644 --- a/Contents/Code/sitePorndoePremium.py +++ b/Contents/Code/sitePorndoePremium.py @@ -45,7 +45,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//span[@class="-mvd-list-item"]/a'): genreName = genreLink.text_content().strip() @@ -60,7 +59,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="-mvd-grid-actors"]/span/a[@title]'): actorName = '' actorPhotoURL = '' diff --git a/Contents/Code/sitePornstarPlatinum.py b/Contents/Code/sitePornstarPlatinum.py index 03ddfd30f..270214647 100644 --- a/Contents/Code/sitePornstarPlatinum.py +++ b/Contents/Code/sitePornstarPlatinum.py @@ -50,7 +50,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="tagcloud"]/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) @@ -61,7 +60,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actorName = PAutils.Decode(metadata_id[5]) actorPhotoURL = '' diff --git a/Contents/Code/sitePrivate.py b/Contents/Code/sitePrivate.py index 6161aa72a..44245d7fe 100644 --- a/Contents/Code/sitePrivate.py +++ b/Contents/Code/sitePrivate.py @@ -67,7 +67,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//li[@class="tag-tags"]//a'): genreName = genreLink.text_content().lower() @@ -87,7 +86,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() for actorPage in detailsPageElements.xpath('//li[@class="tag-models"]//a'): actorName = actorPage.text_content() diff --git a/Contents/Code/sitePuba.py b/Contents/Code/sitePuba.py index 49103f2d4..2a7a10105 100644 --- a/Contents/Code/sitePuba.py +++ b/Contents/Code/sitePuba.py @@ -51,14 +51,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(metadata.studio) # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//center//div//a[contains(@class, "btn-outline-secondary")]') for genre in genres: genreName = genre.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//center//div//a[contains(@class, "btn-secondary")]') for actor in actors: actorName = actor.text_content().strip() diff --git a/Contents/Code/sitePurgatoryX.py b/Contents/Code/sitePurgatoryX.py index 5d678a8d9..4513a2d78 100644 --- a/Contents/Code/sitePurgatoryX.py +++ b/Contents/Code/sitePurgatoryX.py @@ -85,14 +85,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//meta[@name="keywords"]/@content')[0].split(','): genreName = genreLink.strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="model-wrap"]//li') if actors: if len(actors) == 3: diff --git a/Contents/Code/sitePutalocura.py b/Contents/Code/sitePutalocura.py index 6e023f028..fe10d2f7f 100644 --- a/Contents/Code/sitePutalocura.py +++ b/Contents/Code/sitePutalocura.py @@ -69,14 +69,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="categories"]/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() if '/en/' in sceneURL: if '&' in metadata.title: actors = metadata.title.split('&') diff --git a/Contents/Code/siteQueenSnake.py b/Contents/Code/siteQueenSnake.py index 74f6e9e52..f832f20c5 100644 --- a/Contents/Code/siteQueenSnake.py +++ b/Contents/Code/siteQueenSnake.py @@ -69,7 +69,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): pass # Genres - movieGenres.clearGenres() # Default Genres genres = ['BDSM', 'S&M'] @@ -82,7 +81,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() siteActors = [ 'abby', 'briana', 'david', 'diamond', 'greta', 'hellia', 'hilda', 'holly', 'jade', 'jeby', 'jessica', 'keya', 'lilith', diff --git a/Contents/Code/siteRealityLovers.py b/Contents/Code/siteRealityLovers.py index e8cea1a79..1beed74c7 100644 --- a/Contents/Code/siteRealityLovers.py +++ b/Contents/Code/siteRealityLovers.py @@ -36,9 +36,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): req = PAutils.HTTPRequest(sceneURL) detailsPageElements = HTML.ElementFromString(req.text) - movieGenres.clearGenres() - movieActors.clearActors() - # Title metadata.title = detailsPageElements.xpath('//h1[@class="video-detail-name"]')[0].text_content().strip() diff --git a/Contents/Code/siteReidMyLips.py b/Contents/Code/siteReidMyLips.py index 65cc7b826..743a95ca5 100644 --- a/Contents/Code/siteReidMyLips.py +++ b/Contents/Code/siteReidMyLips.py @@ -50,14 +50,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//span[@class="update_tags"]//a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actorName = 'Riley Reid' actorPhotoURL = '' diff --git a/Contents/Code/siteSINematica.py b/Contents/Code/siteSINematica.py index cf9149574..1b291b1c8 100644 --- a/Contents/Code/siteSINematica.py +++ b/Contents/Code/siteSINematica.py @@ -52,13 +52,11 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(studio) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="tags"]/a'): genreName = genreLink.text_content().strip().lower() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="video-performer"]/a'): actorName = actorLink.text_content().strip() movieActors.addActor(actorName, '') diff --git a/Contents/Code/siteScrewMeToo.py b/Contents/Code/siteScrewMeToo.py index 067846112..81f767f4a 100644 --- a/Contents/Code/siteScrewMeToo.py +++ b/Contents/Code/siteScrewMeToo.py @@ -36,9 +36,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): req = PAutils.HTTPRequest(sceneURL) detailsPageElements = HTML.ElementFromString(req.text) - movieGenres.clearGenres() - movieActors.clearActors() - # Title metadata.title = detailsPageElements.xpath('//h1')[0].text_content() diff --git a/Contents/Code/siteScrewbox.py b/Contents/Code/siteScrewbox.py index caaa414f6..d302db232 100644 --- a/Contents/Code/siteScrewbox.py +++ b/Contents/Code/siteScrewbox.py @@ -48,14 +48,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//ul[@class="more-info"]//li[3]//a'): genreName = genreLink.text_content().title() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//ul[@class="more-info"]//li[1]//a'): actorName = actorLink.text_content().strip().title() diff --git a/Contents/Code/siteSexLikeReal.py b/Contents/Code/siteSexLikeReal.py index 103bb418f..7c6952aa2 100644 --- a/Contents/Code/siteSexLikeReal.py +++ b/Contents/Code/siteSexLikeReal.py @@ -58,12 +58,10 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreName in detailsPageElements.xpath('//meta[@property="video:tag"]/@content'): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//meta[@property="video:actor"]/@content') for actorName in actors: actorLink = '/pornstars/' + actorName.replace(' ', '-').lower() diff --git a/Contents/Code/siteSexMex.py b/Contents/Code/siteSexMex.py index e2b038d02..ecc198fb5 100644 --- a/Contents/Code/siteSexMex.py +++ b/Contents/Code/siteSexMex.py @@ -53,14 +53,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//meta[@name="keywords"]/@content')[0].split(','): genreName = genreLink.strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//p[@class]/a'): actorName = actorLink.text_content().strip() diff --git a/Contents/Code/siteSicflics.py b/Contents/Code/siteSicflics.py index 4017bdf14..7a407068c 100644 --- a/Contents/Code/siteSicflics.py +++ b/Contents/Code/siteSicflics.py @@ -67,7 +67,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="vidwrap"]/p/a'): genreName = genreLink.text_content().replace('#', '').strip() @@ -81,7 +80,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() description = description.encode('ascii', 'replace') actorName = re.split(r'[\'?]', description)[1].strip() actorPhotoURL = '' diff --git a/Contents/Code/siteSinsLife.py b/Contents/Code/siteSinsLife.py index 5e55946cf..87e058577 100644 --- a/Contents/Code/siteSinsLife.py +++ b/Contents/Code/siteSinsLife.py @@ -24,8 +24,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): req = PAutils.HTTPRequest(sceneURL) detailsPageElements = HTML.ElementFromString(req.text) - movieGenres.clearGenres() - # Title metadata.title = detailsPageElements.xpath('//div[@class="section"]//h1')[0].text_content().strip().title() @@ -48,7 +46,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[4]/div/div[2]/div/div/div[2]/div[3]/ul/li/a/..') if actors: if len(actors) == 3: diff --git a/Contents/Code/siteSpizoo.py b/Contents/Code/siteSpizoo.py index 66adb2c1d..7194923b2 100644 --- a/Contents/Code/siteSpizoo.py +++ b/Contents/Code/siteSpizoo.py @@ -69,7 +69,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//div[@class="categories-holder"]/a|//div[./h3[contains(., "Categories")]]/a') if genres: for genreLink in genres: @@ -78,7 +77,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() if siteNum == 1374: xPath = '//div[./h3[contains(., "Girls")]]/a' elif siteNum == 577: diff --git a/Contents/Code/siteStasyQ.py b/Contents/Code/siteStasyQ.py index 401e3d284..96693d85e 100644 --- a/Contents/Code/siteStasyQ.py +++ b/Contents/Code/siteStasyQ.py @@ -61,14 +61,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//section[contains(@class, "about-section")]//div[contains(@class, "tags")]//a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//section[contains(@class, "content-section")]//div[contains(@class, "release-card__model")]//a'): actorName = actorLink.text_content().strip() actorPhotoURL = '' diff --git a/Contents/Code/siteStepSecrets.py b/Contents/Code/siteStepSecrets.py index 44eb29fa7..cd8b72ed4 100644 --- a/Contents/Code/siteStepSecrets.py +++ b/Contents/Code/siteStepSecrets.py @@ -47,14 +47,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(tagline) # Genres - movieGenres.clearGenres() for genreLink in ['European', 'Taboo', 'Glamcore']: genreName = genreLink movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//p[@class="mb-2"]//a'): actorPageURL = PAsearchSites.getSearchBaseURL(siteNum) + actorLink.get('href') req = PAutils.HTTPRequest(actorPageURL) diff --git a/Contents/Code/siteStraplezz.py b/Contents/Code/siteStraplezz.py index 1273ff5f9..905305448 100644 --- a/Contents/Code/siteStraplezz.py +++ b/Contents/Code/siteStraplezz.py @@ -51,7 +51,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//li[@class="list-inline-item tag"]/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) @@ -59,7 +58,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre('Lesbian') # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="card model m-0"]/a') if actors: if len(actors) == 3: diff --git a/Contents/Code/siteStraponCum.py b/Contents/Code/siteStraponCum.py index 2762eb3cc..978022fa1 100644 --- a/Contents/Code/siteStraponCum.py +++ b/Contents/Code/siteStraponCum.py @@ -53,7 +53,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() movieGenres.addGenre('Strap-On') movieGenres.addGenre('Lesbian') for genreLink in detailsPageElements.xpath('//div[contains(@class, "tag-cloud")]//a'): @@ -61,7 +60,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="card"]//span[contains(text(), "Featuring:")]/following-sibling::a') if actors: if len(actors) == 3: diff --git a/Contents/Code/siteSunnyLaneLive.py b/Contents/Code/siteSunnyLaneLive.py index 9aedf7a00..f64741230 100644 --- a/Contents/Code/siteSunnyLaneLive.py +++ b/Contents/Code/siteSunnyLaneLive.py @@ -70,7 +70,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//h4')[0].text_content().split(',') for genreLink in genres: genreName = genreLink.strip() @@ -78,7 +77,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="customcontent"]//h3')[0].text_content().split(',') for actorLink in actors: actorName = actorLink.replace(' ', '').strip() diff --git a/Contents/Code/siteSwallowBay.py b/Contents/Code/siteSwallowBay.py index 684961b47..9dcf7c290 100644 --- a/Contents/Code/siteSwallowBay.py +++ b/Contents/Code/siteSwallowBay.py @@ -45,7 +45,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() section = detailsPageElements.xpath('//div[@class="content-models"]/a') for actor_section in section: actor_name = actor_section.get('title') @@ -55,7 +54,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actor_name, actor_photo_URL) # Genres - movieGenres.clearGenres() for genre_link in detailsPageElements.xpath('//div[@class="box"]/a'): genre_name = genre_link.text_content().strip() diff --git a/Contents/Code/siteTeenyTaboo.py b/Contents/Code/siteTeenyTaboo.py index 15fdbd0cc..9b5a03d6e 100644 --- a/Contents/Code/siteTeenyTaboo.py +++ b/Contents/Code/siteTeenyTaboo.py @@ -76,14 +76,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//h4[@class="customhcolor"]')[0].text_content().split(','): genreName = genreLink.strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = re.split(r',|\sand\s', detailsPageElements.xpath('//h3')[0].text_content()) for actorLink in actors: actorName = re.sub(r'\d', '', actorLink).strip().replace(' ', '') diff --git a/Contents/Code/siteTonightsGirlfriend.py b/Contents/Code/siteTonightsGirlfriend.py index a8e956bab..52850c237 100644 --- a/Contents/Code/siteTonightsGirlfriend.py +++ b/Contents/Code/siteTonightsGirlfriend.py @@ -43,7 +43,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): detailsPageElements = HTML.ElementFromString(req.text) # Actor(s) - movieActors.clearActors() actorList = [] actors = detailsPageElements.xpath('//p[@class="grey-performers"]//a') @@ -97,7 +96,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Genres - movieGenres.clearGenres() genres = ['Girlfriend Experience', 'Pornstar', 'Hotel', 'Pornstar Experience'] if (len(actors) + len(maleActors)) == 3: genres.append('Threesome') diff --git a/Contents/Code/siteToughLoveX.py b/Contents/Code/siteToughLoveX.py index cee3dbf24..a4eb1ed3e 100644 --- a/Contents/Code/siteToughLoveX.py +++ b/Contents/Code/siteToughLoveX.py @@ -69,7 +69,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//dd[1]') for actorLink in actors: @@ -86,7 +85,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): pass # Director - movieActors.clearDirectors() directorName = 'Charles Dera' movieActors.addDirector(directorName, '') diff --git a/Contents/Code/siteTrueAmateurs.py b/Contents/Code/siteTrueAmateurs.py index 1569e2e12..b0f571f56 100644 --- a/Contents/Code/siteTrueAmateurs.py +++ b/Contents/Code/siteTrueAmateurs.py @@ -34,9 +34,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): req = PAutils.HTTPRequest(sceneURL) detailsPageElements = HTML.ElementFromString(req.text) - movieGenres.clearGenres() - movieActors.clearActors() - # Title metadata.title = detailsPageElements.xpath('//h2[@class="wxt7nk-4 fSsARZ"]')[0].text_content().replace('SML-', '').replace('Trailer', '').strip() diff --git a/Contents/Code/siteTwoTGirls.py b/Contents/Code/siteTwoTGirls.py index 3cc4fe962..331745695 100644 --- a/Contents/Code/siteTwoTGirls.py +++ b/Contents/Code/siteTwoTGirls.py @@ -63,14 +63,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//p[@class="video-tags"]//a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//p[@class="video-date"]/a') if len(actors) > 0: if len(actors) == 3: diff --git a/Contents/Code/siteUltrafilms.py b/Contents/Code/siteUltrafilms.py index c865791cb..5fe99a79d 100644 --- a/Contents/Code/siteUltrafilms.py +++ b/Contents/Code/siteUltrafilms.py @@ -83,7 +83,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@id="video-actors"]//a') if actors: diff --git a/Contents/Code/siteVIPissy.py b/Contents/Code/siteVIPissy.py index b599d674e..998cdbcbf 100644 --- a/Contents/Code/siteVIPissy.py +++ b/Contents/Code/siteVIPissy.py @@ -51,14 +51,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div/section[4]/div/p/a'): genreName = genreLink.text_content().strip().lower() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div/section[2]/dl/dd[1]/a') if actors: if len(actors) == 3: diff --git a/Contents/Code/siteVRAllure.py b/Contents/Code/siteVRAllure.py index 179a97c85..e9cd3d24d 100644 --- a/Contents/Code/siteVRAllure.py +++ b/Contents/Code/siteVRAllure.py @@ -51,7 +51,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//a[contains(@class, "label label-tag")]') for genreLink in genres: genreName = genreLink.text_content().strip() @@ -59,7 +58,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//p[@class="model-name"]//a[contains(@href, "/models/")]'): actorName = actorLink.text_content().strip() diff --git a/Contents/Code/siteVRBangers.py b/Contents/Code/siteVRBangers.py index 860226778..48e26f274 100644 --- a/Contents/Code/siteVRBangers.py +++ b/Contents/Code/siteVRBangers.py @@ -54,13 +54,11 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements['categories']: genreName = genreLink['name'] movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements['models']: actorName = actorLink['title'] actorPhotoURL = '' diff --git a/Contents/Code/siteVRConk.py b/Contents/Code/siteVRConk.py index fdef7dcd1..8fc007dd9 100644 --- a/Contents/Code/siteVRConk.py +++ b/Contents/Code/siteVRConk.py @@ -54,13 +54,11 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements['categories']: genreName = genreLink['name'] movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements['models']: actorName = actorLink['title'] actorPhotoURL = basePath + '/model/' + actorLink['slug'] diff --git a/Contents/Code/siteVRHush.py b/Contents/Code/siteVRHush.py index 858d71629..576badadf 100644 --- a/Contents/Code/siteVRHush.py +++ b/Contents/Code/siteVRHush.py @@ -51,7 +51,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//a[contains(@class, "label")]') for genreLink in genres: genreName = genreLink.text_content().strip() @@ -59,7 +58,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//h5[@class="latest-scene-subtitle"]//a[contains(@href, "/models/")]'): actorName = actorLink.text_content().strip() diff --git a/Contents/Code/siteVRLatina.py b/Contents/Code/siteVRLatina.py index b50b5a3e2..f964076f7 100644 --- a/Contents/Code/siteVRLatina.py +++ b/Contents/Code/siteVRLatina.py @@ -54,14 +54,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[(contains(@class, "content-links -tags"))]/a'): genreName = genreLink.get('title') movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[(contains(@class, "content-links -models"))]/a'): actorName = actorLink.get('title') diff --git a/Contents/Code/siteVRPFilms.py b/Contents/Code/siteVRPFilms.py index 02c3ee94a..d61523bf9 100644 --- a/Contents/Code/siteVRPFilms.py +++ b/Contents/Code/siteVRPFilms.py @@ -40,14 +40,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(metadata.studio) # Actor(s) - movieActors.clearActors() for actor in detailsPageElements.xpath('//a[@class="starring_contain"]'): actorName = actor.xpath('//div[@class="col-xs-12 video-star-title"]/h3')[0].text_content().strip() actorPhotoURL = actor.xpath('//div[@class="starring_image"]/@style')[0].split('url(')[1].split(')')[0].replace("'", "") movieActors.addActor(actorName, actorPhotoURL) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="single__download tags"]')[0].text_content().strip().split(', '): movieGenres.addGenre(genreLink) diff --git a/Contents/Code/siteVirtualPorn.py b/Contents/Code/siteVirtualPorn.py index d4de93f47..83bae4b8b 100644 --- a/Contents/Code/siteVirtualPorn.py +++ b/Contents/Code/siteVirtualPorn.py @@ -66,7 +66,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genres = detailsPageElements.xpath('//meta[@name="keywords"]/@content')[0] for genreLink in genres.split(','): genreName = genreLink.strip() @@ -74,7 +73,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//p[@class="player__stats__cast"]/a'): actorName = actorLink.text_content().strip() actorPageSlug = actorLink.get('href') diff --git a/Contents/Code/siteVirtualReal.py b/Contents/Code/siteVirtualReal.py index b185fdbbd..527edfc38 100644 --- a/Contents/Code/siteVirtualReal.py +++ b/Contents/Code/siteVirtualReal.py @@ -59,14 +59,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in sceneData['keywords'].split(','): genreName = genreLink.strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in sceneData['actors']: actorName = actorLink['name'] actorPhotoURL = detailsPageElements.xpath('//div[@class="performerItem"]//a[@href="%s"]//img/@src' % actorLink['url'])[0] diff --git a/Contents/Code/siteVirtualTaboo.py b/Contents/Code/siteVirtualTaboo.py index c91708c0f..24954e3de 100644 --- a/Contents/Code/siteVirtualTaboo.py +++ b/Contents/Code/siteVirtualTaboo.py @@ -50,14 +50,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.summary = detailsPageElements.xpath('//p[@class="description"]')[0].text_content().strip() # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[contains(@class, "tag-list")]'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[contains(@class, "right-info")]//div[contains(@class, "info")]//a'): actorName = actorLink.text_content().strip() actorPhotoURL = '' diff --git a/Contents/Code/siteVivid.py b/Contents/Code/siteVivid.py index 94fce3462..33286f1b5 100644 --- a/Contents/Code/siteVivid.py +++ b/Contents/Code/siteVivid.py @@ -58,14 +58,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//h5[contains(text(), "Categories:")]/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//h4[contains(text(), "Starring:")]/a'): actorName = actorLink.text_content().strip() actorPhotoURL = '' diff --git a/Contents/Code/siteVogoV.py b/Contents/Code/siteVogoV.py index bd1a05656..2bf572e80 100644 --- a/Contents/Code/siteVogoV.py +++ b/Contents/Code/siteVogoV.py @@ -58,7 +58,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="info-video-models"]//a') for actorLink in actors: actorName = actorLink.text_content() @@ -71,7 +70,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Director - movieActors.clearDirectors() directorName = 'Markus Dupree' movieActors.addDirector(directorName, '') diff --git a/Contents/Code/siteWUNF.py b/Contents/Code/siteWUNF.py index ea34a8969..7d57240fb 100644 --- a/Contents/Code/siteWUNF.py +++ b/Contents/Code/siteWUNF.py @@ -35,7 +35,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(metadata.studio) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="tags"]//a'): genreName = genreLink.text_content().strip() @@ -48,7 +47,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[@class="starring"]//a[@class="item"]') for actorLink in actors: diff --git a/Contents/Code/siteWatch4Beauty.py b/Contents/Code/siteWatch4Beauty.py index e25cd6335..17e81192c 100644 --- a/Contents/Code/siteWatch4Beauty.py +++ b/Contents/Code/siteWatch4Beauty.py @@ -85,7 +85,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.studio = 'Watch4Beauty' # Director - movieActors.clearDirectors() directorName = 'Mark' movieActors.addDirector(directorName, '') @@ -100,14 +99,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() genreText = scene.get('issue_tags') if genreText: for genreName in genreText.split(', '): movieGenres.addGenre(genreName.strip()) # Actor(s) - movieActors.clearActors() # Posters artPrefix = w4bArtUrl() + dateObj.strftime('%Y%m%d') diff --git a/Contents/Code/siteWeAreHairy.py b/Contents/Code/siteWeAreHairy.py index 5fdd79e41..b57435147 100644 --- a/Contents/Code/siteWeAreHairy.py +++ b/Contents/Code/siteWeAreHairy.py @@ -50,7 +50,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="tagline"]/p/a'): genreName = genreLink.text_content().strip() @@ -60,7 +59,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieGenres.addGenre('Hairy Pussy') # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="meet"]/a/img'): actorName = actorLink.get('alt').replace('WeAreHairy.com', '').strip() actorPhotoURL = '' @@ -68,7 +66,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Director(s) - movieActors.clearDirectors() try: directors = detailsPageElements.xpath('//div[@class="desc"]/div[2]/p') for directorLink in directors: diff --git a/Contents/Code/siteWicked.py b/Contents/Code/siteWicked.py index d89b0c72e..df3185fe1 100644 --- a/Contents/Code/siteWicked.py +++ b/Contents/Code/siteWicked.py @@ -58,9 +58,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): req = PAutils.HTTPRequest(sceneURL) detailsPageElements = HTML.ElementFromString(req.text) - movieGenres.clearGenres() - movieActors.clearActors() - # Title metadata.title = detailsPageElements.xpath('//h1//span')[0].text_content().strip().title().replace('Xxx', 'XXX') diff --git a/Contents/Code/siteWoodmanCastingX.py b/Contents/Code/siteWoodmanCastingX.py index 241cea651..929b480e7 100644 --- a/Contents/Code/siteWoodmanCastingX.py +++ b/Contents/Code/siteWoodmanCastingX.py @@ -68,14 +68,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="tags"]//a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[contains(@class, "block_girls_videos")]/a[@class="girl_item"]') if actors: diff --git a/Contents/Code/siteXConfessions.py b/Contents/Code/siteXConfessions.py index 56f0531e7..5647c4fa3 100644 --- a/Contents/Code/siteXConfessions.py +++ b/Contents/Code/siteXConfessions.py @@ -79,13 +79,11 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements['tags']: genreName = genreLink['title'] movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements['performers']: actorName = '%s %s' % (actorLink['name'], actorLink['last_name']) if actorLink['poster_image'] is not None: @@ -95,7 +93,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): movieActors.addActor(actorName, actorPhotoURL) # Director - movieActors.clearDirectors() directorLink = detailsPageElements['director'] directorName = '%s %s' % (directorLink['name'], directorLink['last_name']) movieActors.addDirector(directorName, '') diff --git a/Contents/Code/siteXSinsVR.py b/Contents/Code/siteXSinsVR.py index 22dbb8522..c1b706cf0 100644 --- a/Contents/Code/siteXSinsVR.py +++ b/Contents/Code/siteXSinsVR.py @@ -54,13 +54,11 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for tag in detailsPageElements.xpath('//div[@class="tags-item"]'): genreName = tag.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div/strong[text()="Starring"]//following-sibling::span/a[@class="tiny-link"]'): actorName = actorLink.text_content().strip() actorPageURL = PAsearchSites.getSearchBaseURL(siteNum) + actorLink.get('href') diff --git a/Contents/Code/siteXVirtual.py b/Contents/Code/siteXVirtual.py index a547f9057..ae90cc19d 100644 --- a/Contents/Code/siteXVirtual.py +++ b/Contents/Code/siteXVirtual.py @@ -30,7 +30,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): sceneDate = metadata_id[2] req = PAutils.HTTPRequest(sceneURL) detailsPageElements = HTML.ElementFromString(req.text) - movieActors.clearActors() # Title metadata.title = detailsPageElements.xpath('//div[contains(@class, "title")]/h2')[0].text_content().strip() @@ -45,7 +44,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.collections.add(metadata.studio) # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//ul[contains(@class, "tags")]//a'): genreName = genreLink.text_content().strip() diff --git a/Contents/Code/siteXart.py b/Contents/Code/siteXart.py index a3cf7a172..08abf1e3c 100644 --- a/Contents/Code/siteXart.py +++ b/Contents/Code/siteXart.py @@ -66,12 +66,10 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() movieGenres.addGenre('Artistic') movieGenres.addGenre('Glamorous') # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//h2//a') actorName = '' if actors: diff --git a/Contents/Code/siteXillimite.py b/Contents/Code/siteXillimite.py index 34a33d4e2..171282bea 100644 --- a/Contents/Code/siteXillimite.py +++ b/Contents/Code/siteXillimite.py @@ -59,7 +59,6 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Actor(s) - movieActors.clearActors() for actorLink in detailsPageElements.xpath('//div[@class="casting"]//div[contains(@class, "slider-xl")]//a[@class="movies"]/img'): actorName = actorLink.get('alt') actorPhotoURL = PAsearchSites.getSearchBaseURL(siteNum) + actorLink.get('data-src') diff --git a/Contents/Code/siteZTOD.py b/Contents/Code/siteZTOD.py index 0029a5e7c..0b6a0113d 100644 --- a/Contents/Code/siteZTOD.py +++ b/Contents/Code/siteZTOD.py @@ -49,14 +49,12 @@ def update(metadata, lang, siteNum, movieGenres, movieActors, art): metadata.year = metadata.originally_available_at.year # Genres - movieGenres.clearGenres() for genreLink in detailsPageElements.xpath('//div[@class="tag-section"]/a'): genreName = genreLink.text_content().strip() movieGenres.addGenre(genreName) # Actor(s) - movieActors.clearActors() actors = detailsPageElements.xpath('//div[contains(@class, "video-title-section")]/div/p[@class="text-white"]/a') if actors: if len(actors) == 3: