jketreno/ketr.photos
1
0
Fork 0
Code Issues 1 Activity

Added 'updated' field for operations

Browse Source 
Signed-off-by: James Ketrenos <james_git@ketrenos.com>
This commit is contained in:
James Ketr 2018-10-23 19:11:12 -07:00
parent 7f8650b0cf
commit 6655677605
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/db/photos.js
View File

@ -56,6 +56,7 @@ function init() {
filename: Sequelize.STRING, filename: Sequelize.STRING,
added: Sequelize.DATE, added: Sequelize.DATE,
modified: Sequelize.DATE, modified: Sequelize.DATE,
updated: Sequelize.DATE,
scanned: Sequelize.DATE, scanned: Sequelize.DATE,
taken: Sequelize.DATE, taken: Sequelize.DATE,
width: Sequelize.INTEGER, width: Sequelize.INTEGER,

9
server/routes/photos.js
View File

@ -126,7 +126,7 @@ router.put("/:id", function(req, res/*, next*/) {
switch (req.query.a) { switch (req.query.a) {
case "undelete": case "undelete":
console.log("Undeleting " + req.params.id); console.log("Undeleting " + req.params.id);
return photoDB.sequelize.query("UPDATE photos SET deleted=0 WHERE id=:id", { return photoDB.sequelize.query("UPDATE photos SET deleted=0,updated=CURRENT_TIMESTAMP WHERE id=:id", {
replacements: replacements replacements: replacements
}).then(function() { }).then(function() {
return res.status(200).send(req.params.id + " updated."); return res.status(200).send(req.params.id + " updated.");
@ -210,7 +210,7 @@ router.put("/:id", function(req, res/*, next*/) {
return rename(target, original); return rename(target, original);
}).then(function() { }).then(function() {
return photoDB.sequelize.query("UPDATE photos SET " + return photoDB.sequelize.query("UPDATE photos SET " +
"modified=:modified,width=:width,height=:height,size=:size,scanned=CURRENT_TIMESTAMP " + "modified=:modified,width=:width,height=:height,size=:size,updated=CURRENT_TIMESTAMP,scanned=CURRENT_TIMESTAMP " +
"WHERE id=:id", { "WHERE id=:id", {
replacements: asset replacements: asset
}); });
@ -341,7 +341,7 @@ router.delete("/:id", function(req, res/*, next*/) {
const photo = photos[0]; const photo = photos[0];
if (!req.query.permanent) { if (!req.query.permanent) {
return photoDB.sequelize.query("UPDATE photos SET deleted=1 WHERE id=:id", { return photoDB.sequelize.query("UPDATE photos SET deleted=1,updated=CURRENT_TIMESTAMP WHERE id=:id", {
replacements: replacements replacements: replacements
}).then(function() { }).then(function() {
return false; return false;
@ -487,7 +487,6 @@ router.get("/memories/:date?", function(req, res/*, next*/) {
// console.log("Cursor" + cursor.toISOString().replace(/T.*/, "")); // console.log("Cursor" + cursor.toISOString().replace(/T.*/, ""));
// } // }
return photoDB.sequelize.query(query, { return photoDB.sequelize.query(query, {
replacements: { replacements: {
cursor: cursor, cursor: cursor,
@ -566,7 +565,7 @@ router.get("/trash", function(req, res/*, next*/) {
return photoDB.sequelize.query( return photoDB.sequelize.query(
"SELECT photos.*,albums.path AS path,(albums.path || photos.filename) AS filepath FROM photos " + "SELECT photos.*,albums.path AS path,(albums.path || photos.filename) AS filepath FROM photos " +
"LEFT JOIN albums ON albums.id=photos.albumId " + "LEFT JOIN albums ON albums.id=photos.albumId " +
"WHERE deleted=1 ORDER BY photos.filename", { "WHERE deleted=1 ORDER BY photos.updated", {
type: photoDB.Sequelize.QueryTypes.SELECT, type: photoDB.Sequelize.QueryTypes.SELECT,
raw: true raw: true
}).then(function(photos) { }).then(function(photos) {

1
update-db Normal file
View File

@ -0,0 +1 @@
echo "ALTER TABLE photos ADD COLUMN updated DATE;" | sqlite3 photos.db