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

Timing problems while deleting assets.

Browse Source 
Signed-off-by: James Ketrenos <james_git@ketrenos.com>
This commit is contained in:
James Ketr 2018-10-08 17:45:49 -07:00
parent c1e5503c01
commit 4790e8e62d
4 changed files with 58 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/elements/photo-thumbnail.html
View File

@ -3,6 +3,7 @@
<head> <head>
<link rel="import" href="../bower_components/polymer/polymer.html"> <link rel="import" href="../bower_components/polymer/polymer.html">
<link rel="import" href="../bower_components/paper-icon-button/paper-icon-button.html"> <link rel="import" href="../bower_components/paper-icon-button/paper-icon-button.html">
<link rel="import" href="../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="../bower_components/iron-icon/iron-icon.html"> <link rel="import" href="../bower_components/iron-icon/iron-icon.html">
<link rel="import" href="../bower_components/iron-icons/iron-icons.html"> <link rel="import" href="../bower_components/iron-icons/iron-icons.html">
<link rel="import" href="../bower_components/iron-pages/iron-pages.html"> <link rel="import" href="../bower_components/iron-pages/iron-pages.html">
@ -41,10 +42,12 @@
} }
#actions { #actions {
display: flex;
padding: 0.5em; padding: 0.5em;
background-color: rgba(0, 0, 0, 0.5); background-color: rgba(0, 0, 0, 0.5);
opacity: 0; opacity: 0;
font-size: 0.6em; font-size: 0.6em;
color: #ddd;
} }
:host(:hover) #info, :host(:hover) #info,
@ -54,7 +57,7 @@
</style> </style>
<div id="actions" hidden$="[[!actions.length]]" class="horziontal layout center end"> <div id="actions" hidden$="[[!actions.length]]" class="flex horziontal layout center end-justified">
<template is="dom-repeat" items="[[actions]]"> <template is="dom-repeat" items="[[actions]]">
<paper-icon-button on-tap="_fireAction" icon="[[item]]"></paper-icon-button> <paper-icon-button on-tap="_fireAction" icon="[[item]]"></paper-icon-button>
</template> </template>

42
frontend/src/ketr-photos/ketr-photos.html
View File

