Media service

main.js

@@ -25,7 +25,7 @@ App.prototype.init = async function() {
     await this.databaseHelper.init();
 }
 
-App.prototype.run = function() {
+App.prototype.run = async function() {
     http.createServer(this.router).listen(CONFIG.port);
     this.libraryManager.updateLibraries(this.databaseHelper);
 }

model/access.js

@@ -15,6 +15,12 @@ const ACCESS_TO = {
     meta: 3
 };
 
+const GRANT = {
+    none: 0,
+    read: 1,
+    write: 2
+};
+
 function AccessModel() {
     DatabaseModel.call(this);
     this.id = null;
@@ -22,6 +28,7 @@ function AccessModel() {
     this.typeData = "";
     this.accessTo = ACCESS_TO.unknown;
     this.accessToData = "";
+    this.grant = GRANT.none;
 }
 
 AccessModel.prototype = Object.create(DatabaseModel.prototype);
@@ -36,7 +43,8 @@ AccessModel.prototype.createOrUpdateBase = async function(dbHelper) {
         type TINYINT NOT NULL,
         typeData STRING NOT NULL,
         accessTo TINYINT NOT NULL,
-        accessToData STRING NOT NULL
+        accessToData STRING NOT NULL,
+        grant TINYINT NOT NULL
         )`);
 }
 
@@ -46,11 +54,12 @@ AccessModel.prototype.describe = function() {
         "type": this.type,
         "typeData": this.typeData,
         "accessTo": this.accessTo,
-        "accessToData": this.accessToData
+        "accessToData": this.accessToData,
+        "grant": this.grant
     };
 }
 
-AccessModel.prototype.versionColumn = function() { return "loginDateTime"; }
+AccessModel.prototype.versionColumn = function() { return ""; }
 
 AccessModel.prototype.fromDb = function(dbObj) {
     this.id = dbObj["sessionId"];
@@ -58,6 +67,7 @@ AccessModel.prototype.fromDb = function(dbObj) {
     this.typeData = dbObj["typeData"];
     this.accessTo = dbObj["accessTo"];
     this.accessToData = dbObj["accessToData"];
+    this.grant = dbObj["grant"];
 }
 
 module.exports.AccessModel = AccessModel;

model/mediaItem.js

@@ -5,6 +5,7 @@ function MediaFileModel() {
     DatabaseModel.call(this);
     this.path = "";
     this.md5sum = "";
+    this.date = null;
 }
 
 MediaFileModel.prototype = Object.create(DatabaseModel.prototype);
@@ -17,13 +18,15 @@ MediaFileModel.prototype.createOrUpdateBase = async function(dbHelper) {
     await dbHelper.runSql(`CREATE TABLE IF NOT EXISTS 'mediaFile' (
         path STRING NOT NULL,
         md5sum varchar(32) NOT NULL,
+        date DateTime NOT NULL,
         PRIMARY KEY (path, md5sum))`);
 }
 
 MediaFileModel.prototype.describe = function() {
     return {
         "path": this.path,
-        "md5sum": this.md5sum
+        "md5sum": this.md5sum,
+        "date": this.date?.getTime()
     };
 }
 
@@ -32,6 +35,7 @@ MediaFileModel.prototype.versionColumn = function() { return ""; }
 MediaFileModel.prototype.fromDb = function(dbObj) {
     this.path = dbObj["path"];
     this.md5sum = dbObj["md5sum"];
+    this.date = new Date(dbObj["date"]);
 }
 
 module.exports.MediaFileModel = MediaFileModel;

model/mediaService.js

@@ -0,0 +1,81 @@
+
+function Media()
+{
+}
+
+function MediaStruct(i) {
+    this.path = i.path;
+    this.md5sum = i.md5sum;
+    this.date = i.date;
+    this.meta = {};
+    this.tags = [];
+}
+
+MediaStruct.prototype.pushMeta = function(key, value) {
+    if (key && value && !this.meta[key])
+        this.meta[key] = value;
+}
+
+MediaStruct.prototype.pushTag = function(tag) {
+    if (tag && this.tags.indexOf(tag) === -1)
+        this.tags.push(tag);
+}
+
+MediaStruct.prototype.HaveAccess = function(accessList) {
+    // FIXME
+    return false;
+}
+
+function reduceReqToMediaStruct(acc, i) {
+    let obj = acc[i.md5sum] = acc[i.md5sum] || new MediaStruct(i);
+    obj.pushMeta(i.metaKey, i.metaValue);
+    obj.pushTag(i.mediaTag);
+    return acc;
+}
+
+module.exports.fetchOne = async function(app, md5sum) {
+    let result = ((await app.databaseHelper.runSql(`
+        select mediaFile.path, mediaFile.md5sum, mediaFile.date,
+        mediaMeta.key as metaKey, mediaMeta.value as metaValue,
+        mediaTag.tag as mediaTag
+        from mediaFile
+        left join mediaMeta on mediaMeta.md5sum=mediaFile.md5sum
+        left join mediaTag on mediaTag.md5sum=mediaFile.md5sum
+        where mediaFile.md5sum=?`, md5sum)) || []).reduce(reduceReqToMediaStruct, {})[md5sum] || null;
+    return result;
+}
+
+module.exports.fetchMedias = async function(app, startTs, count) {
+    let result = ((await app.databaseHelper.runSql(`
+        select mediaFile.path, mediaFile.md5sum, mediaFile.date,
+        mediaMeta.key as metaKey, mediaMeta.value as metaValue,
+        mediaTag.tag as mediaTag
+        from mediaFile
+        left join mediaMeta on mediaMeta.md5sum=mediaFile.md5sum
+        left join mediaTag on mediaTag.md5sum=mediaFile.md5sum
+        where mediaFile.md5sum in
+            (select md5sum from mediaFile `
+            +(startTs ? "where date <? " : "")
+            +"order by date desc limit ?)", startTs ? [startTs, count] : [count])) || [])
+    .reduce(reduceReqToMediaStruct, {});
+
+    result = Object.keys(result).map(i => result[i]).sort((a, b) => b.date-a.date);
+    return result;
+};
+
+module.exports.fetchMediasWithAccess = async function(app, startTs, count, access) {
+    let result = [];
+    let lastTs = startTs;
+
+    while (result.length < count) {
+        let tmp = await module.exports.fetchMedias(app, lastTs, 25);
+        if (!tmp.length)
+            return result;
+        lastTs = tmp[tmp.length-1].date;
+        tmp = tmp.filter(i => i.HaveAccess(access));
+        if (tmp.length)
+            result = result.concat(tmp);
+    }
+    return result;
+};
+

router/api.js

@@ -1,5 +1,6 @@
 
 const Security = require('../src/security.js');
+const MediaService = require('../model/mediaService.js');
 
 module.exports = { register: app => {
     app.router.get("/api/access/list", (req, res) => {
@@ -22,9 +23,7 @@ module.exports = { register: app => {
     app.router.get("/api/media/list", async (req, res) => {
         app.routerUtils.onApiRequest(req, res);
         app.routerUtils.jsonResponse(res, {
-            start: 0,
-            end: 0,
-            data: []
+            data: await MediaService.fetchMediasWithAccess(app, 0, 50, req.accessList)
         });
     });
 }};

src/library.js

@@ -37,6 +37,7 @@ File.prototype.saveDb = async function(db, libraryHash) {
     let _this = this;
     entity.path = this.path;
     entity.md5sum = this.checksum;
+    entity.date = this.meta.dateTime || new Date(fs.statsSync(this.path)?.birthtimeMs || Date.now());
     await db.insertOne(entity);
     this.meta.photochamberImport = new Date();
     this.meta.libraryPath = libraryHash;