mirror of
https://github.com/advplyr/audiobookshelf.git
synced 2026-07-09 02:41:35 +00:00
Compare commits
3 commits
693dc00fa3
...
1f7be58124
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1f7be58124 | ||
|
|
6b8b27b04f | ||
|
|
ba4061e5a4 |
2 changed files with 20 additions and 9 deletions
|
|
@ -57,7 +57,7 @@ WORKDIR /app
|
||||||
# Copy compiled frontend and server from build stages
|
# Copy compiled frontend and server from build stages
|
||||||
COPY --from=build-client /client/dist /app/client/dist
|
COPY --from=build-client /client/dist /app/client/dist
|
||||||
COPY --from=build-server /server /app
|
COPY --from=build-server /server /app
|
||||||
COPY --from=build-server /usr/local/lib/nusqlite3 /usr/local/lib/nusqlite3
|
COPY --from=build-server ${NUSQLITE3_PATH} ${NUSQLITE3_PATH}
|
||||||
|
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -766,14 +766,25 @@ class Database {
|
||||||
Logger.warn(`Removed ${badSessionsRemoved} sessions that were 3 seconds or less`)
|
Logger.warn(`Removed ${badSessionsRemoved} sessions that were 3 seconds or less`)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove mediaProgresses with duplicate mediaItemId (remove the oldest updatedAt)
|
// Remove mediaProgresses with duplicate mediaItemId (remove the oldest updatedAt or if updatedAt is the same, remove arbitrary one)
|
||||||
// const [duplicateMediaProgresses] = await this.sequelize.query(`SELECT id, mediaItemId FROM mediaProgresses WHERE (mediaItemId, userId, updatedAt) IN (SELECT mediaItemId, userId, MIN(updatedAt) FROM mediaProgresses GROUP BY mediaItemId, userId HAVING COUNT(*) > 1)`)
|
const [duplicateMediaProgresses] = await this.sequelize.query(`SELECT mp1.id, mp1.mediaItemId
|
||||||
// for (const duplicateMediaProgress of duplicateMediaProgresses) {
|
FROM mediaProgresses mp1
|
||||||
// Logger.warn(`Found duplicate mediaProgress for mediaItem "${duplicateMediaProgress.mediaItemId}" - removing it`)
|
WHERE EXISTS (
|
||||||
// await this.mediaProgressModel.destroy({
|
SELECT 1
|
||||||
// where: { id: duplicateMediaProgress.id }
|
FROM mediaProgresses mp2
|
||||||
// })
|
WHERE mp2.mediaItemId = mp1.mediaItemId
|
||||||
// }
|
AND mp2.userId = mp1.userId
|
||||||
|
AND (
|
||||||
|
mp2.updatedAt > mp1.updatedAt
|
||||||
|
OR (mp2.updatedAt = mp1.updatedAt AND mp2.id < mp1.id)
|
||||||
|
)
|
||||||
|
)`)
|
||||||
|
for (const duplicateMediaProgress of duplicateMediaProgresses) {
|
||||||
|
Logger.warn(`Found duplicate mediaProgress for mediaItem "${duplicateMediaProgress.mediaItemId}" - removing it`)
|
||||||
|
await this.mediaProgressModel.destroy({
|
||||||
|
where: { id: duplicateMediaProgress.id }
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async createTextSearchQuery(query) {
|
async createTextSearchQuery(query) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue