aboutsummaryrefslogtreecommitdiff
path: root/src/api
diff options
context:
space:
mode:
authorZephyrrus <[email protected]>2020-06-29 22:18:42 +0300
committerZephyrrus <[email protected]>2020-06-29 22:18:42 +0300
commit520062508ccad88d49229e603fc4d2c0c0a118d3 (patch)
tree19b75c029c6e5e4ddc20e1f2fc96799d64e1705e /src/api
parentfix: heigh issues where the parent is smaller than the child (diff)
downloadhost.fuwn.me-520062508ccad88d49229e603fc4d2c0c0a118d3.tar.xz
host.fuwn.me-520062508ccad88d49229e603fc4d2c0c0a118d3.zip
feat: backend pagination
serverLoad++; userRamUsage--;
Diffstat (limited to 'src/api')
-rw-r--r--src/api/routes/files/filesGET.js22
-rw-r--r--src/api/utils/Util.js2
2 files changed, 19 insertions, 5 deletions
diff --git a/src/api/routes/files/filesGET.js b/src/api/routes/files/filesGET.js
index f1a3a26..07dc1f7 100644
--- a/src/api/routes/files/filesGET.js
+++ b/src/api/routes/files/filesGET.js
@@ -7,10 +7,23 @@ class filesGET extends Route {
}
async run(req, res, db, user) {
- // Get all the files from the user
- const files = await db.table('files')
+ let count = 0;
+
+ let files = db.table('files')
.where('userId', user.id)
- .orderBy('id', 'desc');
+ .orderBy('createdAt', 'desc');
+
+ const { page, limit = 100 } = req.query;
+ if (page && page >= 0) {
+ files = await files.offset((page - 1) * limit).limit(limit);
+
+ count = (await db.table('files')
+ .count('id as count')
+ .where('userId', user.id)
+ .first()).count;
+ } else {
+ count = files.length;
+ }
// For each file, create the public link to be able to display the file
for (let file of files) {
@@ -19,7 +32,8 @@ class filesGET extends Route {
return res.json({
message: 'Successfully retrieved files',
- files
+ files,
+ count
});
}
}
diff --git a/src/api/utils/Util.js b/src/api/utils/Util.js
index b8d960d..c37297a 100644
--- a/src/api/utils/Util.js
+++ b/src/api/utils/Util.js
@@ -122,7 +122,7 @@ class Util {
/*
It's funny but if you do i++ the asignment never gets done resulting in an infinite loop
*/
- if (i < 5) return retry(i + 1);
+ if (i < 5) return retry(++i);
log.error('Couldnt allocate identifier for album');
return null;
};