diff --git a/catalogs/addon.js b/catalogs/addon.js index 25f307e..3fa40c5 100644 --- a/catalogs/addon.js +++ b/catalogs/addon.js @@ -22,7 +22,7 @@ const limiter = new Bottleneck({ builder.defineCatalogHandler((args) => { const offset = parseInt(args.extra.skip || '0', 10); - const genre = args.extra.genre || genres[3]; + const genre = args.extra.genre || genres[5]; const catalog = manifest.catalogs.find(c => c.id === args.id); console.log(`Incoming catalog ${args.id} request with genre=${genre} and skip=${offset}`) if (!catalog) { @@ -66,8 +66,10 @@ function getStartDate(genre) { switch (genre) { case genres[0]: return moment().utc().startOf('day'); case genres[1]: return moment().utc().subtract(1, 'day').startOf('day'); - case genres[2]: return moment().utc().subtract(7, 'day').startOf('isoWeek'); - case genres[3]: return moment().utc().subtract(30, 'day').startOf('month'); + case genres[2]: return moment().utc().startOf('isoWeek'); + case genres[3]: return moment().utc().subtract(7, 'day').startOf('isoWeek'); + case genres[4]: return moment().utc().startOf('month'); + case genres[5]: return moment().utc().subtract(30, 'day').startOf('month'); default: return undefined; } } @@ -76,8 +78,10 @@ function getEndDate( genre) { switch (genre) { case genres[0]: return moment().utc(); case genres[1]: return moment().utc().subtract(1, 'day').endOf('day'); - case genres[2]: return moment().utc().subtract(7, 'day').endOf('isoWeek'); - case genres[3]: return moment().utc().subtract(30, 'day').endOf('month'); + case genres[2]: return moment().utc().endOf('isoWeek'); + case genres[3]: return moment().utc().subtract(7, 'day').endOf('isoWeek'); + case genres[4]: return moment().utc().endOf('month'); + case genres[5]: return moment().utc().subtract(30, 'day').endOf('month'); default: return undefined; } } diff --git a/catalogs/lib/manifest.js b/catalogs/lib/manifest.js index d66ffe0..2df15ff 100644 --- a/catalogs/lib/manifest.js +++ b/catalogs/lib/manifest.js @@ -3,7 +3,9 @@ const { Type } = require('../../addon/lib/types'); const genres = [ 'Today', 'Yesterday', + 'This Week', 'Last Week', + 'This Month', 'Last Month', 'All Time' ] @@ -22,7 +24,7 @@ function createManifest() { { id: 'top-movies', type: Type.MOVIE, - name: "Top seeded movies", + name: "Top seeded", pageSize: 20, extra: [{ name: 'genre', options: genres }, { name: 'skip' }], genres: genres @@ -30,7 +32,7 @@ function createManifest() { { id: 'top-series', type: Type.SERIES, - name: "Top seeded series", + name: "Top seeded", pageSize: 20, extra: [{ name: 'genre', options: genres }, { name: 'skip' }], genres: genres @@ -38,7 +40,7 @@ function createManifest() { { id: 'top-anime', type: Type.ANIME, - name: "Top seeded anime", + name: "Top seeded", pageSize: 20, extra: [{ name: 'genre', options: genres }, { name: 'skip' }], genres: genres