ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Fixed file upload

Browse source
This commit is contained in:
Ziver Koc 2016-07-14 17:50:38 +02:00
parent c0412d40c7
commit 6c8a591bd5
10 changed files with 45 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resource/web/map.tmpl
View file

@ -77,6 +77,8 @@
$("#button-bg-edit").click(function() {
// Reset modal
$('#bg-file-input').parent().show();
if ($("#file_input").prop("jFiler") != null)
$("#file_input").prop("jFiler").reset();
$('#bg-file-progress').parent().hide();
$('#bgUploadModal').modal('show');
});
@ -97,10 +99,10 @@
drawMap();
},
error: function(el){
$("#bg-upload-progress").addClass("progress-bar-danger");
$("#bg-file-progress").addClass("progress-bar-danger");
},
onProgress: function(t){
$("#bg-upload-progress").css("width", t+"%");
$("#bg-file-progress").css("width", t+"%");
},
}
});
@ -133,7 +135,7 @@
//////////////// Draw
// Background
svg.image("/img/floorplan.jpg", "100%", "100%").x(0).y(0).addClass("floorplan");
svg.image("?bgimage", "100%", "100%").x(0).y(0).addClass("bg-image");
// Sensors
$.each(json.sensors, function(i, sensor) {

6
src/se/hal/intf/HalHttpPage.java
View file

@ -49,7 +49,7 @@ public abstract class HalHttpPage implements HttpPage{
request.containsKey("json"))){
out.setHeader("Content-Type", "application/json");
JSONWriter writer = new JSONWriter(out);
writer.write(((HalJsonPage)this).jsonResponse(header, session,cookie, request));
writer.write(((HalJsonPage)this).jsonResponse(session,cookie, request));
writer.close();
}
else{
@ -66,7 +66,7 @@ public abstract class HalHttpPage implements HttpPage{
tmpl.set("rootNav", rootNav.createPagedNavInstance(header).getSubNavs());
tmpl.set("userNav", userNav.createPagedNavInstance(header).getSubNavs());
tmpl.set("alerts", HalAlertManager.getInstance().generateAlerts());
tmpl.set("content", httpRespond(header, session, cookie, request));
tmpl.set("content", httpRespond(session, cookie, request));
out.print(tmpl.compile());
}
} catch (Exception e) {
@ -90,7 +90,6 @@ public abstract class HalHttpPage implements HttpPage{
public abstract Templator httpRespond(
HttpHeader header,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request)
@ -100,7 +99,6 @@ public abstract class HalHttpPage implements HttpPage{
public interface HalJsonPage{
DataNode jsonResponse(
HttpHeader header,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request)

1
src/se/hal/page/EventConfigHttpPage.java
View file

@ -41,7 +41,6 @@ public class EventConfigHttpPage extends HalHttpPage {
@Override
public Templator httpRespond(
HttpHeader header,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request)

1
src/se/hal/page/EventOverviewHttpPage.java
View file

@ -30,7 +30,6 @@ public class EventOverviewHttpPage extends HalHttpPage {
@Override
public Templator httpRespond(
HttpHeader header,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request)

64
src/se/hal/page/MapHttpPage.java
View file

@ -8,6 +8,7 @@ import se.hal.struct.Sensor;
import zutil.db.DBConnection;
import zutil.io.file.FileUtil;
import zutil.net.http.HttpHeader;
import zutil.net.http.HttpPrintStream;
import zutil.net.http.multipart.MultipartField;
import zutil.net.http.multipart.MultipartFileField;
import zutil.net.http.multipart.MultipartParser;
@ -16,6 +17,7 @@ import zutil.parser.Base64Encoder;
import zutil.parser.DataNode;
import zutil.parser.Templator;
import java.io.IOException;
import java.sql.SQLException;
import java.util.Iterator;
import java.util.Map;
@ -23,7 +25,7 @@ import java.util.Map;
/**
* Created by Ziver on 2016-06-23.
*/
public class MapHttpPage extends HalHttpPage implements HalHttpPage.HalJsonPage{
public class MapHttpPage extends HalHttpPage implements HalHttpPage.HalJsonPage {
private static final String TEMPLATE = "resource/web/map.tmpl";
private String bgType;
@ -36,36 +38,46 @@ public class MapHttpPage extends HalHttpPage implements HalHttpPage.HalJsonPage{
super.showSubNav(false);
}
@Override
public Templator httpRespond(HttpHeader header,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request) throws Exception {
if ("POST".equals(header.getRequestType())){
public void respond(HttpPrintStream out, HttpHeader header,
Map<String, Object> session, Map<String, String> cookie,
Map<String, String> request) throws IOException {
if ("POST".equals(header.getRequestType())) {
MultipartParser multipart = new MultipartParser(header);
Iterator<MultipartField> it = multipart.iterator();
MultipartField field;
while ((field = it.next()) != null){
if (field instanceof MultipartFileField){
MultipartFileField file = (MultipartFileField)field;
while ((field = it.next()) != null) {
if (field instanceof MultipartFileField) {
MultipartFileField file = (MultipartFileField) field;
String ext = FileUtil.getFileExtension(file.getFilename());
if (ext.equals("jpg") || ext.equals("png") || ext.equals("svg") || ext.equals("gif")) {
saveBgImage(ext, file.getContent());
loadBgImage();
try {
saveBgImage(ext, file.getContent());
out.println("Upload successful: " + file.getFilename());
} catch (SQLException e) {
e.printStackTrace();
out.println("Upload error: " + e.getMessage());
}
bgImage = null; // reload image from db
}
}
}
return null;
}
if (request.containsKey("bgimage")){
} else if (request.containsKey("bgimage")) {
if (bgImage == null)
loadBgImage();
// send bg image;
out.setHeader("Content-Type", "image/"+bgType);
out.setHeader("Content-Length", ""+bgImage.length);
out.write(bgImage);
} else { // Run default Hal behaviour
super.respond(out, header, session, cookie, request);
}
}
@Override
public Templator httpRespond(Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request) throws Exception {
Templator tmpl = new Templator(FileUtil.find(TEMPLATE));
return tmpl;
@ -73,16 +85,14 @@ public class MapHttpPage extends HalHttpPage implements HalHttpPage.HalJsonPage{
@Override
public DataNode jsonResponse(HttpHeader header,
Map<String, Object> session,
public DataNode jsonResponse(Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request) throws Exception {
DBConnection db = HalContext.getDB();
DataNode root = new DataNode(DataNode.DataType.Map);
if ("getdata".equals(request.get("action"))){
if ("getdata".equals(request.get("action"))) {
getDeviceNode(db, root);
}
else if ("save".equals(request.get("action"))){
} else if ("save".equals(request.get("action"))) {
int id = Integer.parseInt(request.get("id"));
AbstractDevice device = null;
if ("sensor".equals(request.get("type")))
@ -115,7 +125,8 @@ public class MapHttpPage extends HalHttpPage implements HalHttpPage.HalJsonPage{
}
root.set("events", eventsNode);
}
private DataNode getDeviceNode(AbstractDevice device){
private DataNode getDeviceNode(AbstractDevice device) {
DataNode deviceNode = new DataNode(DataNode.DataType.Map);
deviceNode.set("id", device.getId());
deviceNode.set("name", device.getName());
@ -125,7 +136,7 @@ public class MapHttpPage extends HalHttpPage implements HalHttpPage.HalJsonPage{
}
private void loadBgImage(){
private void loadBgImage() {
String property = HalContext.getStringProperty("map_bgimage");
if (property != null) {
String[] split = property.split(",", 2);
@ -133,7 +144,8 @@ public class MapHttpPage extends HalHttpPage implements HalHttpPage.HalJsonPage{
bgImage = Base64Decoder.decodeToByte(split[1]);
}
}
private void saveBgImage(String type, byte[] data) throws SQLException {
HalContext.setProperty("map_bgimage", type+","+ Base64Encoder.encode(data));
HalContext.setProperty("map_bgimage", type + "," + Base64Encoder.encode(data));
}
}

1
src/se/hal/page/PCHeatMapHttpPage.java
View file

@ -18,7 +18,6 @@ public class PCHeatMapHttpPage extends HalHttpPage {
@Override
public Templator httpRespond(
HttpHeader header,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request)

2
src/se/hal/page/PCOverviewHttpPage.java
View file

@ -30,7 +30,6 @@ public class PCOverviewHttpPage extends HalHttpPage implements HalHttpPage.HalJs
@Override
public Templator httpRespond(
HttpHeader header,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request)
@ -50,7 +49,6 @@ public class PCOverviewHttpPage extends HalHttpPage implements HalHttpPage.HalJs
@Override
public DataNode jsonResponse(
HttpHeader header,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request) throws Exception {

1
src/se/hal/page/SensorConfigHttpPage.java
View file

@ -41,7 +41,6 @@ public class SensorConfigHttpPage extends HalHttpPage {
@Override
public Templator httpRespond(
HttpHeader header,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request)

1
src/se/hal/page/SensorOverviewHttpPage.java
View file

@ -30,7 +30,6 @@ public class SensorOverviewHttpPage extends HalHttpPage {
@Override
public Templator httpRespond(
HttpHeader header,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request)

1
src/se/hal/page/UserConfigHttpPage.java
View file

@ -21,7 +21,6 @@ public class UserConfigHttpPage extends HalHttpPage {
@Override
public Templator httpRespond(
HttpHeader header,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request)