From b489c8fc334e0f8fd82a3095e4ddfc943dbcf114 Mon Sep 17 00:00:00 2001
From: Niels Simenon <niels.simenon@gmail.com>
Date: Sat, 16 Nov 2019 03:33:36 +0100
Subject: [PATCH] Major refactor, cleand up site scrape module, fixed and
 cleaned up release scrape module. Removed old CLI code

---
 assets/components/actor/actor.vue        |  18 +-
 assets/components/home/home.vue          |  16 +-
 assets/components/network/network.vue    |  18 +-
 assets/components/releases/releases.vue  |  69 ++++++
 assets/components/site/site.vue          |  18 +-
 assets/components/tag/tag.vue            |  33 +--
 assets/css/style.scss                    |  12 -
 config/default.js                        |  12 +-
 package-lock.json                        |  50 -----
 package.json                             |   2 -
 public/css/style.css                     |  40 ++--
 public/img/logos/mikeadriano/network.png | Bin 6970 -> 7537 bytes
 src/app.js                               |  84 ++-----
 src/argv.js                              |  49 ++--
 src/db.sqlite                            |   0
 src/fetch-releases.js                    | 270 -----------------------
 src/fetch-scene.js                       | 126 -----------
 src/media.js                             |  25 +++
 src/networks.js                          |  19 +-
 src/releases.js                          |  75 +++++++
 src/scrape-release.js                    |  58 +++++
 src/scrape-sites.js                      | 136 ++++++++++++
 src/scrapers/brazzers.js                 |  18 +-
 src/scrapers/dogfart.js                  |   2 +-
 src/scrapers/kink.js                     |  14 +-
 src/scrapers/pervcity.js                 |   4 +-
 src/scrapers/private.js                  |  22 +-
 src/scrapers/{index.js => scrapers.js}   |   0
 src/scrapers/vixen.js                    |  10 +-
 src/scrapers/xempire.js                  |   2 +-
 src/sites.js                             |  87 +++++++-
 src/tags.js                              |   7 +-
 src/tui/formatters.js                    |  29 ---
 src/tui/render.js                        | 111 ----------
 src/web/server.js                        |   6 +-
 35 files changed, 595 insertions(+), 847 deletions(-)
 create mode 100644 assets/components/releases/releases.vue
 delete mode 100644 src/db.sqlite
 delete mode 100644 src/fetch-releases.js
 delete mode 100644 src/fetch-scene.js
 create mode 100644 src/scrape-release.js
 create mode 100644 src/scrape-sites.js
 rename src/scrapers/{index.js => scrapers.js} (100%)
 delete mode 100644 src/tui/formatters.js
 delete mode 100644 src/tui/render.js

diff --git a/assets/components/actor/actor.vue b/assets/components/actor/actor.vue
index b4e0939e..9a5eedf2 100644
--- a/assets/components/actor/actor.vue
+++ b/assets/components/actor/actor.vue
@@ -48,23 +48,17 @@
                 </li>
             </ul>
 
-            <h3 class="heading">Latest releases</h3>
-
-            <ul class="nolist scenes">
-                <li
-                    v-for="release in releases"
-                    :key="`release-${release.id}`"
-                >
-                    <ReleaseTile :release="release" />
-                </li>
-            </ul>
+            <Releases
+                :releases="releases"
+                :context="actor.name"
+            />
         </div>
     </div>
 </template>
 
 <script>
 import FilterBar from '../header/filter-bar.vue';
