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

Refactored names of date fields, Created a ResourceManager to handle filesystem stuff

Browse source
This commit is contained in:
Ziver Koc 2018-08-11 12:53:40 +02:00
parent 8212379c31
commit 0a099bd5d7
16 changed files with 2245 additions and 2214 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/zall/page/ContentServlet.java
View file

@ -8,20 +8,16 @@ import java.sql.SQLException;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.commons.fileupload.util.Streams;
import zall.Zallery;
import zall.ZalleryServlet;
import zall.bean.Image;
import zall.bean.Media;
import zall.bean.User;
import zall.bean.Video;
import zall.manager.AuthenticationManager;
import zall.manager.ResourceManager;
import zutil.db.DBConnection;
import zutil.io.file.FileUtil;
@ -41,7 +37,6 @@ public class ContentServlet extends ZalleryServlet {
public void doGet(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws ServletException, SQLException, IOException {
String size = request.getParameter("size");
Media media = null;
String contentType = "";
@ -57,17 +52,18 @@ public class ContentServlet extends ZalleryServlet {
}
if (media != null) {
File file;
if (size == null)
file = media.getFile(Media.Size.ORIGINAL);
else
file = media.getFile(Media.Size.valueOf(size.toUpperCase()));
Media.Size size = Media.Size.ORIGINAL;
if (request.getParameter("size") != null)
size = Media.Size.valueOf(request.getParameter("size").toUpperCase());
File file = ResourceManager.getFile(media, size);
String extension = media.getFileExtension(size);
if (request.getParameter("download") != null)
response.setHeader("Content-disposition", "attachment; filename=" + media.getTitle() + "." + FileUtil.getFileExtension(file));
response.setHeader("Content-disposition", "attachment; filename=" + media.getTitle() + "." + extension);
if (file.exists()) {
response.setContentType(contentType + "/" + FileUtil.getFileExtension(file));
response.setContentType(contentType + "/" + extension);
response.setContentLength((int) file.length());
BufferedInputStream in = new BufferedInputStream(new FileInputStream(file));

2
src/zall/page/GalleryServlet.java
View file

@ -40,7 +40,7 @@ public class GalleryServlet extends ZalleryServlet {
folder = Folder.loadRoot(db, user);
// Setup new root folder
if (folder == null) {
folder = Folder.genRoot();
folder = Folder.createRootFolder();
folder.save(db);
}
}