python/photo-importer
1
0
Fork 0
mirror of https://github.com/sashacmc/photo-importer.git synced 2025-10-06 21:57:04 +02:00
Code Issues Releases Activity

Add Clear button for server import

Browse Source
This commit is contained in:
sashacmc
2024-10-31 00:45:19 +01:00
parent a2f82fc795
commit eaec55cec7
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@@ -1,3 +1,10 @@
photo-importer (1.2.6) stable; urgency=medium
* Add Clear button for server import
* Disable log for unmounted devices
-- Alexander Bushnev <Alexander@Bushnev.pro> Thu, 31 Oct 2024 00:37:55 +0100
photo-importer (1.2.5) stable; urgency=medium
* Package refactoring

7
photo_importer/server.py
View File

@@ -257,6 +257,9 @@ class PhotoImporterHandler(http.server.BaseHTTPRequestHandler):
def __import_get_log(self, in_path):
return self.server.get_log(in_path)
def __import_done(self, in_path):
return self.server.import_done(in_path)
def __import_request(self, params):
try:
action = params['a'][0]
@@ -281,6 +284,9 @@ class PhotoImporterHandler(http.server.BaseHTTPRequestHandler):
elif action == 'getlog':
result = self.__import_get_log(in_path)
self.__text_response(result)
elif action == 'done':
result = self.__import_done(in_path)
self.__ok_response(result)
else:
raise HTTPError(HTTPStatus.BAD_REQUEST, f'unknown action {action}')
@@ -422,6 +428,7 @@ class PhotoImporterServer(http.server.HTTPServer):
logging.info('import_done: %s', in_path)
if in_path in self.__importers:
del self.__importers[in_path]
return ''
def get_log(self, in_path):
if in_path in self.__importers:

10
web/index.html
View File

@@ -54,6 +54,8 @@
name = ""
if (state == "mounted" || state == "done") {
action += "<input onclick=\"sendCommand('start', '" + path + "');\" type=button class=\"btn btn-success btn-sm\" value=\"Import\"/> ";
} else if (state == "done" || state == "error") {
action = "<input onclick=\"sendCommand('done', '" + path + "');\" type=button class=\"btn btn-primary btn-sm\" value=\"Clear\"/> ";
}
} else {
if (state == "mounted") {
@@ -80,6 +82,10 @@
if (data[dev].read_only) {
name += "<br/><font size=\"-2\">(read only)<font>"
}
var log = ""
if (path != "") {
log = "<a href=\"import?a=getlog&p=" + path + "\"><img src=\"log.png\"/></a>"
}
html += "<tr>"
+ "<td>" + name + "</td>"
+ "<td>" + data[dev].path + "</td>"
@@ -87,7 +93,7 @@
+ "<td>" + action + "</td>"
+ "<td>" + data[dev].size + "&nbsp;GB</td>"
+ "<td>" + progress(data[dev].usage, "", "bg-info") + "</td>"
+ "<td><a href=\"import?a=getlog&p=" + path + "\"><img src=\"log.png\"/></a></td>"
+ "<td>" + log + "</td>"
+ "</tr>"
}
html += "</table>"
@@ -147,7 +153,7 @@
}
});
} else
if (cmd == "start") {
if (cmd == "start" || cmd == "done") {
var argpath = "";
if (g_outpath) {
argpath = "&o=" + g_outpath;