diff --git a/assets/views/home.jsx b/assets/views/home.jsx index cc65611e..14ab61ce 100644 --- a/assets/views/home.jsx +++ b/assets/views/home.jsx @@ -14,6 +14,7 @@ class Home extends React.Component { Site Title Actors + Tags {this.props.releases.map(release => ( @@ -23,7 +24,8 @@ class Home extends React.Component { { release.shootId || release.entryId } { release.site.name } { release.title } - { release.actors && release.actors.map(actor => actor.name).join(', ') } + { release.actors.map(actor => actor.name).join(', ') } + { release.tags.map(tag => tag.tag).join(', ') } ))} diff --git a/src/fetch-releases.js b/src/fetch-releases.js index dba72a32..7a901b12 100644 --- a/src/fetch-releases.js +++ b/src/fetch-releases.js @@ -178,8 +178,6 @@ async function fetchReleases() { }) : newReleases; - console.log(finalReleases); - await storeReleases(finalReleases); } diff --git a/src/fetch-scene.js b/src/fetch-scene.js index 642bc1b3..185f9e64 100644 --- a/src/fetch-scene.js +++ b/src/fetch-scene.js @@ -115,7 +115,7 @@ async function fetchScene(url) { const scene = await scraper.fetchScene(url, site); const filename = deriveFilename(scene); - if (argv.save) { + if (argv.scene && argv.save) { await storeRelease(scene); } diff --git a/src/releases.js b/src/releases.js index c6a1d5e6..490d33b0 100644 --- a/src/releases.js +++ b/src/releases.js @@ -8,6 +8,11 @@ async function curateRelease(release) { .where({ release_id: release.id }) .leftJoin('actors', 'actors.id', 'actors_associated.actor_id'); + const tags = await knex('tags_associated') + .select('tags.tag', 'tags.capitalization') + .where({ release_id: release.id }) + .leftJoin('tags', 'tags.tag', 'tags_associated.tag_id'); + return { id: release.id, title: release.title, @@ -18,6 +23,7 @@ async function curateRelease(release) { entryId: release.entry_id, actors, director: release.director, + tags, rating: { likes: release.likes, dislikes: release.dislikes,