@ -182,6 +182,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
padding: 0.5em 0; padding: 0.5em 0;
font-weight: bold; font-weight: bold;
transition: opacity 0.25s ease-in-out;
} }
.date-line .album-line { .date-line .album-line {
@ -909,7 +910,9 @@
return; return;
} }
} }
this.thumbnails[index].visible = false; if (this.thumbnails[index]) {
this.thumbnails[index].visible = false;
}
}.bind(this)); }.bind(this));
/* Randomly index the visible array, keeping the center /* Randomly index the visible array, keeping the center
@ -1054,6 +1057,7 @@
console.log("Total pending: " + this.pendingPhotos.length); console.log("Total pending: " + this.pendingPhotos.length);
}, },
/* Asynchronously load items into the DOM */
processItems: function() { processItems: function() {
if (this.processing) { if (this.processing) {
console.log("processItems while processing"); console.log("processItems while processing");
@ -1236,7 +1240,6 @@
}, },
_imageAction: function(event) { _imageAction: function(event) {
console.log(event.detail);
switch (event.detail) { switch (event.detail) {
case "delete": /* Delete image */ case "delete": /* Delete image */
var thumbnail = event.currentTarget; var thumbnail = event.currentTarget;
@ -1244,15 +1247,46 @@
thumbnail.style.pointerEvents = "none"; thumbnail.style.pointerEvents = "none";
this.async(function(thumbnail) { this.async(function(thumbnail) {
thumbnail.parentElement.removeChild(thumbnail); var parent = thumbnail.parentElement;
for (var i = 0; i < this.thumbnails.length; i++) { for (var i = 0; i < this.thumbnails.length; i++) {
if (this.thumbnails[i] == thumbnail) { if (this.thumbnails[i] == thumbnail) {
console.log("Found thumbnail"); console.log("Found thumbnail", this.thumbnails.length);
if (thumbnail.visible) {
console.log("Removing from visible list");
thumbnail.visible = false;
var j = this.visibleThumbs.indexOf(i);
if (j != -1) {
console.log("Removing visible thumb", this.visibleThumbs.length);
this.visibleThumbs.splice(j, 1);
}
}
this.thumbnails.splice(i, 1); this.thumbnails.splice(i, 1);
this.notifyPath("thumbnails.length"); this.notifyPath("thumbnails.length");
break; break;
} }
} }
Polymer.dom(parent).removeChild(thumbnail);
if (parent.querySelectorAll("photo-thumbnail").length == 0) {
/* There are no more thumbnails, so look up the document ancestors
* until we find the element with the date-line class, and then
* remove it from it's parent */
while (parent && !parent.classList.contains("date-line")) {
parent = parent.parentElement;
}
if (!parent) {
return;
}
parent.style.opacity = 0;
this.async(function(parent) {
Polymer.dom(this.$.thumbnails).removeChild(parent);
this.triggerVisibilityChecks();
}.bind(this, parent), 250);
} else {
this.triggerVisibilityChecks();
}
}.bind(this, thumbnail), 250); }.bind(this, thumbnail), 250);
break; break;
case "text-format": /* Rename this image */ case "text-format": /* Rename this image */

1
server/app.js
View File

@ -62,6 +62,7 @@ app.use(bodyParser.urlencoded({
/* Any path starting with the following won't be logged via morgan */ /* Any path starting with the following won't be logged via morgan */
const logSkipPaths = new RegExp("^" + basePath + "(" + [ const logSkipPaths = new RegExp("^" + basePath + "(" + [
".*\/thumbs\/",
"bower_components", "bower_components",
].join(")|(") + ")"); ].join(")|(") + ")");
app.use(morgan('common', { app.use(morgan('common', {

32
server/routes/photos.js
View File

@ -159,17 +159,19 @@ router.get("/*", function(req, res/*, next*/) {
if (id == -1) { if (id == -1) {
index = ""; index = "";
} else { } else {
index = "AND ((strftime('%m-%d',taken)=strftime('%m-%d',:cursor) AND photos.id<"+id+ ") OR DATE(taken)<DATE(:cursor))"; index = "AND ((strftime('%Y-%m-%d',taken)=strftime('%Y-%m-%d',:cursor) AND photos.id<"+id+ ") OR " +
"(strftime('%m-%d',taken)=strftime('%m-%d',:cursor) AND strftime('%Y',taken)<strftime('%Y',:cursor)))";
} }
let path = decodeURI(req.url).replace(/\?.*$/, "").replace(/^\//, ""), let path = decodeURI(req.url).replace(/\?.*$/, "").replace(/^\//, ""),
query = "SELECT photos.*,albums.path AS path FROM photos " + query = "SELECT photos.*,albums.path AS path FROM photos " +
"INNER JOIN albums ON (albums.id=photos.albumId AND albums.path LIKE :path) " + "INNER JOIN albums ON (albums.id=photos.albumId AND albums.path LIKE :path) " +
"WHERE (photos.duplicate=0 AND photos.deleted=0 AND photos.scanned NOT NULL " + index + ") ORDER BY taken DESC,id DESC LIMIT " + (limit * 2 + 1), "WHERE (photos.duplicate=0 AND photos.deleted=0 AND photos.scanned NOT NULL " + index + ") " +
replacements = { "ORDER BY strftime('%Y-%m-%d',taken) DESC,id DESC LIMIT " + (limit + 1),
cursor: cursor, replacements = {
path: path + "%" cursor: cursor,
}; path: path + "%"
};
// console.log("Fetching from: " + JSON.stringify(replacements, null, 2) + "\nwith:\n" + query); // console.log("Fetching from: " + JSON.stringify(replacements, null, 2) + "\nwith:\n" + query);
@ -185,26 +187,22 @@ router.get("/*", function(req, res/*, next*/) {
} }
}); });
if (cursor) {
cursor = moment(cursor);
photos = photos.filter(function(photo) {
if (!cursor.isSame(photo.taken, "day")) {
return true;
}
return photo.id < id;
});
}
let more = photos.length > limit; /* We queried one extra item to see if there are more than LIMIT available */ let more = photos.length > limit; /* We queried one extra item to see if there are more than LIMIT available */
let last;
if (more) { if (more) {
photos.splice(limit); photos.splice(limit);
last = photos[photos.length - 1];
} }
let results = { let results = {
items: photos items: photos.sort(function(a, b) {
return new Date(b.taken) - new Date(a.taken);
})
}; };
if (more) { if (more) {
results.cursor = new Date(last.taken).toISOString().replace(/T.*/, "") + "_" + last.id;
results.more = true; results.more = true;
} }
return res.status(200).json(results); return res.status(200).json(results);