Mirrors/audiobookshelf
Mirrors/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2024-12-20 19:06:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into prod-opts

Browse Source
This commit is contained in:
advplyr 2023-01-22 08:05:25 -06:00 committed by GitHub
commit 22179d82b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/strings/fr.json
View File

@ -532,15 +532,15 @@
"MessageXLibraryIsEmpty": "La Bibliothèque {0} est vide!", "MessageXLibraryIsEmpty": "La Bibliothèque {0} est vide!",
"MessageYourAudiobookDurationIsLonger": "La durée de votre Livre Audio est plus longue que la durée trouvée", "MessageYourAudiobookDurationIsLonger": "La durée de votre Livre Audio est plus longue que la durée trouvée",
"MessageYourAudiobookDurationIsShorter": "La durée de votre Livre Audio est plus courte que la durée trouvée", "MessageYourAudiobookDurationIsShorter": "La durée de votre Livre Audio est plus courte que la durée trouvée",
"MonthApr": "Apr", "MonthApr": "Avr",
"MonthAug": "Aug", "MonthAug": "Aoû",
"MonthDec": "Dec", "MonthDec": "Déc",
"MonthFeb": "Feb", "MonthFeb": "Fév",
"MonthJan": "Jan", "MonthJan": "Jan",
"MonthJul": "Jul", "MonthJul": "Jul",
"MonthJun": "Jun", "MonthJun": "Jui",
"MonthMar": "Mar", "MonthMar": "Mar",
"MonthMay": "May", "MonthMay": "Mai",
"MonthNov": "Nov", "MonthNov": "Nov",
"MonthOct": "Oct", "MonthOct": "Oct",
"MonthSep": "Sep", "MonthSep": "Sep",
@ -626,14 +626,14 @@
"ToastSocketFailedToConnect": "Échec de la connexion WebSocket", "ToastSocketFailedToConnect": "Échec de la connexion WebSocket",
"ToastUserDeleteFailed": "Échec de la suppression de l'utilisateur", "ToastUserDeleteFailed": "Échec de la suppression de l'utilisateur",
"ToastUserDeleteSuccess": "Utilisateur supprimé", "ToastUserDeleteSuccess": "Utilisateur supprimé",
"WeekdayFri": "Fri", "WeekdayFri": "Ven",
"WeekdayFriday": "Vendredi", "WeekdayFriday": "Vendredi",
"WeekdayMon": "Mon", "WeekdayMon": "Lun",
"WeekdayMonday": "Lundi", "WeekdayMonday": "Lundi",
"WeekdaySaturday": "Samedi", "WeekdaySaturday": "Samedi",
"WeekdaySunday": "Dimanche", "WeekdaySunday": "Dimanche",
"WeekdayThursday": "Jeudi", "WeekdayThursday": "Jeudi",
"WeekdayTuesday": "Mardi", "WeekdayTuesday": "Mardi",
"WeekdayWed": "Wed", "WeekdayWed": "Mer",
"WeekdayWednesday": "Mercredi" "WeekdayWednesday": "Mercredi"
} }

4
index.js
View File

@ -18,8 +18,8 @@ const PORT = process.env.PORT || 80
const HOST = process.env.HOST const HOST = process.env.HOST
const CONFIG_PATH = process.env.CONFIG_PATH || '/config' const CONFIG_PATH = process.env.CONFIG_PATH || '/config'
const METADATA_PATH = process.env.METADATA_PATH || '/metadata' const METADATA_PATH = process.env.METADATA_PATH || '/metadata'
const UID = process.env.AUDIOBOOKSHELF_UID || 99 const UID = process.env.AUDIOBOOKSHELF_UID
const GID = process.env.AUDIOBOOKSHELF_GID || 100 const GID = process.env.AUDIOBOOKSHELF_GID
const SOURCE = process.env.SOURCE || 'docker' const SOURCE = process.env.SOURCE || 'docker'
const ROUTER_BASE_PATH = process.env.ROUTER_BASE_PATH || '' const ROUTER_BASE_PATH = process.env.ROUTER_BASE_PATH || ''

5
prod.js
View File