-import ReleaseTile from '../tile/release.vue';
+import Releases from '../releases/releases.vue';
 
 async function fetchReleases() {
     this.releases = await this.$store.dispatch('fetchActorReleases', this.$route.params.actorSlug);
@@ -82,7 +76,7 @@ async function mounted() {
 export default {
     components: {
         FilterBar,
-        ReleaseTile,
+        Releases,
     },
     data() {
         return {
diff --git a/assets/components/home/home.vue b/assets/components/home/home.vue
index 7b90771d..6c08c2a6 100644
--- a/assets/components/home/home.vue
+++ b/assets/components/home/home.vue
@@ -3,22 +3,16 @@
         <FilterBar :fetch-releases="fetchReleases" />
 
         <div class="content-inner">
-            <ul class="scenes nolist">
-                <li
-                    v-for="release in releases"
-                    :key="release.id"
-                    class="scene"
-                >
-                    <ReleaseTile :release="release" />
-                </li>
-            </ul>
+            <Releases
+                :releases="releases"
+            />
         </div>
     </div>
 </template>
 
 <script>
 import FilterBar from '../header/filter-bar.vue';
-import ReleaseTile from '../tile/release.vue';
+import Releases from '../releases/releases.vue';
 
 async function fetchReleases() {
     this.releases = await this.$store.dispatch('fetchReleases');
@@ -33,7 +27,7 @@ async function mounted() {
 export default {
     components: {
         FilterBar,
-        ReleaseTile,
+        Releases,
     },
     data() {
         return {
diff --git a/assets/components/network/network.vue b/assets/components/network/network.vue
index f47b76ce..d7c7e882 100644
--- a/assets/components/network/network.vue
+++ b/assets/components/network/network.vue
@@ -41,23 +41,17 @@
                 </ul>
             </template>
 
-            <h3 class="heading">Latest releases</h3>
-
-            <ul class="nolist scenes">
-                <li
-                    v-for="release in releases"
-                    :key="`release-${release.id}`"
-                >
-                    <ReleaseTile :release="release" />
-                </li>
-            </ul>
+            <Releases
+                :releases="releases"
+                :context="network.name"
+            />
         </div>
     </div>
 </template>
 
 <script>
 import FilterBar from '../header/filter-bar.vue';
-import ReleaseTile from '../tile/release.vue';
+import Releases from '../releases/releases.vue';
 import SiteTile from '../tile/site.vue';
 
 async function fetchReleases() {
@@ -80,7 +74,7 @@ async function mounted() {
 export default {
     components: {
         FilterBar,
-        ReleaseTile,
+        Releases,
         SiteTile,
     },
     data() {
diff --git a/assets/components/releases/releases.vue b/assets/components/releases/releases.vue
new file mode 100644
index 00000000..e572e100
--- /dev/null
+++ b/assets/components/releases/releases.vue
@@ -0,0 +1,69 @@
+<template>
+    <div>
+        <h3
+            v-if="context"
+            class="heading"
+        ><span class="range">{{ range }}</span> releases for '{{ context }}'</h3>
+
+        <ul class="nolist releases">
+            <li
+                v-for="release in releases"
+                :key="`release-${release.id}`"
+            >
+                <ReleaseTile :release="release" />
+            </li>
+        </ul>
+    </div>
+</template>
+
+<script>
+import ReleaseTile from '../tile/release.vue';
+
+function range() {
+    return this.$store.state.ui.range;
+}
+
+export default {
+    components: {
+        ReleaseTile,
+    },
+    props: {
+        releases: {
+            type: Array,
+            default: () => [],
+        },
+        context: {
+            type: String,
+            default: null,
+        },
+    },
+    computed: {
+        range,
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+@import 'theme';
+
+.heading {
+    padding: 0;
+    margin: 0 0 1rem 0;
+
+    .range {
+        text-transform: capitalize;
+    }
+}
+
+.releases {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(20rem, .5fr));
+    grid-gap: 1rem;
+}
+
+@media(max-width: $breakpoint) {
+    .releases {
+        grid-template-columns: repeat(auto-fit, minmax(20rem, 1fr));
+    }
+}
+</style>
diff --git a/assets/components/site/site.vue b/assets/components/site/site.vue
index 26b6aad5..eb1dcb81 100644
--- a/assets/components/site/site.vue
+++ b/assets/components/site/site.vue
@@ -47,23 +47,17 @@
 
             <p class="description">{{ site.description }}</p>
 
-            <h3 class="heading">Latest releases</h3>
-
-            <ul class="nolist scenes">
-                <li
-                    v-for="release in releases"
-                    :key="`release-${release.id}`"
-                >
-                    <ReleaseTile :release="release" />
-                </li>
-            </ul>
+            <Releases
+                :releases="releases"
+                :context="site.name"
+            />
         </div>
     </div>
 </template>
 
 <script>
 import FilterBar from '../header/filter-bar.vue';
-import ReleaseTile from '../tile/release.vue';
+import Releases from '../releases/releases.vue';
 
 async function fetchReleases() {
     this.releases = await this.$store.dispatch('fetchSiteReleases', this.$route.params.siteSlug);
@@ -81,7 +75,7 @@ async function mounted() {
 export default {
     components: {
         FilterBar,
-        ReleaseTile,
+        Releases,
     },
     data() {
         return {
diff --git a/assets/components/tag/tag.vue b/assets/components/tag/tag.vue
index e73bb7bf..c1cbf09e 100644
--- a/assets/components/tag/tag.vue
+++ b/assets/components/tag/tag.vue
@@ -17,23 +17,17 @@
         </div>
 
         <div class="content-inner">
-            <h3 class="heading">Latest releases</h3>
-
-            <ul class="nolist scenes">
-                <li
-                    v-for="release in releases"
-                    :key="`release-${release.id}`"
-                >
-                    <ReleaseTile :release="release" />
-                </li>
-            </ul>
+            <Releases
+                :releases="releases"
+                :context="tag.name"
+            />
         </div>
     </div>
 </template>
 
 <script>
 import FilterBar from '../header/filter-bar.vue';
-import ReleaseTile from '../tile/release.vue';
+import Releases from '../releases/releases.vue';
 
 async function fetchReleases() {
     this.releases = await this.$store.dispatch('fetchTagReleases', this.$route.params.tagSlug);
@@ -51,7 +45,7 @@ async function mounted() {
 export default {
     components: {
         FilterBar,
-        ReleaseTile,
+        Releases,
     },
     data() {
         return {
@@ -86,19 +80,4 @@ export default {
         height: 1.25rem;
     }
 }
-
-.heading {
-    padding: 0;
-    margin: 0 0 1rem 0;
-}
-
-.bio-heading {
-    display: inline-block;
-    font-weight: bold;
-    margin: .5rem 0 0 0;
-
-    &::after {
-        content: ':';
-    }
-}
 </style>
diff --git a/assets/css/style.scss b/assets/css/style.scss
index 12bbaf9c..bc891591 100644
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -37,15 +37,3 @@ body {
         fill: $primary;
     }
 }
-
-.scenes {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(20rem, .5fr));
-    grid-gap: 1rem;
-}
-
-@media(max-width: $breakpoint) {
-    .scenes {
-        grid-template-columns: repeat(auto-fit, minmax(20rem, 1fr));
-    }
-}
diff --git a/config/default.js b/config/default.js
index 60649c4e..8609090a 100644
--- a/config/default.js
+++ b/config/default.js
@@ -6,6 +6,7 @@ module.exports = {
         database: 'traxxx',
     },
     web: {
+        host: '0.0.0.0',
         port: 5000,
     },
     include: [
@@ -86,15 +87,4 @@ module.exports = {
         path: './',
         thumbnailSize: 320, // width for 16:9 will be exactly 576px
     },
-    filename: {
-        dateFormat: 'DD-MM-YYYY',
-        actorsJoin: ', ',
-        slash: '_',
-        subpatterns: {
-            siteName: '{siteName} - ',
-            sceneDate: ', {sceneDate}',
-            sceneId: ' {sceneId}',
-        },
-        pattern: '{siteName}{sceneTitle} ({sceneActors}{sceneDate}{sceneId})',
-    },
 };
diff --git a/package-lock.json b/package-lock.json
index 4ab8eebf..e4b23b86 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1586,11 +1586,6 @@
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
       "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
     },
-    "arch": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz",
-      "integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg=="
-    },
     "are-we-there-yet": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
@@ -2954,46 +2949,6 @@
       "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
       "dev": true
     },
-    "clipboardy": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.3.tgz",
-      "integrity": "sha512-2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA==",
-      "requires": {
-        "arch": "^2.1.0",
-        "execa": "^0.8.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "0.8.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz",
-          "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=",
-          "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
-        }
-      }
-    },
     "cliui": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
@@ -7451,11 +7406,6 @@
       "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
       "dev": true
     },
-    "neo-blessed": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/neo-blessed/-/neo-blessed-0.2.0.tgz",
-      "integrity": "sha512-C2kC4K+G2QnNQFXUIxTQvqmrdSIzGTX1ZRKeDW6ChmvPRw8rTkTEJzbEQHiHy06d36PCl/yMOCjquCRV8SpSQw=="
-    },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
diff --git a/package.json b/package.json
index e97fad6e..83847eea 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,6 @@
         "body-parser": "^1.19.0",
         "cheerio": "^1.0.0-rc.2",
         "cli-confirm": "^1.0.1",
-        "clipboardy": "^1.2.3",
         "config": "^3.0.1",
         "dayjs": "^1.8.14",
         "express": "^4.16.4",
@@ -81,7 +80,6 @@
         "knex-migrate": "^1.7.1",
         "mime": "^2.4.4",
         "moment": "^2.24.0",
-        "neo-blessed": "^0.2.0",
         "opn": "^5.4.0",
         "pg": "^7.9.0",
         "prop-types": "^15.7.2",
diff --git a/public/css/style.css b/public/css/style.css
index 6f2a959f..1e30b102 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -226,6 +226,25 @@
     color: #ff6c88;
 }
 
+/* $primary: #ff886c; */
+.heading[data-v-22ffe3e4] {
+  padding: 0;
+  margin: 0 0 1rem 0;
+}
+.heading .range[data-v-22ffe3e4] {
+    text-transform: capitalize;
+}
+.releases[data-v-22ffe3e4] {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(20rem, 0.5fr));
+  grid-gap: 1rem;
+}
+@media (max-width: 720px) {
+.releases[data-v-22ffe3e4] {
+    grid-template-columns: repeat(auto-fit, minmax(20rem, 1fr));
+}
+}
+
 /* $primary: #ff886c; */
 .actor[data-v-6989dc6f] {
   background: #fff;
@@ -571,18 +590,6 @@
     width: 1.25rem;
     height: 1.25rem;
 }
-.heading[data-v-80991bcc] {
-  padding: 0;
-  margin: 0 0 1rem 0;
-}
-.bio-heading[data-v-80991bcc] {
-  display: inline-block;
-  font-weight: bold;
-  margin: .5rem 0 0 0;
-}
-.bio-heading[data-v-80991bcc]::after {
-    content: ':';
-}
 
 /* $primary: #ff886c; */
 .errorpage[data-v-29109daf] {
@@ -724,15 +731,6 @@ body {
   .icon.icon-href :hover {
     fill: #ff6c88; }
 
-.scenes {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(20rem, 0.5fr));
-  grid-gap: 1rem; }
-
-@media (max-width: 720px) {
-  .scenes {
-    grid-template-columns: repeat(auto-fit, minmax(20rem, 1fr)); } }
-
 /* $primary: #ff886c; */
 .header[data-v-10b7ec04] {
   background: #fff;
diff --git a/public/img/logos/mikeadriano/network.png b/public/img/logos/mikeadriano/network.png
index 770226c214e5f1d7f8932309f77b9b602b521e94..636542fe72ce60e44d581dc3ceeb521c84457974 100644
GIT binary patch
delta 7514
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

delta 6916
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
KMNUMnLSTXw30|!L

diff --git a/src/app.js b/src/app.js
index 9b7d624d..0274f4ac 100644
--- a/src/app.js
+++ b/src/app.js
@@ -1,80 +1,30 @@
 'use strict';
 
-const blessed = require('neo-blessed');
-const clipboard = require('clipboardy');
-
 const argv = require('./argv');
-const { renderReleases, renderScene } = require('./tui/render');
+const knex = require('./knex');
 const initServer = require('./web/server');
 
-const fetchReleases = require('./fetch-releases');
-const fetchScene = require('./fetch-scene');
+const scrapeSites = require('./scrape-sites');
+const scrapeRelease = require('./scrape-release');
 
-function initScreen() {
-    const screen = blessed.screen({
-        title: `traxxx ${new Date().getTime()}`,
-        smartCSR: true,
-        mouse: false,
-    });
-
-    screen.enableInput();
-
-    screen.key(['escape', 'q', 'C-c'], () => {
-        screen.render();
-        screen.destroy();
-    });
-
-    return screen;
-}
-
-function getMethod() {
-    if (argv.scene) {
-        return {
-            fetch: () => fetchScene(argv.scene),
-            render: renderScene,
-        };
-    }
-
-    if (argv.fetch) {
-        return {
-            fetch: () => fetchReleases(),
-            render: renderReleases,
-        };
-    }
-
-    return initServer();
-}
 
 async function init() {
-    const screen = argv.render && !argv.filename && initScreen();
+    if (argv.url) {
+        await scrapeRelease(argv.url);
+        knex.destroy();
 
-    try {
-        const method = getMethod();
-
-        if (method) {
-            const result = await method.fetch();
-
-            if (result) {
-                if (argv.copy && result.copy) {
-                    clipboard.writeSync(result.copy);
-                    console.log(`Result copied to clipboard: ${result.copy}`);
-                }
-
-                if (argv.filename && result.filename) {
-                    console.log(result.filename);
-
-                    // setTimeout(() => log(), 5000);
-                    return;
-                }
-
-                if (argv.render) {
-                    method.render(result, screen);
-                }
-            }
-        }
-    } catch (error) {
-        console.error(argv.debug ? error : error.message);
+        return;
     }
+
+
+    if (argv.networks || argv.sites) {
+        await scrapeSites();
+        knex.destroy();
+
+        return;
+    }
+
+    await initServer();
 }
 
 init();
diff --git a/src/argv.js b/src/argv.js
index abed2329..bcea4381 100644
--- a/src/argv.js
+++ b/src/argv.js
@@ -5,25 +5,25 @@ const yargs = require('yargs');
 
 const { argv } = yargs
     .command('npm start')
-    .option('fetch', {
-        describe: 'Fetch latest releases',
-        type: 'boolean',
-        default: false,
+    .option('networks', {
+        describe: 'Networks to scrape (overrides config)',
+        type: 'array',
+        alias: 'network',
+    })
+    .option('sites', {
+        describe: 'Sites to scrape (overrides config)',
+        type: 'array',
+        alias: 'site',
     })
     .option('deep', {
         describe: 'Fetch details for all releases',
         type: 'boolean',
         default: true,
     })
-    .option('networks', {
-        describe: 'Networks to include (overrides config)',
-        type: 'array',
-        alias: 'network',
-    })
-    .option('sites', {
-        describe: 'Sites to include (overrides config)',
-        type: 'array',
-        alias: 'site',
+    .option('url', {
+        describe: 'Scrape scene info from URL',
+        type: 'string',
+        alias: 'fetch',
     })
     .option('after', {
         describe: 'Don\'t fetch scenes older than',
@@ -40,32 +40,9 @@ const { argv } = yargs
         type: 'boolean',
         default: true,
     })
-    .option('render', {
-        describe: 'Fetch data without rendering interface',
-        type: 'boolean',
-        default: false,
-    })
-    .option('scene', {
-        describe: 'Fetch scene info from URL',
-        type: 'string',
-    })
-    .option('copy', {
-        describe: 'Copy relevant result to clipboard',
-        type: 'boolean',
-        alias: 'c',
-    })
-    .option('filename', {
-        describe: 'Only output the suggested filename of a scene',
-        type: 'boolean',
-    })
     .option('debug', {
         describe: 'Show error stack traces',
         type: 'boolean',
-    })
-    .option('quit', {
-        describe: 'Exit after fetching data. Usually used with --copy.',
-        type: 'boolean',
-        alias: 'q',
     });
 
 module.exports = argv;
diff --git a/src/db.sqlite b/src/db.sqlite
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/fetch-releases.js b/src/fetch-releases.js
deleted file mode 100644
index ec063d2c..00000000
--- a/src/fetch-releases.js
+++ /dev/null
@@ -1,270 +0,0 @@
-'use strict';
-
-const config = require('config');
-const fs = require('fs-extra');
-const path = require('path');
-const Promise = require('bluebird');
-const moment = require('moment');
-
-const argv = require('./argv');
-const knex = require('./knex');
-const scrapers = require('./scrapers');
-const fetchScene = require('./fetch-scene');
-const { storeTags } = require('./tags');
-const { storeActors } = require('./actors');
-const { storePoster, storePhotos, storeTrailer } = require('./media');
-
-function destructConfigNetworks(networks) {
-    return networks.reduce((acc, network) => {
-        if (Array.isArray(network)) {
-            // network specifies sites
-            return {
-                ...acc,
-                sites: [...acc.sites, ...network[1]],
-            };
-        }
-
-        return {
-            ...acc,
-            networks: [...acc.networks, network],
-        };
-    }, {
-        networks: [],
-        sites: [],
-    });
-}
-
-function curateSites(sites) {
-    return sites.map(site => ({
-        id: site.id,
-        name: site.name,
-        slug: site.slug,
-        description: site.description,
-        url: site.url,
-        network: {
-            id: site.network_id,
-            name: site.network_name,
-            slug: site.network_slug,
-            parameters: JSON.parse(site.network_parameters),
-        },
-        parameters: JSON.parse(site.parameters),
-    }));
-}
-
-async function accumulateIncludedSites() {
-    if (argv.networks || argv.sites) {
-        const networks = await knex('networks').select('id').whereIn('slug', argv.networks || []);
-        const networkIds = networks.map(network => network.id);
-
-        const rawSites = await knex('sites')
-            .select('sites.*', 'networks.name as network_name', 'networks.slug as network_slug', 'networks.parameters as network_parameters')
-            .whereIn('sites.slug', argv.sites || [])
-            .orWhereIn('network_id', networkIds)
-            .leftJoin('networks', 'sites.network_id', 'networks.id');
-
-        return curateSites(rawSites);
-    }
-
-    const included = destructConfigNetworks(config.include);
-
-    const networks = await knex('networks').select('id').whereIn('slug', included.networks || []);
-    const networkIds = networks.map(network => network.id);
-
-    const rawSites = await knex('sites')
-        .select('sites.*', 'networks.name as network_name')
-        .whereIn('sites.slug', included.sites || [])
-        .orWhereIn('network_id', networkIds)
-        .leftJoin('networks', 'sites.network_id', 'networks.id');
-
-    return curateSites(rawSites);
-}
-
-async function findDuplicateReleases(latestReleases, _siteId) {
-    const latestReleasesShootIds = latestReleases.map(release => release.shootId).filter(release => release !== undefined);
-    const latestReleasesEntryIds = latestReleases.map(release => release.entryId).filter(release => release !== undefined);
-
-    return knex('releases')
-        .whereIn('shoot_id', latestReleasesShootIds)
-        .orWhereIn('entry_id', latestReleasesEntryIds);
-}
-
-async function storeRelease(release) {
-    const curatedRelease = {
-        site_id: release.site.id,
-        studio_id: release.studio ? release.studio.id : null,
-        shoot_id: release.shootId || null,
-        entry_id: release.entryId || null,
-        url: release.url,
-        title: release.title,
-        date: release.date,
-        description: release.description,
-        // director: release.director,
-        duration: release.duration,
-        likes: release.rating && release.rating.likes,
-        dislikes: release.rating && release.rating.dislikes,
-        rating: release.rating && release.rating.stars && Math.floor(release.rating.stars),
-        deep: Boolean(argv.deep && release.url && !release.upcoming),
-    };
-
-    const releaseEntries = await knex('releases')
-        .insert(curatedRelease)
-        .returning('*');
-
-    if (releaseEntries.length) {
-        const releaseEntry = releaseEntries[0];
-
-        console.log(`Stored (${release.site.name}, ${releaseEntry.id}) "${release.title}"`);
-
-        if (release.poster || (release.photos && release.photos.length)) {
-            await fs.mkdir(path.join(config.media.path, release.site.network.slug, release.site.slug, releaseEntry.id.toString()), { recursive: true });
-        }
-
-        await Promise.all([
-            release.actors && release.actors.length > 0
-                ? storeActors(release, releaseEntry) : Promise.resolve(),
-            release.tags && release.tags.length > 0
-                ? storeTags(release, releaseEntry) : Promise.resolve(),
-            release.photos && release.photos.length > 0
-                ? storePhotos(release, releaseEntry) : Promise.resolve(),
-            release.poster
-                ? storePoster(release, releaseEntry) : Promise.resolve(),
-            release.trailer && release.trailer.src
-                ? storeTrailer(release, releaseEntry) : Promise.resolve(),
-        ]);
-
-        return;
-    }
-
-    console.error(`Unable to save scene to database, possible collision: "${release.title}" (${release.site.name})`);
-}
-
-async function storeReleases(releases = []) {
-    return Promise.map(releases, async (release) => {
-        try {
-            return storeRelease(release);
-        } catch (error) {
-            console.error(error);
-
-            return null;
-        }
-    }, {
-        concurrency: 2,
-    });
-}
-
-async function fetchNewReleases(scraper, site, afterDate, accReleases = [], page = 1) {
-    const latestReleases = await scraper.fetchLatest(site, page);
-
-    if (latestReleases.length === 0) {
-        return [];
-    }
-
-    const duplicateReleases = await findDuplicateReleases(latestReleases, site.id);
-
-    const duplicateReleasesIds = new Set(
-        duplicateReleases
-            .map(release => release.shoot_id || release.entry_id)
-            .concat(duplicateReleases.map(release => release.entry_id || release.shoot_id))
-            // exclude accumulated releases to prevent an infinite loop if the next page contains the same releases as the previous
-            .concat(accReleases.map(release => release.shootId || release.entryId)),
-    );
-
-    const uniqueReleases = latestReleases.filter(release => !duplicateReleasesIds.has(String(release.shootId))
-        && !duplicateReleasesIds.has(String(release.entryId))
-        && moment(release.date).isAfter(afterDate));
-
-    console.log(`\x1b[90m${site.name}: Scraped page ${page}, ${uniqueReleases.length} unique recent releases\x1b[0m`);
-
-    const oldestReleaseOnPage = latestReleases.slice(-1)[0].date;
-
-    if (uniqueReleases.length > 0 && moment(oldestReleaseOnPage).isAfter(afterDate) && (oldestReleaseOnPage || page < argv.pages)) {
-        return fetchNewReleases(scraper, site, afterDate, accReleases.concat(uniqueReleases), page + 1);
-    }
-
-    return accReleases.concat(uniqueReleases);
-}
-
-async function fetchReleases() {
-    const sites = await accumulateIncludedSites();
-
-    if (sites.length === 0) {
-        console.error('None of the specified sites are in the database');
-        return [];
-    }
-
-    const scenesPerSite = await Promise.map(sites, async (site) => {
-        const scraper = scrapers[site.slug] || scrapers[site.network.slug];
-
-        if (scraper) {
-            try {
-                const afterDate = moment.utc().subtract(...argv.after.split(' ')).toDate();
-
-                const [newReleases, upcomingReleases] = await Promise.all([
-                    fetchNewReleases(scraper, site, afterDate),
-                    scraper.fetchUpcoming ? scraper.fetchUpcoming(site) : [],
-                ]);
-
-                console.log(`${site.name}: Found ${newReleases.length} recent releases, ${upcomingReleases.length} upcoming releases`);
-
-                const markedUpcomingReleases = upcomingReleases.map(release => ({ ...release, upcoming: true }));
-
-                const finalReleases = argv.deep
-                    ? await Promise.map([...newReleases, ...markedUpcomingReleases], async (release) => {
-                        if (release.url) {
-                            const scene = await fetchScene(release.url, release);
-
-                            return {
-                                ...release,
-                                ...scene,
-                            };
-                        }
-
-                        return release;
-                    }, {
-                        concurrency: 2,
-                    })
-                    : newReleases;
-
-                if (argv.save) {
-                    await storeReleases(finalReleases);
-                }
-
-                return [
-                    ...finalReleases.map(release => ({
-                        ...release,
-                        network: site.network,
-                    })),
-                    ...upcomingReleases.map(release => ({
-                        ...release,
-                        network: site.network,
-                        upcoming: true,
-                    })),
-                ];
-            } catch (error) {
-                if (argv.debug) {
-                    console.error(`${site.id}: Failed to fetch releases`, error);
-                    return [];
-                }
-
-                console.log(`${site.id}: Failed to fetch releases`);
-
-                return [];
-            }
-        }
-
-        console.error(`Cound not find scraper for '${site.name}' (${site.slug})`);
-
-        return [];
-    }, {
-        concurrency: 2,
-    });
-
-    const accumulatedScenes = scenesPerSite.reduce((acc, siteScenes) => ([...acc, ...siteScenes]), []);
-    const sortedScenes = accumulatedScenes.sort(({ date: dateA }, { date: dateB }) => moment(dateB).diff(dateA));
-
-    knex.destroy();
-
-    return sortedScenes;
-}
-
-module.exports = fetchReleases;
diff --git a/src/fetch-scene.js b/src/fetch-scene.js
deleted file mode 100644
index 0af6bae3..00000000
--- a/src/fetch-scene.js
+++ /dev/null
@@ -1,126 +0,0 @@
-'use strict';
-
-const config = require('config');
-const moment = require('moment');
-
-const knex = require('./knex');
-const argv = require('./argv');
-const scrapers = require('./scrapers');
-
-async function findSite(url) {
-    const { hostname } = new URL(url);
-    const domain = hostname.replace(/^www./, '');
-
-    const site = await knex('sites')
-        .select('sites.*', 'networks.name as network_name', 'networks.slug as network_slug', 'networks.parameters as network_parameters')
-        .where('sites.url', 'like', `%${domain}`)
-        .leftJoin('networks', 'sites.network_id', 'networks.id')
-        .first()
-        // scene might use generic network URL, let network scraper determine channel site
-        || await knex('networks')
-            .where('url', 'like', `%${domain}`)
-            .first();
-
-    return {
-        id: site.id,
-        name: site.name,
-        slug: site.slug,
-        description: site.description,
-        url: site.url,
-        network: {
-            id: site.network_id || site.id,
-            slug: site.network_slug || site.slug,
-            parameters: site.network_parameters && JSON.parse(site.network_parameters),
-        },
-        parameters: site.parameters && JSON.parse(site.parameters),
-        isFallback: site.network_id === undefined,
-    };
-}
-
-function deriveFilename(scene) {
-    const props = {
-        siteName: scene.site.name,
-        sceneId: scene.shootId,
-        sceneTitle: scene.title,
-        sceneActors: scene.actors.join(config.filename.actorsJoin),
-        sceneDate: moment.utc(scene.date).format(config.filename.dateFormat),
-    };
-
-    const filename = config.filename.pattern.replace(/\{\w+\}/g, (match) => {
-        const prop = match.slice(1, -1);
-        const value = props[prop];
-
-        if (value && config.filename.subpatterns[prop]) {
-            return config.filename.subpatterns[prop]
-                .replace(/\{\w+\}/, value)
-                .replace(/\//g, config.filename.slash);
-        }
-
-        if (value) {
-            return value.replace(/\//g, config.filename.slash) || '';
-        }
-
-        return '';
-    });
-
-    return filename;
-}
-
-async function storeRelease(release) {
-    const curatedRelease = {
-        site_id: release.site.id,
-        shoot_id: release.shootId || null,
-        entry_id: release.entryId || null,
-        url: release.url,
-        title: release.title,
-        date: release.date,
-        description: release.description,
-        // director: release.director,
-        duration: release.duration,
-        photos: release.photos ? release.photos.length : 0,
-        likes: release.rating && release.rating.likes,
-        dislikes: release.rating && release.rating.dislikes,
-        rating: release.rating && release.rating.stars,
-    };
-
-    console.log('Saving release to database');
-
-    await knex.raw(`${knex('releases').insert(curatedRelease).toString()} ON CONFLICT (site_id, shoot_id) DO UPDATE SET
-        description = EXCLUDED.description,
-        likes = EXCLUDED.likes,
-        dislikes = EXCLUDED.dislikes,
-        rating = EXCLUDED.rating
-    `);
-
-    return release;
-}
-
-async function fetchScene(url, release) {
-    const site = release.site || await findSite(url);
-    const scraper = scrapers[site.slug] || scrapers[site.network.slug];
-
-    if (!scraper) {
-        throw new Error('Could not find scraper for URL');
-    }
-
-    if (!scraper.fetchScene) {
-        throw new Error(`The '${site.name}'-scraper cannot fetch individual scenes`);
-    }
-
-    const scene = await scraper.fetchScene(url, site);
-    const filename = deriveFilename(scene);
-
-    if (argv.scene && argv.save) {
-        await storeRelease(scene);
-    }
-
-    // knex.destroy();
-
-    return {
-        ...scene,
-        filename,
-        copy: filename,
-    };
-}
-
-module.exports = fetchScene;
diff --git a/src/media.js b/src/media.js
index 6182bb70..e75c1693 100644
--- a/src/media.js
+++ b/src/media.js
@@ -28,7 +28,21 @@ async function getThumbnail(buffer) {
         .toBuffer();
 }
 
+async function createMediaDirectory(release, releaseId) {
+    if (release.poster || (release.photos && release.photos.length)) {
+        await fs.mkdir(
+            path.join(config.media.path, release.site.network.slug, release.site.slug, releaseId.toString()),
+            { recursive: true },
+        );
+    }
+}
+
 async function storePoster(release, releaseEntry) {
+    if (!release.poster) {
+        console.warn(`No poster available for (${release.site.name}, ${releaseEntry.id}}) "${release.title}"`);
+        return;
+    }
+
     console.log(`Storing poster for (${release.site.name}, ${releaseEntry.id}) "${release.title}"`);
 
     const res = await bhttp.get(release.poster);
@@ -66,6 +80,11 @@ async function storePoster(release, releaseEntry) {
 }
 
 async function storePhotos(release, releaseEntry) {
+    if (release.photos.length === 0) {
+        console.warn(`No photos available for (${release.site.name}, ${releaseEntry.id}}) "${release.title}"`);
+        return;
+    }
+
     console.log(`Storing ${release.photos.length} photos for (${release.site.name}, ${releaseEntry.id}) "${release.title}"`);
 
     const files = await Promise.map(release.photos, async (photoUrl, index) => {
@@ -123,6 +142,11 @@ async function storePhotos(release, releaseEntry) {
 }
 
 async function storeTrailer(release, releaseEntry) {
+    if (!release.trailer || !release.trailer.src) {
+        console.warn(`No trailer available for (${release.site.name}, ${releaseEntry.id}}) "${release.title}"`);
+        return;
+    }
+
     console.log(`Storing trailer for (${release.site.name}, ${releaseEntry.id}) "${release.title}"`);
 
     const { pathname } = new URL(release.trailer.src);
@@ -146,6 +170,7 @@ async function storeTrailer(release, releaseEntry) {
 }
 
 module.exports = {
+    createMediaDirectory,
     storePoster,
     storePhotos,
     storeTrailer,
diff --git a/src/networks.js b/src/networks.js
index 937cb942..37ce81f2 100644
--- a/src/networks.js
+++ b/src/networks.js
@@ -4,7 +4,7 @@ const knex = require('./knex');
 const whereOr = require('./utils/where-or');
 const { fetchSites } = require('./sites');
 
-async function curateNetwork(network) {
+async function curateNetwork(network, includeParameters = false) {
     const [sites, studios] = await Promise.all([
         fetchSites({ network_id: network.id }),
         knex('studios')
@@ -18,6 +18,7 @@ async function curateNetwork(network) {
         description: network.description,
         slug: network.slug,
         sites,
+        parameters: includeParameters ? JSON.parse(network.parameters) : null,
         studios: studios.map(studio => ({
             id: studio.id,
             name: studio.name,
@@ -32,6 +33,21 @@ function curateNetworks(releases) {
     return Promise.all(releases.map(async release => curateNetwork(release)));
 }
 
+async function findNetworkByUrl(url) {
+    const { hostname } = new URL(url);
+    const domain = hostname.replace(/^www./, '');
+
+    const network = await knex('networks')
+        .where('networks.url', 'like', `%${domain}`)
+        .first();
+
+    if (network) {
+        return curateNetwork(network, true);
+    }
+
+    return null;
+}
+
 async function fetchNetworks(queryObject) {
     const releases = await knex('networks')
         .where(builder => whereOr(queryObject, 'networks', builder))
@@ -54,4 +70,5 @@ async function fetchNetworksFromReleases() {
 module.exports = {
     fetchNetworks,
     fetchNetworksFromReleases,
+    findNetworkByUrl,
 };
diff --git a/src/releases.js b/src/releases.js
index e8286606..8e2b2ced 100644
--- a/src/releases.js
+++ b/src/releases.js
@@ -1,7 +1,17 @@
 'use strict';
 
+const Promise = require('bluebird');
 const knex = require('./knex');
+const argv = require('./argv');
 const whereOr = require('./utils/where-or');
+const { storeTags } = require('./tags');
+const { storeActors } = require('./actors');
+const {
+    createMediaDirectory,
+    storePoster,
+    storePhotos,
+    storeTrailer,
+} = require('./media');
 
 async function curateRelease(release) {
     const [actors, tags, media] = await Promise.all([
@@ -71,6 +81,69 @@ function curateReleases(releases) {
     return Promise.all(releases.map(async release => curateRelease(release)));
 }
 
+function curateScrapedRelease(release) {
+    return {
+        site_id: release.site.id,
+        studio_id: release.studio ? release.studio.id : null,
+        shoot_id: release.shootId || null,
+        entry_id: release.entryId || null,
+        url: release.url,
+        title: release.title,
+        date: release.date,
+        description: release.description,
+        // director: release.director,
+        duration: release.duration,
+        likes: release.rating && release.rating.likes,
+        dislikes: release.rating && release.rating.dislikes,
+        rating: release.rating && release.rating.stars && Math.floor(release.rating.stars),
+        deep: Boolean(argv.deep && release.url && !release.upcoming),
+    };
+}
+
+async function storeRelease(release) {
+    const curatedRelease = curateScrapedRelease(release);
+
+    const releaseEntries = await knex('releases')
+        .insert(curatedRelease)
+        .returning('*');
+
+    if (releaseEntries.length) {
+        const releaseEntry = releaseEntries[0];
+
+        console.log(`Stored (${release.site.name}, ${releaseEntry.id}) "${release.title}"`);
+
+        await createMediaDirectory(release, releaseEntry.id);
+
+        await Promise.all([
+            storeActors(release, releaseEntry),
+            storeTags(release, releaseEntry),
+            storePhotos(release, releaseEntry),
+            storePoster(release, releaseEntry),
+            storeTrailer(release, releaseEntry),
+        ]);
+
+        return releaseEntry.id;
+    }
+
+    console.error(`Unable to save scene to database, possible collision: "${release.title}" (${release.site.name})`);
+
+    return null;
+}
+
+async function storeReleases(releases) {
+    return Promise.map(releases, async (release) => {
+        try {
+            return storeRelease(release);
+        } catch (error) {
+            console.error(error);
+
+            return null;
+        }
+    }, {
+        concurrency: 2,
+    });
+}
+
 function commonQuery(queryBuilder, {
     filter = [],
     after = new Date(0), // January 1970
@@ -160,4 +233,6 @@ module.exports = {
     fetchSiteReleases,
     fetchNetworkReleases,
     fetchTagReleases,
+    storeRelease,
+    storeReleases,
 };
diff --git a/src/scrape-release.js b/src/scrape-release.js
new file mode 100644
index 00000000..368a64b5
--- /dev/null
+++ b/src/scrape-release.js
@@ -0,0 +1,58 @@
+'use strict';
+
+const config = require('config');
+
+const argv = require('./argv');
+const scrapers = require('./scrapers/scrapers');
+const { storeRelease } = require('./releases');
+const { findSiteByUrl } = require('./sites');
+const { findNetworkByUrl } = require('./networks');
+
+async function findSite(url, release) {
+    const site = (release && release.site) || await findSiteByUrl(url);
+
+    if (site) {
+        return site;
+    }
+
+    const network = await findNetworkByUrl(url);
+
+    if (network) {
+        return {
+            ...network,
+            isFallback: true,
+        };
+    }
+
+    return null;
+}
+
+async function scrapeRelease(url, release, deep = false) {
+    const site = await findSite(url, release);
+    const scraper = scrapers[site.slug] || scrapers[site.network.slug];
+
+    if (!site) {
+        throw new Error('Could not find site in database');
+    }
+
+    if (!scraper) {
+        throw new Error('Could not find scraper for URL');
+    }
+
+    if (!scraper.fetchScene) {
+        throw new Error(`The '${site.name}'-scraper cannot fetch individual releases`);
+    }
+
+    const scene = await scraper.fetchScene(url, site);
+
+    if (!deep && argv.save) {
+        // don't store release when called by site scraper
+        const releaseId = await storeRelease(scene);
+
+        console.log(`http://${config.web.host}:${config.web.port}/scene/${releaseId}`);
+    }
+
+    return scene;
+}
+
+module.exports = scrapeRelease;
diff --git a/src/scrape-sites.js b/src/scrape-sites.js
new file mode 100644
index 00000000..103cd49f
--- /dev/null
+++ b/src/scrape-sites.js
@@ -0,0 +1,136 @@
+'use strict';
+
+const Promise = require('bluebird');
+const moment = require('moment');
+
+const argv = require('./argv');
+const knex = require('./knex');
+const { fetchIncludedSites } = require('./sites');
+const scrapers = require('./scrapers/scrapers');
+const scrapeRelease = require('./scrape-release');
+const { storeReleases } = require('./releases');
+
+function getAfterDate() {
+    return moment
+        .utc()
+        .subtract(...argv.after.split(' '))
+        .toDate();
+}
+
+async function findDuplicateReleaseIds(latestReleases, accReleases) {
+    const duplicateReleases = await knex('releases')
+        .whereIn('entry_id', latestReleases.map(({ entryId }) => entryId));
+
+    // include accumulated releases as duplicates to prevent an infinite
+    // loop when the next page contains the same releases as the previous
+    return new Set(duplicateReleases
+        .map(release => release.entry_id)
+        .concat(accReleases.map(release => release.entryId)));
+}
+
+async function scrapeUniqueReleases(scraper, site, afterDate = getAfterDate(), accReleases = [], page = 1) {
+    const latestReleases = await scraper.fetchLatest(site, page);
+    const oldestReleaseOnPage = latestReleases.slice(-1)[0].date;
+
+    if (latestReleases.length === 0) {
+        return [];
+    }
+
+    const duplicateReleaseIds = await findDuplicateReleaseIds(latestReleases, accReleases);
+
+    const uniqueReleases = latestReleases
+        .filter(release => !duplicateReleaseIds.has(String(release.entryId)) // release is already in database
+            && moment(release.date).isAfter(afterDate)); // release is older than specified date limit
+
+    console.log(`\x1b[90m${site.name}: Scraped page ${page}, ${uniqueReleases.length} unique recent releases\x1b[0m`);
+
+    if (
+        uniqueReleases.length > 0
+            && (oldestReleaseOnPage || page < argv.pages)
+            && moment(oldestReleaseOnPage).isAfter(afterDate)
+    ) {
+        // oldest release on page is newer that specified limit, fetch next page
+        return scrapeUniqueReleases(scraper, site, afterDate, accReleases.concat(uniqueReleases), page + 1);
+    }
+
+    return accReleases.concat(uniqueReleases);
+}
+
+async function scrapeUpcomingReleases(scraper, site) {
+    if (scraper.fetchUpcoming) {
+        const upcomingReleases = scraper.fetchUpcoming(site);
+
+        return upcomingReleases.map(release => ({ ...release, upcoming: true }));
+    }
+
+    return [];
+}
+
+async function deepFetchReleases(baseReleases) {
+    return Promise.map(baseReleases, async (release) => {
+        if (release.url) {
+            const fullRelease = await scrapeRelease(release.url, release, true);
+
+            return {
+                ...release,
+                ...fullRelease,
+            };
+        }
+
+        return release;
+    }, {
+        concurrency: 2,
+    });
+}
+
+async function scrapeSiteReleases(scraper, site) {
+    const [newReleases, upcomingReleases] = await Promise.all([
+        scrapeUniqueReleases(scraper, site), // fetch basic release info from scene overview
+        scrapeUpcomingReleases(scraper, site), // fetch basic release info from upcoming overview
+    ]);
+
+    console.log(`${site.name}: Found ${newReleases.length} recent releases, ${upcomingReleases.length} upcoming releases`);
+
+    const baseReleases = [...newReleases, ...upcomingReleases];
+
+    if (argv.deep) {
+        // follow URL for every release
+        return deepFetchReleases(baseReleases);
+    }
+
+    return baseReleases;
+}
+
+async function scrapeReleases() {
+    const sites = await fetchIncludedSites();
+
+    console.log(`Found ${sites.length} sites in database`);
+
+    await Promise.map(sites, async (site) => {
+        const scraper = scrapers[site.slug] || scrapers[site.network.slug];
+
+        if (!scraper) {
+            console.warn(`No scraper found for '${site.name}' (${site.slug})`);
+            return;
+        }
+
+        try {
+            const siteReleases = await scrapeSiteReleases(scraper, site);
+
+            if (argv.save) {
+                await storeReleases(siteReleases);
+            }
+        } catch (error) {
+            if (argv.debug) {
+                console.error(`${site.id}: Failed to fetch releases`, error);
+                return;
+            }
+
+            console.warn(`${site.id}: Failed to fetch releases`);
+        }
+    }, {
+        concurrency: 2,
+    });
+}
+
+module.exports = scrapeReleases;
diff --git a/src/scrapers/brazzers.js b/src/scrapers/brazzers.js
index baa6bc19..2e03ad78 100644
--- a/src/scrapers/brazzers.js
+++ b/src/scrapers/brazzers.js
@@ -5,7 +5,7 @@ const bhttp = require('bhttp');
 const cheerio = require('cheerio');
 const moment = require('moment');
 
-const fetchSites = require('../sites');
+const { fetchSites } = require('../sites');
 const { matchTags } = require('../tags');
 
 function scrape(html, site, upcoming) {
@@ -23,7 +23,7 @@ function scrape(html, site, upcoming) {
 
         const url = `https://www.brazzers.com${sceneLinkElement.attr('href')}`;
         const title = sceneLinkElement.attr('title');
-        const shootId = url.split('/').slice(-3, -2)[0];
+        const entryId = url.split('/').slice(-3, -2)[0];
 
         const date = moment.utc($(element).find('time').text(), 'MMMM DD, YYYY').toDate();
         const actors = $(element).find('.model-names a').map((actorIndex, actorElement) => $(actorElement).attr('title')).toArray();
@@ -36,7 +36,7 @@ function scrape(html, site, upcoming) {
 
         return acc.concat({
             url,
-            shootId,
+            entryId,
             title,
             actors,
             date,
@@ -56,7 +56,7 @@ async function scrapeScene(html, url, site) {
     const videoJson = $('script:contains("window.videoUiOptions")').html();
     const videoData = JSON.parse(videoJson.slice(videoJson.indexOf('{"stream_info":'), videoJson.lastIndexOf('"},') + 2));
 
-    const shootId = url.split('/').slice(-3, -2)[0];
+    const entryId = url.split('/').slice(-3, -2)[0];
     const title = $('.scene-title[itemprop="name"]').text();
 
     const description = $('#scene-description p[itemprop="description"]')
@@ -83,20 +83,20 @@ async function scrapeScene(html, url, site) {
     const trailer = `https:${videoData.stream_info.http.paths.mp4_480_1500}`;
     const photos = $('.carousel-thumb a').map((photoIndex, photoElement) => `https:${$(photoElement).attr('href')}`).toArray();
 
-    const [tags, channelSite] = await Promise.all([
+    const [tags, [channelSite]] = await Promise.all([
         matchTags(rawTags),
         site.isFallback
-            ? [fetchSites({
+            ? fetchSites({
                 slug: siteSlug,
                 name: siteName,
                 url: siteUrl,
-            })]
-            : site,
+            })
+            : [site],
     ]);
 
     return {
         url,
-        shootId,
+        entryId,
         title,
         description,
         actors,
diff --git a/src/scrapers/dogfart.js b/src/scrapers/dogfart.js
index 10ab5f92..b34b5c5d 100644
--- a/src/scrapers/dogfart.js
+++ b/src/scrapers/dogfart.js
@@ -5,8 +5,8 @@ const Promise = require('bluebird');
 const bhttp = require('bhttp');
 const { JSDOM } = require('jsdom');
 const moment = require('moment');
-const knex = require('knex');
 
+const knex = require('../knex');
 const { matchTags } = require('../tags');
 const pluckPhotos = require('../utils/pluck-photos');
 
diff --git a/src/scrapers/kink.js b/src/scrapers/kink.js
index 111469c0..b6d1274c 100644
--- a/src/scrapers/kink.js
+++ b/src/scrapers/kink.js
@@ -3,8 +3,8 @@
 const bhttp = require('bhttp');
 const cheerio = require('cheerio');
 const moment = require('moment');
-const knex = require('knex');
 
+const { fetchSites } = require('../sites');
 const { matchTags } = require('../tags');
 
 function scrapeLatest(html, site) {
@@ -71,13 +71,17 @@ async function scrapeScene(html, url, shootId, ratingRes, site) {
 
     const { average: stars } = ratingRes.body;
 
-    const sitename = $('.shoot-logo a').attr('href').split('/')[2];
+    const siteName = $('.shoot-logo a').attr('href').split('/')[2];
+    const siteSlug = siteName.replace(/\s+/g, '').toLowerCase();
     const rawTags = $('.tag-list > a[href*="/tag"]').map((tagIndex, tagElement) => $(tagElement).text()).toArray();
 
-    const [channelSite, tags] = await Promise.all([
+    const [[channelSite], tags] = await Promise.all([
         site.isFallback
-            ? knex('sites').where({ slug: sitename }).first()
-            : site,
+            ? fetchSites({
+                slug: siteSlug,
+                name: siteName,
+            })
+            : [site],
         matchTags(rawTags),
     ]);
 
diff --git a/src/scrapers/pervcity.js b/src/scrapers/pervcity.js
index ce67e42e..49f94076 100644
--- a/src/scrapers/pervcity.js
+++ b/src/scrapers/pervcity.js
@@ -7,7 +7,7 @@ const moment = require('moment');
 function scrape(html, site) {
     const $ = cheerio.load(html, { normalizeWhitespace: true });
 
-    const shootId = $('li').attr('id');
+    const entryId = $('li').attr('id');
     const sceneLinkElement = $('#scene_title_border a');
     const url = `${site.url}/${sceneLinkElement.attr('href')}`;
     const title = sceneLinkElement.attr('title').replace(/\u00E2\u0080\u0099/g, '\''); // replace weird apostrophes
@@ -22,7 +22,7 @@ function scrape(html, site) {
 
     return {
         url,
-        shootId,
+        entryId,
         title,
         actors,
         date,
diff --git a/src/scrapers/private.js b/src/scrapers/private.js
index 4a60e633..dad97216 100644
--- a/src/scrapers/private.js
+++ b/src/scrapers/private.js
@@ -8,10 +8,10 @@ const moment = require('moment');
 const fetchSites = require('../sites');
 const { matchTags } = require('../tags');
 
-async function getPhotos(shootId, site) {
+async function getPhotos(entryId, site) {
     const { hostname } = new URL(site.url);
 
-    const res = await bhttp.get(`https://${hostname}/gallery.php?type=highres&id=${shootId}`);
+    const res = await bhttp.get(`https://${hostname}/gallery.php?type=highres&id=${entryId}`);
     const html = res.body.toString();
 
     const $ = cheerio.load(html, { normalizeWhitespace: true });
@@ -50,7 +50,7 @@ function scrapeLatest(html, site) {
 
         const url = sceneLinkElement.attr('href');
         const title = sceneLinkElement.text();
-        const shootId = url.split('/').slice(-1)[0];
+        const entryId = url.split('/').slice(-1)[0];
 
         const date = moment.utc($(element).find('.scene-date'), 'MM/DD/YYYY').toDate();
 
@@ -64,7 +64,7 @@ function scrapeLatest(html, site) {
 
         const scene = {
             url,
-            shootId,
+            entryId,
             title,
             actors,
             date,
@@ -83,7 +83,7 @@ function scrapeLatest(html, site) {
 async function scrapeScene(html, url, site) {
     const $ = cheerio.load(html, { normalizeWhitespace: true });
 
-    const shootId = url.split('/').slice(-1)[0];
+    const entryId = url.split('/').slice(-1)[0];
     const title = $('.video-wrapper meta[itemprop="name"]').attr('content');
 
     const date = moment.utc($('.video-wrapper meta[itemprop="uploadDate"]').attr('content'), 'MM/DD/YYYY').toDate();
@@ -93,8 +93,12 @@ async function scrapeScene(html, url, site) {
     const [minutes, seconds] = $('.video-wrapper meta[itemprop="duration"]').attr('content').match(/\d+/g);
     const duration = Number(minutes) * 60 + Number(seconds);
 
-    const poster = $('meta[property="og:image"]').attr('content');
-    const trailer = $('meta[property="og:video"]').attr('content');
+    const posterScript = $('script:contains(poster)').html();
+    const posterLink = posterScript.slice(posterScript.indexOf('https://'), posterScript.indexOf('.jpg') + 4);
+    const poster = $('meta[property="og:image"]').attr('content') || posterLink;
+
+    const trailerElementSrc = $('#videojs-trailer source').attr('src');
+    const trailer = $('meta[property="og:video"]').attr('content') || trailerElementSrc;
 
     const likes = Number($('.content-desc #social-actions #likes').text());
 
@@ -102,13 +106,13 @@ async function scrapeScene(html, url, site) {
 
     const [tags, photos, channelSite] = await Promise.all([
         matchTags(rawTags),
-        getPhotos(shootId, site),
+        getPhotos(entryId, site),
         getChannelSite($, site),
     ]);
 
     const scene = {
         url,
-        shootId,
+        entryId,
         title,
         date,
         actors,
diff --git a/src/scrapers/index.js b/src/scrapers/scrapers.js
similarity index 100%
rename from src/scrapers/index.js
rename to src/scrapers/scrapers.js
diff --git a/src/scrapers/vixen.js b/src/scrapers/vixen.js
index 8cf727f4..78fff80f 100644
--- a/src/scrapers/vixen.js
+++ b/src/scrapers/vixen.js
@@ -23,7 +23,7 @@ function scrapeLatest(html, site) {
     const { videos: scenes } = JSON.parse(stateScript.slice(stateScript.indexOf('{'), stateScript.indexOf('};') + 1));
 
     return scenes.map((scene) => {
-        const shootId = String(scene.newId);
+        const entryId = String(scene.newId);
 
         const {
             title,
@@ -40,7 +40,7 @@ function scrapeLatest(html, site) {
 
         return {
             url,
-            shootId,
+            entryId,
             title,
             actors,
             date,
@@ -65,8 +65,8 @@ async function scrapeScene(html, url, site) {
     const stateObject = $('script:contains("INITIAL_STATE")');
     const data = JSON.parse(stateObject.html().trim().slice(27, -1));
 
-    const shootId = data.page.data[`${pathname}${search}`].data.video;
-    const scene = data.videos.find(video => video.newId === shootId);
+    const entryId = data.page.data[`${pathname}${search}`].data.video;
+    const scene = data.videos.find(video => video.newId === entryId);
 
     const [poster, ...photos] = scene.rotatingThumbsUrlSizes.map(photo => photo['1040w']);
     const trailer = scene.previews.listing.find(preview => preview.height === 353) || null;
@@ -86,7 +86,7 @@ async function scrapeScene(html, url, site) {
 
     return {
         url,
-        shootId,
+        entryId,
         title,
         description,
         actors,
diff --git a/src/scrapers/xempire.js b/src/scrapers/xempire.js
index f97e226c..066aa97f 100644
--- a/src/scrapers/xempire.js
+++ b/src/scrapers/xempire.js
@@ -3,9 +3,9 @@
 const Promise = require('bluebird');
 const bhttp = require('bhttp');
 const cheerio = require('cheerio');
-const knex = require('knex');
 const moment = require('moment');
 
+const knex = require('../knex');
 const { matchTags } = require('../tags');
 
 const defaultTags = {
diff --git a/src/sites.js b/src/sites.js
index de1c39d7..46f3d110 100644
--- a/src/sites.js
+++ b/src/sites.js
@@ -1,9 +1,12 @@
 'use strict';
 
+const config = require('config');
+
+const argv = require('./argv');
 const knex = require('./knex');
 const whereOr = require('./utils/where-or');
 
-async function curateSite(site) {
+async function curateSite(site, includeParameters = false) {
     const parameters = JSON.parse(site.parameters);
 
     return {
@@ -13,12 +16,14 @@ async function curateSite(site) {
         description: site.description,
         slug: site.slug,
         independent: !!parameters && parameters.independent,
+        parameters: includeParameters ? JSON.parse(site.parameters) : null,
         network: {
             id: site.network_id,
             name: site.network_name,
             description: site.network_description,
             slug: site.network_slug,
             url: site.network_url,
+            parameters: includeParameters ? JSON.parse(site.network_parameters) : null,
         },
     };
 }
@@ -27,12 +32,85 @@ function curateSites(sites) {
     return Promise.all(sites.map(async site => curateSite(site)));
 }
 
+function destructConfigNetworks(networks) {
+    return networks.reduce((acc, network) => {
+        if (Array.isArray(network)) {
+            // network specifies sites
+            return {
+                ...acc,
+                sites: [...acc.sites, ...network[1]],
+            };
+        }
+
+        return {
+            ...acc,
+            networks: [...acc.networks, network],
+        };
+    }, {
+        networks: [],
+        sites: [],
+    });
+}
+
+async function findSiteByUrl(url) {
+    const { hostname } = new URL(url);
+    const domain = hostname.replace(/^www./, '');
+
+    const site = await knex('sites')
+        .leftJoin('networks', 'sites.network_id', 'networks.id')
+        .select(
+            'sites.*',
+            'networks.name as network_name', 'networks.slug as network_slug', 'networks.url as network_url', 'networks.description as network_description', 'networks.parameters as network_parameters',
+        )
+        .where('sites.url', 'like', `%${domain}`)
+        .first();
+
+    if (site) {
+        return curateSite(site, true);
+    }
+
+    return null;
+}
+
+async function fetchSitesFromArgv() {
+    const rawSites = await knex('sites')
+        .select('sites.*', 'networks.name as network_name', 'networks.slug as network_slug', 'networks.parameters as network_parameters')
+        .whereIn('sites.slug', argv.sites || [])
+        .orWhereIn('networks.slug', argv.networks || [])
+        .leftJoin('networks', 'sites.network_id', 'networks.id');
+
+    return curateSites(rawSites, true);
+}
+
+async function fetchSitesFromConfig() {
+    const included = destructConfigNetworks(config.include);
+
+    const networks = await knex('networks').select('id').whereIn('slug', included.networks || []);
+    const networkIds = networks.map(network => network.id);
+
+    const rawSites = await knex('sites')
+        .select('sites.*', 'networks.name as network_name')
+        .whereIn('sites.slug', included.sites || [])
+        .orWhereIn('network_id', networkIds)
+        .leftJoin('networks', 'sites.network_id', 'networks.id');
+
+    return curateSites(rawSites, true);
+}
+
+async function fetchIncludedSites() {
+    if (argv.networks || argv.sites) {
+        return fetchSitesFromArgv();
+    }
+
+    return fetchSitesFromConfig();
+}
+
 async function fetchSites(queryObject) {
     const sites = await knex('sites')
         .where(builder => whereOr(queryObject, 'sites', builder))
         .select(
             'sites.*',
-            'networks.name as network_name', 'networks.slug as network_slug', 'networks.url as network_url', 'networks.description as networks_description',
+            'networks.name as network_name', 'networks.slug as network_slug', 'networks.url as network_url', 'networks.description as network_description', 'networks.parameters as network_parameters',
         )
         .leftJoin('networks', 'sites.network_id', 'networks.id')
         .limit(100);
@@ -51,6 +129,11 @@ async function fetchSitesFromReleases() {
 }
 
 module.exports = {
+    curateSites,
+    fetchIncludedSites,
     fetchSites,
+    fetchSitesFromConfig,
+    fetchSitesFromArgv,
     fetchSitesFromReleases,
+    findSiteByUrl,
 };
diff --git a/src/tags.js b/src/tags.js
index f505de04..77d23490 100644
--- a/src/tags.js
+++ b/src/tags.js
@@ -25,7 +25,12 @@ function curateTags(tags) {
 }
 
 async function storeTags(release, releaseEntry) {
-    return knex('tags_associated').insert(release.tags.map(tagId => ({
+    if (!release.tags || release.tags.length === 0) {
+        console.warn(`No tags available for (${release.site.name}, ${releaseEntry.id}}) "${release.title}"`);
+        return;
+    }
+
+    await knex('tags_associated').insert(release.tags.map(tagId => ({
         tag_id: tagId,
         release_id: releaseEntry.id,
     })));
diff --git a/src/tui/formatters.js b/src/tui/formatters.js
deleted file mode 100644
index a9a846b3..00000000
--- a/src/tui/formatters.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-
-const moment = require('moment');
-
-const formatters = {
-    site: site => site.name,
-    network: network => network.name,
-    date: (date, column) => moment(date).format(column.format || 'MMM DD, YYYY'),
-    actors: actors => actors.join(', '),
-    rating: (rating) => {
-        if ((rating.likes === 0 && rating.dislikes === 0) || rating.stars === 0) {
-            return '\x1b[90mUnrated\x1b[0m';
-        }
-
-        if (rating.likes !== undefined && rating.dislikes === undefined) {
-            return `\x1b[93m★\x1b[0m N/A  \x1b[92m▲\x1b[0m ${String(rating.likes).padEnd(3)}`;
-        }
-
-        if (rating.stars) {
-            return `\x1b[93m★ ${rating.stars.toFixed(2)}\x1b[0m`;
-        }
-
-        const stars = rating.likes || rating.dislikes ? Math.floor(((rating.likes * 5 + rating.dislikes) / (rating.likes + rating.dislikes)) * 100) / 100 : null;
-
-        return `\x1b[93m★\x1b[0m ${stars.toFixed(2)} \x1b[92m▲\x1b[0m ${String(rating.likes).padEnd(3)} \x1b[31m▼\x1b[0m ${String(rating.dislikes).padEnd(3)}`;
-    },
-};
-
-module.exports = formatters;
diff --git a/src/tui/render.js b/src/tui/render.js
deleted file mode 100644
index bba249e4..00000000
--- a/src/tui/render.js
+++ /dev/null
@@ -1,111 +0,0 @@
-'use strict';
-
-const config = require('config');
-const blessed = require('neo-blessed');
-const opn = require('opn');
-const formatters = require('./formatters');
-
-function renderReleases(scenes, screen) {
-    screen.realloc();
-
-    const tableTop = blessed.Text({
-        content: config.columns.reduce((acc, column, index) => `${acc}${'─'.repeat(column.width)}${index < config.columns.length - 1 ? '┬' : '┐\x1b[0m'}`, '\x1b[30m┌'),
-    });
-
-    const items = scenes.map((scene, sceneIndex) => {
-        const row = config.columns.reduce((acc, column) => {
-            const value = (scene[column.value] && (formatters[column.value]
-                ? formatters[column.value](scene[column.value], column)
-                : scene[column.value])
-                .toString()) || '\x1b[90mNot available\x1b[0m';
-
-            const realLength = value.replace(/\x1b\[\d+m/g, '').length; // eslint-disable-line no-control-regex
-            const entityLength = value.length - realLength;
-
-            const truncatedValue = realLength > column.width - 2 ? `${value.slice(0, column.width - 2 - 3)}...` : value;
-            const paddedValue = truncatedValue.padEnd(column.width + entityLength - 1).padStart(column.width + entityLength);
-            const coloredValue = scene.upcoming ? `\x1b[92m${paddedValue}\x1b[0m` : `\x1b[97m${paddedValue}\x1b[0m`;
-
-            return `${acc}${coloredValue}\x1b[90m│\x1b[0m`;
-        }, '\x1b[90m│\x1b[0m');
-
-        if (sceneIndex < scenes.length - 1) {
-            const line = config.columns.reduce((acc, column, index) => `${acc}${'─'.repeat(column.width)}${index < config.columns.length - 1 ? '┼' : '┤\x1b[0m'}`, '\n\x1b[30m├');
-
-            return `${row}${line}`;
-        }
-
-        return `${row}${sceneIndex}`;
-    });
-
-    const menu = blessed.List({
-        style: {
-            selected: {
-                bold: true,
-            },
-        },
-        top: 1,
-        height: screen.rows - 3,
-        // width: 161,
-        width: config.columns.reduce((acc, column) => acc + column.width, 0),
-        keys: true,
-        vi: true,
-        mouse: true,
-        scrollbar: {
-            style: {
-                bg: 'red',
-            },
-            track: {
-                bg: 'magenta',
-            },
-        },
-        items,
-    });
-
-    menu.search = (cb) => {
-        const searchbox = blessed.Textbox({
-            inputOnFocus: true,
-        });
-
-        screen.append(searchbox);
-        searchbox.focus();
-
-        screen.render();
-
-        searchbox.on('submit', () => {
-            menu.focus();
-            cb(null, searchbox.value);
-
-            screen.append(menu);
-            screen.render();
-        });
-    };
-
-    const tableBottom = blessed.Text({
-        content: config.columns.reduce((acc, column, index) => `${acc}${'─'.repeat(column.width)}${index < config.columns.length - 1 ? '┴' : '┘\x1b[0m\n'}`, '\x1b[30m└'),
-        top: screen.rows - 2,
-    });
-
-    screen.append(tableTop);
-    screen.append(menu);
-    screen.append(tableBottom);
-
-    menu.focus();
-
-    menu.on('select', (child) => {
-        const scene = scenes[menu.getItemIndex(child)];
-
-        opn(scene.url);
-    });
-
-    screen.render();
-}
-
-function renderScene(scene, _screen) {
-    console.log(scene);
-}
-
-module.exports = {
-    renderReleases,
-    renderScene,
-};
diff --git a/src/web/server.js b/src/web/server.js
index e0b0ccb9..71ff78fb 100644
--- a/src/web/server.js
+++ b/src/web/server.js
@@ -63,8 +63,10 @@ function initServer() {
 
     app.use(router);
 
-    app.listen(config.web.port, () => {
-        console.log(`Web server listening on port ${config.web.port}`);
+    const server = app.listen(config.web.port, config.web.host, () => {
+        const { address, port } = server.address();
+
+        console.log(`Web server listening on ${address}:${port}`);
     });
 }