Compare commits

...

6 Commits

8 changed files with 12 additions and 11 deletions
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "audiobookshelf-client", "name": "audiobookshelf-client",
"version": "2.4.0", "version": "2.4.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "audiobookshelf-client", "name": "audiobookshelf-client",
"version": "2.4.0", "version": "2.4.1",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@nuxtjs/axios": "^5.13.6", "@nuxtjs/axios": "^5.13.6",
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "audiobookshelf-client", "name": "audiobookshelf-client",
"version": "2.4.0", "version": "2.4.1",
"description": "Self-hosted audiobook and podcast client", "description": "Self-hosted audiobook and podcast client",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "audiobookshelf", "name": "audiobookshelf",
"version": "2.4.0", "version": "2.4.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "audiobookshelf", "name": "audiobookshelf",
"version": "2.4.0", "version": "2.4.1",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"axios": "^0.27.2", "axios": "^0.27.2",
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "audiobookshelf", "name": "audiobookshelf",
"version": "2.4.0", "version": "2.4.1",
"description": "Self-hosted audiobook and podcast server", "description": "Self-hosted audiobook and podcast server",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
+1 -1
View File
@@ -17,7 +17,7 @@ class FileSystemController {
}) })
// Do not include existing mapped library paths in response // Do not include existing mapped library paths in response
const libraryFoldersPaths = await Database.libraryModelFolder.getAllLibraryFolderPaths() const libraryFoldersPaths = await Database.libraryFolderModel.getAllLibraryFolderPaths()
libraryFoldersPaths.forEach((path) => { libraryFoldersPaths.forEach((path) => {
let dir = path || '' let dir = path || ''
if (dir.includes(global.appRoot)) dir = dir.replace(global.appRoot, '') if (dir.includes(global.appRoot)) dir = dir.replace(global.appRoot, '')
+1
View File
@@ -11,6 +11,7 @@ const LibraryScan = require('./LibraryScan')
const Author = require('../objects/entities/Author') const Author = require('../objects/entities/Author')
const Series = require('../objects/entities/Series') const Series = require('../objects/entities/Series')
const LibraryScanner = require('./LibraryScanner') const LibraryScanner = require('./LibraryScanner')
const CoverManager = require('../managers/CoverManager')
class Scanner { class Scanner {
constructor() { } constructor() { }
@@ -211,7 +211,7 @@ module.exports = {
mediaWhere[key] = { mediaWhere[key] = {
[Sequelize.Op.or]: [null, ''] [Sequelize.Op.or]: [null, '']
} }
} else if (['genres', 'tags', 'narrator'].includes(value)) { } else if (['genres', 'tags', 'narrators'].includes(value)) {
mediaWhere[value] = { mediaWhere[value] = {
[Sequelize.Op.or]: [null, Sequelize.where(Sequelize.fn('json_array_length', Sequelize.col(value)), 0)] [Sequelize.Op.or]: [null, Sequelize.where(Sequelize.fn('json_array_length', Sequelize.col(value)), 0)]
} }
@@ -566,7 +566,7 @@ module.exports = {
], ],
order: sortOrder, order: sortOrder,
subQuery: false, subQuery: false,
limit, limit: limit || null,
offset offset
}) })
@@ -81,7 +81,7 @@ module.exports = {
if (global.ServerSettings.sortingIgnorePrefix) { if (global.ServerSettings.sortingIgnorePrefix) {
return [[Sequelize.literal('titleIgnorePrefix COLLATE NOCASE'), dir]] return [[Sequelize.literal('titleIgnorePrefix COLLATE NOCASE'), dir]]
} else { } else {
return [[Sequelize.literal('title COLLATE NOCASE'), dir]] return [[Sequelize.literal('`podcast`.`title` COLLATE NOCASE'), dir]]
} }
} else if (sortBy === 'media.numTracks') { } else if (sortBy === 'media.numTracks') {
return [['numEpisodes', dir]] return [['numEpisodes', dir]]
@@ -166,7 +166,7 @@ module.exports = {
], ],
order: this.getOrder(sortBy, sortDesc), order: this.getOrder(sortBy, sortDesc),
subQuery: false, subQuery: false,
limit, limit: limit || null,
offset offset
}) })