@ -23,9 +23,10 @@ const PORT = options.port || process.env.PORT || 3333
const HOST = options.host || process.env.HOST const HOST = options.host || process.env.HOST
const CONFIG_PATH = inputConfig || process.env.CONFIG_PATH || Path.resolve('config') const CONFIG_PATH = inputConfig || process.env.CONFIG_PATH || Path.resolve('config')
const METADATA_PATH = inputMetadata || process.env.METADATA_PATH || Path.resolve('metadata') const METADATA_PATH = inputMetadata || process.env.METADATA_PATH || Path.resolve('metadata')
const UID = 99 const UID = process.env.AUDIOBOOKSHELF_UID
const GID = 100 const GID = process.env.AUDIOBOOKSHELF_GID
const SOURCE = options.source || process.env.SOURCE || 'debian' const SOURCE = options.source || process.env.SOURCE || 'debian'
const ROUTER_BASE_PATH = process.env.ROUTER_BASE_PATH || '' const ROUTER_BASE_PATH = process.env.ROUTER_BASE_PATH || ''
console.log(process.env.NODE_ENV, 'Config', CONFIG_PATH, METADATA_PATH) console.log(process.env.NODE_ENV, 'Config', CONFIG_PATH, METADATA_PATH)

5
server/Server.js
View File

@ -43,8 +43,8 @@ class Server {
this.Host = HOST this.Host = HOST
global.Source = SOURCE global.Source = SOURCE
global.isWin = process.platform === 'win32' global.isWin = process.platform === 'win32'
global.Uid = isNaN(UID) ? 0 : Number(UID) global.Uid = isNaN(UID) ? undefined : Number(UID)
global.Gid = isNaN(GID) ? 0 : Number(GID) global.Gid = isNaN(GID) ? undefined : Number(GID)
global.ConfigPath = fileUtils.filePathToPOSIX(Path.normalize(CONFIG_PATH)) global.ConfigPath = fileUtils.filePathToPOSIX(Path.normalize(CONFIG_PATH))
global.MetadataPath = fileUtils.filePathToPOSIX(Path.normalize(METADATA_PATH)) global.MetadataPath = fileUtils.filePathToPOSIX(Path.normalize(METADATA_PATH))
global.RouterBasePath = ROUTER_BASE_PATH global.RouterBasePath = ROUTER_BASE_PATH
@ -142,6 +142,7 @@ class Server {
const app = express() const app = express()
const router = express.Router() const router = express.Router()
app.use(global.RouterBasePath, router) app.use(global.RouterBasePath, router)
app.disable('x-powered-by')
this.server = http.createServer(app) this.server = http.createServer(app)

10
server/utils/filePerms.js
View File

@ -91,7 +91,11 @@ module.exports.setDefault = (path, silent = false) => {
const uid = global.Uid const uid = global.Uid
const gid = global.Gid const gid = global.Gid
return new Promise((resolve) => { return new Promise((resolve) => {
if (!silent) Logger.debug(`[FilePerms] Setting permission "${mode}" for uid ${uid} and gid ${gid} | "${path}"`) if (isNaN(uid) || isNaN(gid)) {
if (!silent) Logger.debug('Not modifying permissions since no uid/gid is specified')
return resolve()
}
if (!silent) Logger.debug(`Setting permission "${mode}" for uid ${uid} and gid ${gid} | "${path}"`)
chmodr(path, mode, uid, gid, resolve) chmodr(path, mode, uid, gid, resolve)
}) })
} }
@ -102,6 +106,10 @@ module.exports.setDefaultDirSync = (path, silent = false) => {
const mode = 0o744 const mode = 0o744
const uid = global.Uid const uid = global.Uid
const gid = global.Gid const gid = global.Gid
if (isNaN(uid) || isNaN(gid)) {
if (!silent) Logger.debug('Not modifying permissions since no uid/gid is specified')
return true
}
if (!silent) Logger.debug(`[FilePerms] Setting dir permission "${mode}" for uid ${uid} and gid ${gid} | "${path}"`) if (!silent) Logger.debug(`[FilePerms] Setting dir permission "${mode}" for uid ${uid} and gid ${gid} | "${path}"`)
try { try {
fs.chmodSync(path, mode) fs.chmodSync(path, mode)