aboutsummaryrefslogtreecommitdiff
path: root/subsonic-main/src/main/java/net/sourceforge/subsonic/upload
diff options
context:
space:
mode:
Diffstat (limited to 'subsonic-main/src/main/java/net/sourceforge/subsonic/upload')
-rw-r--r--subsonic-main/src/main/java/net/sourceforge/subsonic/upload/MonitoredDiskFileItem.java51
-rw-r--r--subsonic-main/src/main/java/net/sourceforge/subsonic/upload/MonitoredDiskFileItemFactory.java47
-rw-r--r--subsonic-main/src/main/java/net/sourceforge/subsonic/upload/MonitoredOutputStream.java60
-rw-r--r--subsonic-main/src/main/java/net/sourceforge/subsonic/upload/UploadListener.java29
4 files changed, 187 insertions, 0 deletions
diff --git a/subsonic-main/src/main/java/net/sourceforge/subsonic/upload/MonitoredDiskFileItem.java b/subsonic-main/src/main/java/net/sourceforge/subsonic/upload/MonitoredDiskFileItem.java
new file mode 100644
index 00000000..f9b89bb7
--- /dev/null
+++ b/subsonic-main/src/main/java/net/sourceforge/subsonic/upload/MonitoredDiskFileItem.java
@@ -0,0 +1,51 @@
+/*
+ This file is part of Subsonic.
+
+ Subsonic is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Subsonic is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+
+ Copyright 2009 (C) Sindre Mehus
+ */
+package net.sourceforge.subsonic.upload;
+
+import org.apache.commons.fileupload.disk.DiskFileItem;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.io.IOException;
+
+/**
+ * Extension of Commons FileUpload for monitoring the upload progress.
+ *
+ * @author Pierre-Alexandre Losson -- http://www.telio.be/blog -- plosson@users.sourceforge.net
+ */
+public class MonitoredDiskFileItem extends DiskFileItem {
+ private MonitoredOutputStream mos;
+ private UploadListener listener;
+
+ public MonitoredDiskFileItem(String fieldName, String contentType, boolean isFormField, String fileName, int sizeThreshold,
+ File repository, UploadListener listener) {
+ super(fieldName, contentType, isFormField, fileName, sizeThreshold, repository);
+ this.listener = listener;
+ if (fileName != null) {
+ listener.start(fileName);
+ }
+ }
+
+ public OutputStream getOutputStream() throws IOException {
+ if (mos == null) {
+ mos = new MonitoredOutputStream(super.getOutputStream(), listener);
+ }
+ return mos;
+ }
+}
diff --git a/subsonic-main/src/main/java/net/sourceforge/subsonic/upload/MonitoredDiskFileItemFactory.java b/subsonic-main/src/main/java/net/sourceforge/subsonic/upload/MonitoredDiskFileItemFactory.java
new file mode 100644
index 00000000..b5d6125d
--- /dev/null
+++ b/subsonic-main/src/main/java/net/sourceforge/subsonic/upload/MonitoredDiskFileItemFactory.java
@@ -0,0 +1,47 @@
+/*
+ This file is part of Subsonic.
+
+ Subsonic is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Subsonic is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+
+ Copyright 2009 (C) Sindre Mehus
+ */
+package net.sourceforge.subsonic.upload;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+
+import java.io.File;
+
+/**
+ * Extension of Commons FileUpload for monitoring the upload progress.
+ *
+ * @author Pierre-Alexandre Losson -- http://www.telio.be/blog -- plosson@users.sourceforge.net
+ */
+public class MonitoredDiskFileItemFactory extends DiskFileItemFactory {
+ private UploadListener listener;
+
+ public MonitoredDiskFileItemFactory(UploadListener listener) {
+ super();
+ this.listener = listener;
+ }
+
+ public MonitoredDiskFileItemFactory(int sizeThreshold, File repository, UploadListener listener) {
+ super(sizeThreshold, repository);
+ this.listener = listener;
+ }
+
+ public FileItem createItem(String fieldName, String contentType, boolean isFormField, String fileName) {
+ return new MonitoredDiskFileItem(fieldName, contentType, isFormField, fileName, getSizeThreshold(), getRepository(), listener);
+ }
+}
diff --git a/subsonic-main/src/main/java/net/sourceforge/subsonic/upload/MonitoredOutputStream.java b/subsonic-main/src/main/java/net/sourceforge/subsonic/upload/MonitoredOutputStream.java
new file mode 100644
index 00000000..c7f0d525
--- /dev/null
+++ b/subsonic-main/src/main/java/net/sourceforge/subsonic/upload/MonitoredOutputStream.java
@@ -0,0 +1,60 @@
+/*
+ This file is part of Subsonic.
+
+ Subsonic is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Subsonic is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+
+ Copyright 2009 (C) Sindre Mehus
+ */
+package net.sourceforge.subsonic.upload;
+
+import java.io.OutputStream;
+import java.io.IOException;
+
+/**
+ * Extension of Commons FileUpload for monitoring the upload progress.
+ *
+ * @author Pierre-Alexandre Losson -- http://www.telio.be/blog -- plosson@users.sourceforge.net
+ */
+public class MonitoredOutputStream extends OutputStream {
+ private OutputStream target;
+ private UploadListener listener;
+
+ public MonitoredOutputStream(OutputStream target, UploadListener listener) {
+ this.target = target;
+ this.listener = listener;
+ }
+
+ public void write(byte[] b, int off, int len) throws IOException {
+ target.write(b, off, len);
+ listener.bytesRead(len);
+ }
+
+ public void write(byte[] b) throws IOException {
+ target.write(b);
+ listener.bytesRead(b.length);
+ }
+
+ public void write(int b) throws IOException {
+ target.write(b);
+ listener.bytesRead(1);
+ }
+
+ public void close() throws IOException {
+ target.close();
+ }
+
+ public void flush() throws IOException {
+ target.flush();
+ }
+}
diff --git a/subsonic-main/src/main/java/net/sourceforge/subsonic/upload/UploadListener.java b/subsonic-main/src/main/java/net/sourceforge/subsonic/upload/UploadListener.java
new file mode 100644
index 00000000..7eac415a
--- /dev/null
+++ b/subsonic-main/src/main/java/net/sourceforge/subsonic/upload/UploadListener.java
@@ -0,0 +1,29 @@
+/*
+ This file is part of Subsonic.
+
+ Subsonic is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Subsonic is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+
+ Copyright 2009 (C) Sindre Mehus
+ */
+package net.sourceforge.subsonic.upload;
+
+/**
+ * Extension of Commons FileUpload for monitoring the upload progress.
+ *
+ * @author Pierre-Alexandre Losson -- http://www.telio.be/blog -- plosson@users.sourceforge.net
+ */
+public interface UploadListener {
+ void start(String fileName);
+ void bytesRead(long bytesRead);
+}