Compare commits
No commits in common. "master" and "BUILD-66" have entirely different histories.
2 changed files with 6 additions and 13 deletions
|
|
@ -30,8 +30,9 @@ public class UploadServlet extends AjaxFileUpload{
|
||||||
private static final Logger logger = LogUtil.getLogger();
|
private static final Logger logger = LogUtil.getLogger();
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
private static final Set<String> VIDEO_EXT = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
|
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")));
|
"avi","mp4","mpeg","mpeg","divx","xvid","wmv","mov","flv","m4v"
|
||||||
|
})));
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getProgressHTML() {
|
public String getProgressHTML() {
|
||||||
|
|
@ -75,7 +76,6 @@ public class UploadServlet extends AjaxFileUpload{
|
||||||
vid.setUser( user );
|
vid.setUser( user );
|
||||||
vid.setFile( item );
|
vid.setFile( item );
|
||||||
vid.save(db);
|
vid.save(db);
|
||||||
logger.info("Video upload successful: "+vid.getFolder().getPath());
|
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
Image img = new Image();
|
Image img = new Image();
|
||||||
|
|
@ -83,8 +83,7 @@ public class UploadServlet extends AjaxFileUpload{
|
||||||
img.setFolder( folder );
|
img.setFolder( folder );
|
||||||
img.setUser( user );
|
img.setUser( user );
|
||||||
img.setFile( item );
|
img.setFile( item );
|
||||||
img.save(db);
|
img.save(db);
|
||||||
logger.info("Image upload successful: "+img.getFolder().getPath());
|
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.log(Level.WARNING, "Error: Creating new Media(\""+item.getName()+"\")", e);
|
logger.log(Level.WARNING, "Error: Creating new Media(\""+item.getName()+"\")", e);
|
||||||
|
|
|
||||||
|
|
@ -24,11 +24,10 @@ public class Folder extends DBBean{
|
||||||
private static final Logger logger = LogUtil.getLogger();
|
private static final Logger logger = LogUtil.getLogger();
|
||||||
|
|
||||||
private transient String name;
|
private transient String name;
|
||||||
protected long user = -1;
|
protected Long user;
|
||||||
protected transient User userInstance;
|
protected transient User userInstance;
|
||||||
private String path;
|
private String path;
|
||||||
protected Folder parent;
|
protected Folder parent;
|
||||||
protected Timestamp date;
|
|
||||||
private boolean isPrivate;
|
private boolean isPrivate;
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -68,7 +67,6 @@ public class Folder extends DBBean{
|
||||||
}
|
}
|
||||||
|
|
||||||
public Folder(){
|
public Folder(){
|
||||||
date = new Timestamp( System.currentTimeMillis() );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getName(){
|
public String getName(){
|
||||||
|
|
@ -127,10 +125,6 @@ public class Folder extends DBBean{
|
||||||
return parent;
|
return parent;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Timestamp getDate(){
|
|
||||||
return date;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param filename is the name of the file
|
* @param filename is the name of the file
|
||||||
|
|
@ -145,7 +139,7 @@ public class Folder extends DBBean{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( user < 0 || filename == null )
|
if( user == null || filename == null )
|
||||||
return null;
|
return null;
|
||||||
StringBuilder tmp = new StringBuilder();
|
StringBuilder tmp = new StringBuilder();
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue