assets/components/networks/network.vue

@@ -68,16 +68,8 @@ import Sites from '../sites/sites.vue';
 async function fetchNetwork() {
     this.network = await this.$store.dispatch('fetchNetworks', this.$route.params.networkSlug);
 
-    if (this.network.studios) {
-        this.studios = this.network.studios.map(studio => ({
-            ...studio,
-            network: this.network,
-        }));
-    }
-
     this.sites = this.network.sites
         .filter(site => !site.independent)
-        .concat(this.studios)
         .sort(({ name: nameA }, { name: nameB }) => nameA.localeCompare(nameB));
 
     this.releases = this.network.sites.map(site => site.releases).flat();
@@ -97,8 +89,7 @@ export default {
     data() {
         return {
             network: null,
-            sites: [],
-            studios: [],
+            sites: null,
             releases: [],
             pageTitle: null,
             expanded: false,
@@ -167,13 +158,12 @@ export default {
 }
 
 .header {
+    background: $profile;
     width: 100%;
-    height: 3rem;
+    height: 4rem;
     display: none;
-    flex-shrink: 0;
     justify-content: center;
     border-bottom: solid 1px $shadow-hint;
-    background: $profile;
 }
 
 .sites.compact {

assets/components/networks/networks.vue

@@ -29,18 +29,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import 'theme';
-
 .networks {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(15rem, 1fr));
     grid-gap: 1rem;
     padding: 1rem;
 }
-
-@media(max-width: $breakpoint) {
-    .networks {
-        grid-template-columns: repeat(auto-fit, minmax(10rem, 1fr));
-    }
-}
 </style>

assets/components/releases/release.vue

@@ -80,21 +80,7 @@
 
                         <span class="chain">presents</span>
 
-                        <a
-                            v-if="release.studio"
-                            :href="`/site/${release.studio.slug}`"
-                        >
-                            <img
-                                :src="`/img/logos/${release.network.slug}/${release.studio.slug}.png`"
-                                :title="release.studio.name"
-                                class="logo logo-site"
-                            >
-                        </a>
-
-                        <a
-                            v-else
-                            :href="`/site/${release.site.slug}`"
-                        >
+                        <a :href="`/site/${release.site.slug}`">
                             <img
                                 :src="`/img/logos/${release.network.slug}/${release.site.slug}.png`"
                                 :title="release.site.name"

assets/components/tile/release.vue

@@ -11,24 +11,12 @@
                     class="site site-link"
                 >{{ release.network.name }}</router-link>
 
-                <router-link
-                    v-else-if="release.studio"
-                    :to="`/network/${release.network.slug}`"
-                    class="site site-link"
-                ><img
-                    :src="`/img/logos/${release.network.slug}/favicon.png`"
-                    class="favicon"
-                >{{ release.studio.name }}</router-link>
-
                 <router-link
                     v-else
                     v-tooltip.bottom="`Part of ${release.network.name}`"
                     :title="`Part of ${release.network.name}`"
                     :to="`/site/${release.site.slug}`"
                     class="site site-link"
-                ><img
-                    :src="`/img/logos/${release.network.slug}/favicon.png`"
-                    class="favicon"
                 >{{ release.site.name }}</router-link>
 
                 <a
@@ -190,18 +178,11 @@ export default {
     justify-content: space-between;
     position: absolute;
     font-size: 0;
-
-    .favicon {
-        height: 1rem;
-        margin: 0 .25rem 0 0;
-    }
 }
 
 .site,
 .date {
     color: #fff;
-    display: flex;
-    align-items: center;
     background: $shadow;
     position: relative;
     font-size: .8rem;

assets/js/curate.js

@@ -37,10 +37,6 @@ function curateSite(site, network) {
     if (site.releases) curatedSite.releases = site.releases.map(release => curateRelease(release));
     if (site.network || network) curatedSite.network = site.network || network;
 
-    if (site.parameters) {
-        curatedSite.independent = !!JSON.parse(site.parameters).independent;
-    }
-
     return curatedSite;
 }
 
@@ -56,14 +52,6 @@ function curateNetwork(network) {
         curatedNetwork.sites = network.sites.map(site => curateSite(site, curatedNetwork));
     }
 
-    if (network.studios) {
-        curatedNetwork.studios = network.studios;
-    }
-
-    if (network.parameters) {
-        curatedNetwork.parameters = JSON.parse(network.parameters);
-    }
-
     return curatedNetwork;
 }
 

assets/js/fragments.js

@@ -113,12 +113,6 @@ const releasesFragment = `
         ${releaseTagsFragment}
         ${releasePosterFragment}
         ${siteFragment}
-        studio {
-            id
-            name
-            slug
-            url
-        }
     }
 `;
 

assets/js/networks/actions.js

@@ -22,7 +22,6 @@ function initNetworksActions(store, _router) {
                       slug
                       url
                       ${releasesFragment}
-                      parameters
                       network {
                         id
                         name
@@ -30,12 +29,6 @@ function initNetworksActions(store, _router) {
                         url
                       }
                     }
-                    studios {
-                        id
-                        name
-                        slug
-                        url
-                    }
                 }
             }
         `, {

config/default.js

@@ -51,7 +51,7 @@ module.exports = {
         'vixen',
         'xempire',
     ],
-    fetchAfter: [1, 'week'],
+    fetchAfter: [3, 'months'],
     columns: [
         {
             value: 'date',

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "traxxx",
-  "version": "1.45.0",
+  "version": "1.44.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2626,14 +2626,6 @@
             "toidentifier": "1.0.0"
           }
         },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        },
         "mime-db": {
           "version": "1.40.0",
           "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
@@ -4656,17 +4648,6 @@
         "chardet": "^0.7.0",
         "iconv-lite": "^0.4.24",
         "tmp": "^0.0.33"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-          "dev": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        }
       }
     },
     "extglob": {
@@ -6236,9 +6217,9 @@
       }
     },
     "iconv-lite": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.0.tgz",
-      "integrity": "sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw==",
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
       }
@@ -7765,14 +7746,6 @@
             "ms": "^2.1.1"
           }
         },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -9263,14 +9236,6 @@
             "toidentifier": "1.0.0"
           }
         },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        },
         "setprototypeof": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
@@ -12074,16 +12039,6 @@
       "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
       "requires": {
         "iconv-lite": "0.4.24"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        }
       }
     },
     "whatwg-mimetype": {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "traxxx",
-    "version": "1.45.0",
+    "version": "1.44.4",
     "description": "All the latest porn releases in one place",
     "main": "src/app.js",
     "scripts": {
@@ -85,7 +85,6 @@
         "face-api.js": "^0.21.0",
         "fs-extra": "^7.0.1",
         "graphile-utils": "^4.5.6",
-        "iconv-lite": "^0.5.0",
         "jsdom": "^15.2.1",
         "knex": "^0.16.5",
         "knex-migrate": "^1.7.4",

public/css/style.css

@@ -149,17 +149,9 @@
   position: absolute;
   font-size: 0;
 }
-.details .favicon[data-v-3abcf101] {
-    height: 1rem;
-    margin: 0 .25rem 0 0;
-}
 .site[data-v-3abcf101],
 .date[data-v-3abcf101] {
   color: #fff;
-  display: -webkit-box;
-  display: flex;
-  -webkit-box-align: center;
-          align-items: center;
   background: rgba(0, 0, 0, 0.5);
   position: relative;
   font-size: .8rem;
@@ -692,14 +684,13 @@
           filter: drop-shadow(1px 0 0 rgba(255, 255, 255, 0.2)) drop-shadow(-1px 0 0 rgba(255, 255, 255, 0.2)) drop-shadow(0 1px 0 rgba(255, 255, 255, 0.2)) drop-shadow(0 -1px 0 rgba(255, 255, 255, 0.2));
 }
 .header[data-v-e2e12602] {
+  background: #222;
   width: 100%;
-  height: 3rem;
+  height: 4rem;
   display: none;
-  flex-shrink: 0;
   -webkit-box-pack: center;
           justify-content: center;
   border-bottom: solid 1px rgba(0, 0, 0, 0.1);
-  background: #222;
 }
 .sites.compact[data-v-e2e12602] {
   display: none;
@@ -795,18 +786,12 @@
   margin: 0;
 }
 
-/* $primary: #ff886c; */
 .networks[data-v-4709d404] {
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(15rem, 1fr));
   grid-gap: 1rem;
   padding: 1rem;
 }
-@media (max-width: 720px) {
-.networks[data-v-4709d404] {
-    grid-template-columns: repeat(auto-fit, minmax(10rem, 1fr));
-}
-}
 
 /* $primary: #ff886c; */
 .photos[data-v-0a0430c7] {

seeds/00_networks.js

@@ -8,11 +8,6 @@ const networks = [
         url: 'https://www.21sextury.com',
         description: 'Watch all the latest scenes and porn video updates on 21Sextury.com, the best European porn site with the hottest pornstars from all over the world! Watch porn videos from the large network here.',
     },
-    {
-        slug: 'bang',
-        name: 'Bang!',
-        url: 'https://bang.com',
-    },
     {
         slug: 'bangbros',
         name: 'Bang Bros',

seeds/01_sites.js

@@ -119,15 +119,6 @@ function getSites(networksMap) {
             name: 'Sweet Sophie Moone',
             network_id: networksMap['21sextury'],
         },
-        // BANG
-        {
-            slug: 'bang',
-            network_id: networksMap.bang,
-            name: 'Bang!',
-            url: 'https://bang.com',
-            description: null,
-            parameters: JSON.stringify({ independent: true }),
-        },
         // BANGBROS
         {
             slug: 'assparade',
@@ -647,7 +638,7 @@ function getSites(networksMap) {
         },
         {
             slug: 'milfslikeitbig',
-            name: 'MILFs Like It Big',
+            name: 'Milfs Like it Big',
             url: 'https://www.brazzers.com/sites/view/id/36/milfs-like-it-big',
             description: "When hubby's away milfy will play. These bored housewives want to get fucked and they want it now. They're experienced and know what they want. America's suburbs are full of these cum-de-sacs just waiting to get laid. Their round tits and thick asses are just begging for it. Cum inside, but don't park out front!",
             network_id: networksMap.brazzers,
@@ -2288,14 +2279,6 @@ function getSites(networksMap) {
             slug: 'girlsofnaked',
             network_id: networksMap.realitykings,
         },
-        {
-            name: 'Lil Humpers',
-            url: 'https://lilhumpers.com',
-            description: '',
-            parameters: JSON.stringify({ siteId: 310 }),
-            slug: 'lilhumpers',
-            network_id: networksMap.realitykings,
-        },
         {
             name: 'Mike in Brazil',
             url: 'https://www.realitykings.com/scenes?site=24',

seeds/02_studios.js

@@ -2,91 +2,6 @@ const upsert = require('../src/utils/upsert');
 
 function getStudios(networksMap) {
     return [
-        // Bang!
-        {
-            name: 'Trickery',
-            slug: 'bangtrickery',
-            url: 'https://www.bang.com/original/4800/bang-trickery',
-            network_id: networksMap.bang,
-        },
-        {
-            name: 'Yngr',
-            slug: 'yngrcom',
-            url: 'https://www.bang.com/original/5010/bang-yngr',
-            network_id: networksMap.bang,
-        },
-        {
-            name: 'Roadside XXX',
-            slug: 'bangroadsidexxx',
-            url: 'https://www.bang.com/original/4864/roadside-xxx',
-            network_id: networksMap.bang,
-        },
-        {
-            name: 'Surprise',
-            slug: 'bangsurprise',
-            url: 'https://www.bang.com/original/5000/bang-surprise',
-            network_id: networksMap.bang,
-        },
-        {
-            name: 'Real Teens',
-            slug: 'bangrealteens',
-            url: 'https://www.bang.com/original/3366/bang-real-teens',
-            network_id: networksMap.bang,
-        },
-        {
-            name: 'FCK.news',
-            slug: 'bangfcknews',
-            url: 'https://www.bang.com/original/4998/bang-fckNews',
-            network_id: networksMap.bang,
-        },
-        {
-            name: 'Pretty & Raw',
-            slug: 'prettyandraw',
-            url: 'https://www.bang.com/original/4792/bang-pretty-and-raw',
-            network_id: networksMap.bang,
-        },
-        {
-            name: 'Japan',
-            slug: 'bangjapan',
-            url: 'https://www.bang.com/original/3079/bang-japan',
-            network_id: networksMap.bang,
-        },
-        {
-            name: 'Rammed',
-            slug: 'bangrammed',
-            url: 'https://www.bang.com/original/4836/bang-rammed',
-            network_id: networksMap.bang,
-        },
-        {
-            name: 'Glamkore',
-            slug: 'bangglamkore',
-            url: 'https://www.bang.com/original/4586/bang-glamkore',
-            network_id: networksMap.bang,
-        },
-        {
-            name: 'Screw The Cops',
-            slug: 'bangscrewthecops',
-            url: 'https://www.bang.com/original/4710/bang-screw-cops',
-            network_id: networksMap.bang,
-        },
-        {
-            name: 'Real MILFs',
-            slug: 'bangrealmilfs',
-            url: 'https://www.bang.com/original/4448/bang-real-milfs',
-            network_id: networksMap.bang,
-        },
-        {
-            name: 'Confessions',
-            slug: 'bangconfessions',
-            url: 'https://www.bang.com/original/4308/bang-confessions',
-            network_id: networksMap.bang,
-        },
-        {
-            name: 'Casting',
-            slug: 'bangcasting',
-            url: 'https://www.bang.com/original/3261/bang-casting',
-            network_id: networksMap.bang,
-        },
         // LegalPorno
         {
             slug: 'gonzocom',

seeds/04_media.js

@@ -291,6 +291,6 @@ exports.seed = knex => Promise.resolve()
 
         return Promise.all([
             upsert('tags_posters', tagPosterEntries, 'tag_id', knex),
-            upsert('tags_photos', tagPhotoEntries, ['tag_id', 'media_id'], knex),
+            upsert('tags_photos', tagPhotoEntries, 'tag_id', knex),
         ]);
     });

seeds/05_countries.js

@@ -1646,7 +1646,6 @@ const countries = [
     },
     {
         name: 'United Kingdom of Great Britain and Northern Ireland',
-        alias: 'United Kingdom',
         code: 826,
         alpha2: 'GB',
         alpha3: 'GBR',

src/releases.js

@@ -180,23 +180,6 @@ async function attachChannelSite(release) {
     };
 }
 
-async function attachStudio(release) {
-    if (!release.studio) {
-        return release;
-    }
-
-    const studio = await knex('studios')
-        .where('name', release.studio)
-        .orWhere('slug', release.studio)
-        .orWhere('url', release.studio)
-        .first();
-
-    return {
-        ...release,
-        studio,
-    };
-}
-
 async function curateReleaseEntry(release) {
     const curatedRelease = {
         site_id: release.site.id,
@@ -312,31 +295,27 @@ async function storeReleaseAssets(release, releaseId) {
     await createMediaDirectory('releases', subpath);
 
     try {
-        // don't use Promise.all to prevent concurrency issues with duplicate detection
-        if (release.poster) {
-            await storePhotos([release.poster], {
+        await Promise.all([
+            storePhotos(release.photos, {
+                targetId: releaseId,
+                subpath,
+                primaryRole: release.poster ? null : 'poster',
+            }, identifier),
+            release.poster && storePhotos([release.poster], {
                 role: 'poster',
                 targetId: releaseId,
                 subpath,
-            }, identifier);
-        }
-
-        await storePhotos(release.photos, {
-            targetId: releaseId,
-            subpath,
-            primaryRole: release.poster ? null : 'poster',
-        }, identifier);
-
-        await storePhotos(release.covers, {
-            role: 'cover',
-            targetId: releaseId,
-            subpath,
-        }, identifier);
-
-        await storeTrailer(release.trailer, {
-            targetId: releaseId,
-            subpath,
-        }, identifier);
+            }, identifier),
+            storePhotos(release.covers, {
+                role: 'cover',
+                targetId: releaseId,
+                subpath,
+            }, identifier),
+            storeTrailer(release.trailer, {
+                targetId: releaseId,
+                subpath,
+            }, identifier),
+        ]);
     } catch (error) {
         console.log(release.url, error);
     }
@@ -384,8 +363,7 @@ async function storeReleases(releases) {
     const storedReleases = await Promise.map(releases, async (release) => {
         try {
             const releaseWithChannelSite = await attachChannelSite(release);
-            const releaseWithStudio = await attachStudio(release);
-            const releaseId = await storeRelease(releaseWithStudio);
+            const releaseId = await storeRelease(releaseWithChannelSite);
 
             return {
                 id: releaseId,

src/scrapers/bang.js

@@ -1,127 +0,0 @@
-'use strict';
-
-const bhttp = require('bhttp');
-
-function encodeId(id) {
-    return Buffer
-        .from(id, 'hex')
-        .toString('base64')
-        .replace(/\+/g, '-')
-        .replace(/\//g, '_')
-        .replace(/=/g, ',');
-}
-
-function scrapeLatest(scenes, site) {
-    return scenes.map(({ _source: scene }) => {
-        const release = {
-            site,
-            entryId: encodeId(scene.id),
-            title: scene.name,
-            description: scene.description,
-            actors: scene.actors.map(actor => actor.name),
-            tags: scene.genres.concat(scene.actions).map(genre => genre.name),
-            duration: scene.duration,
-        };
-
-        const slug = release.title.toLowerCase().trim().replace(/\s+/g, '-');
-        release.url = `https://www.bang.com/video/${release.entryId}/${slug}`;
-
-        const date = new Date(scene.releaseDate);
-        release.date = new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()));
-
-        if (scene.is4k) release.tags.push('4k');
-        if (scene.gay) release.tags.push('gay');
-
-        const defaultPoster = scene.screenshots.find(photo => photo.default === true);
-        const photoset = scene.screenshots.filter(photo => photo.default === false);
-
-        const photos = defaultPoster ? photoset : photoset.slice(1);
-        const poster = defaultPoster || photoset[0];
-
-        release.poster = `https://i.bang.com/screenshots/${scene.dvd.id}/movie/1/${poster.screenId}.jpg`;
-        release.photos = photos.map(photo => `https://i.bang.com/screenshots/${scene.dvd.id}/movie/1/${photo.screenId}.jpg`);
-
-        release.trailer = {
-            src: `https://i.bang.com/v/${scene.dvd.id}/${scene.identifier}/preview.mp4`,
-        };
-
-        release.studio = scene.series.name
-            .replace(/[! .]/g, '')
-            .replace('&', 'and');
-
-        return release;
-    });
-}
-
-async function fetchLatest(site, page = 1) {
-    const clusterId = '617fb597b659459bafe6472470d9073a';
-    const authKey = 'YmFuZy1yZWFkOktqVDN0RzJacmQ1TFNRazI=';
-
-    const res = await bhttp.post(`https://${clusterId}.us-east-1.aws.found.io/videos/video/_search`, {
-        size: 50,
-        from: (page - 1) * 50,
-        query: {
-            bool: {
-                must: [
-                    {
-                        match: {
-                            status: 'ok',
-                        },
-                    },
-                    {
-                        range: {
-                            releaseDate: {
-                                lte: 'now',
-                            },
-                        },
-                    },
-                    {
-                        nested: {
-                            path: 'studio',
-                            query: {
-                                bool: {
-                                    must: [
-                                        {
-                                            match: {
-                                                'studio.name': {
-                                                    operator: 'AND',
-                                                    query: 'bang! originals',
-                                                },
-                                            },
-                                        },
-                                    ],
-                                },
-                            },
-                        },
-                    },
-                ],
-                must_not: [
-                    {
-                        match: {
-                            type: 'trailer',
-                        },
-                    },
-                ],
-            },
-        },
-        sort: [
-            {
-                releaseDate: {
-                    order: 'desc',
-                },
-            },
-        ],
-    }, {
-        encodeJSON: true,
-        headers: {
-            Authorization: `Basic ${authKey}`,
-        },
-    });
-
-    return scrapeLatest(res.body.hits.hits, site);
-}
-
-module.exports = {
-    fetchLatest,
-    // fetchScene,
-};

src/scrapers/legalporno.js

@@ -4,6 +4,9 @@ const bhttp = require('bhttp');
 const { JSDOM } = require('jsdom');
 const cheerio = require('cheerio');
 const moment = require('moment');
+const knex = require('../knex');
+
+const { matchTags } = require('../tags');
 
 function extractTitle(originalTitle) {
     const titleComponents = originalTitle.split(' ');
@@ -99,8 +102,16 @@ async function scrapeScene(html, url, site, useGallery) {
     const trailer = data.clip.qualities.find(clip => clip.quality === 'vga' || clip.quality === 'hd');
 
     const studioName = $('.watchpage-studioname').first().text().trim();
-    const studio = studioName.replace(/[\s.']+/g, '').toLowerCase();
-    const tags = $(tagsElement).find('a').map((tagIndex, tagElement) => $(tagElement).text()).toArray();
+    const studioSlug = studioName.replace(/\s+/g, '').toLowerCase();
+    const rawTags = $(tagsElement).find('a').map((tagIndex, tagElement) => $(tagElement).text()).toArray();
+
+    const [studio, tags] = await Promise.all([
+        knex('studios')
+            .where({ name: studioName })
+            .orWhere({ slug: studioSlug })
+            .first(),
+        matchTags(rawTags),
+    ]);
 
     return {
         url,

src/scrapers/scrapers.js

@@ -2,7 +2,6 @@
 
 // releases
 const twentyonesextury = require('./21sextury');
-const bang = require('./bang');
 const bangbros = require('./bangbros');
 const blowpass = require('./blowpass');
 const dogfart = require('./dogfart');
@@ -32,7 +31,6 @@ const pornhub = require('./pornhub');
 module.exports = {
     releases: {
         '21sextury': twentyonesextury,
-        bang,
         bangbros,
         blowpass,
         brazzers,

src/utils/rename.js

@@ -3,7 +3,7 @@
 const path = require('path');
 const Promise = require('bluebird');
 const fs = require('fs-extra');
-const fetchScene = require('../scrape-releases');
+const fetchScene = require('../scrape-release');
 
 const argv = require('../argv');