Moved SFW mode to server, added HTTP header trigger.

This commit is contained in:
2020-03-27 17:37:13 +01:00
parent fb59bf552a
commit 238ebcbf34
9 changed files with 48 additions and 63 deletions

View File

@@ -1,6 +1,5 @@
'use strict';
// const knex = require('./knex');
const argv = require('./argv');
const initServer = require('./web/server');
@@ -9,7 +8,6 @@ const fetchUpdates = require('./updates');
const { fetchScenes, fetchMovies } = require('./deep');
const { storeReleases } = require('./store-releases');
const { updateReleasesSearch } = require('./releases');
// const { storeReleaseActors } = require('./actors');
async function init() {
if (argv.server) {
@@ -41,55 +39,4 @@ async function init() {
knex.destroy();
}
/*
const scrapeSites = require('./scrape-sites');
const { scrapeScenes, scrapeMovies, deepFetchReleases } = require('./scrape-releases');
const { storeReleases, updateReleasesSearch } = require('./releases');
const { scrapeActors, scrapeBasicActors } = require('./actors');
if (process.env.NODE_ENV === 'development') {
require('longjohn'); // eslint-disable-line global-require
}
async function init() {
if (argv.scene) {
await scrapeScenes(argv.scene);
if (argv.movie) {
await scrapeMovies(argv.movie);
}
if (argv.scrape || argv.networks || argv.sites) {
await scrapeSites();
}
if (argv.actors && argv.actors.length > 0) {
const actors = await scrapeActors();
if (argv.withReleases) {
const baseReleases = actors.map(actor => actor?.releases || []).flat();
const releases = await deepFetchReleases(baseReleases, null);
await storeReleases(releases);
}
}
if (argv.actors && argv.actors.length === 0) {
await scrapeBasicActors();
}
if (argv.updateSearch) {
await updateReleasesSearch();
}
if (argv.server) {
await initServer();
return;
}
knex.destroy();
}
*/
module.exports = init;

View File

@@ -63,6 +63,8 @@ function initServer() {
},
));
app.set('view engine', 'ejs');
router.use('/media', express.static(config.media.path));
router.use(express.static('public'));
@@ -93,7 +95,11 @@ function initServer() {
router.get('/api/tags/:tagId/releases', fetchTagReleases);
router.get('*', (req, res) => {
res.sendFile(path.join(__dirname, '../../public/index.html'));
res.render(path.join(__dirname, '../../assets/index.ejs'), {
env: JSON.stringify({
sfw: !!req.headers.sfw || Object.prototype.hasOwnProperty.call(req.query, 'sfw'),
}),
});
});
app.use(router);