Compare commits

...

4 commits

Author SHA1 Message Date
be4362c884 Added extra logging 2017-08-07 21:13:50 +02:00
4602818bac bugfix 2017-08-07 21:03:29 +02:00
3303ace2f7 bugfix 2017-08-07 20:59:36 +02:00
e974bd65d9 bugfix 2017-08-07 20:56:53 +02:00
2 changed files with 13 additions and 6 deletions

View file

@ -30,9 +30,8 @@ public class UploadServlet extends AjaxFileUpload{
private static final Logger logger = LogUtil.getLogger();
private static final long serialVersionUID = 1L;
public static final Set<String> VIDEO_EXT = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(new String[]{
"avi","mp4","mpeg","mpeg","divx","xvid","wmv","mov","flv","m4v"
})));
private static final Set<String> VIDEO_EXT = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
"avi","mp4","mpeg","mpeg","divx","xvid","wmv","mov","flv","m4v")));
@Override
public String getProgressHTML() {
@ -76,6 +75,7 @@ public class UploadServlet extends AjaxFileUpload{
vid.setUser( user );
vid.setFile( item );
vid.save(db);
logger.info("Video upload successful: "+vid.getFolder().getPath());
}
else{
Image img = new Image();
@ -84,6 +84,7 @@ public class UploadServlet extends AjaxFileUpload{
img.setUser( user );
img.setFile( item );
img.save(db);
logger.info("Image upload successful: "+img.getFolder().getPath());
}
} catch (Exception e) {
logger.log(Level.WARNING, "Error: Creating new Media(\""+item.getName()+"\")", e);

View file

@ -24,10 +24,11 @@ public class Folder extends DBBean{
private static final Logger logger = LogUtil.getLogger();
private transient String name;
protected Long user;
protected long user = -1;
protected transient User userInstance;
private String path;
protected Folder parent;
protected Timestamp date;
private boolean isPrivate;
@ -67,6 +68,7 @@ public class Folder extends DBBean{
}
public Folder(){
date = new Timestamp( System.currentTimeMillis() );
}
public String getName(){
@ -125,6 +127,10 @@ public class Folder extends DBBean{
return parent;
}
public Timestamp getDate(){
return date;
}
/**
* @param filename is the name of the file
@ -139,7 +145,7 @@ public class Folder extends DBBean{
return null;
}
if( user == null || filename == null )
if( user < 0 || filename == null )
return null;
StringBuilder tmp = new StringBuilder();