Adding cancellation to uploads (WIP)

[pub/Android/ownCloud.git] / src / eu / alefzero / webdav / FileRequestEntity.java

diff --git a/src/eu/alefzero/webdav/FileRequestEntity.java b/src/eu/alefzero/webdav/FileRequestEntity.java
index ca16e89..0f774f7 100644 (file)
--- a/src/eu/alefzero/webdav/FileRequestEntity.java
+++ b/src/eu/alefzero/webdav/FileRequestEntity.java
@@ -1,14 +1,23 @@
 package eu.alefzero.webdav;
 
 import java.io.File;
 package eu.alefzero.webdav;
 
 import java.io.File;

-import java.io.FileInputStream;

 import java.io.IOException;
 import java.io.IOException;

-import java.io.InputStream;

 import java.io.OutputStream;
 import java.io.OutputStream;

+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;

 
 import org.apache.commons.httpclient.methods.RequestEntity;
 
 
 import org.apache.commons.httpclient.methods.RequestEntity;
 

-import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener;
+import eu.alefzero.webdav.OnDatatransferProgressListener;
+
+import android.util.Log;
+

 
 /**
  * A RequestEntity that represents a File.
 
 /**
  * A RequestEntity that represents a File.


@@ -16,47 +25,77 @@ import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener;
  */
 public class FileRequestEntity implements RequestEntity {
 
  */
 public class FileRequestEntity implements RequestEntity {
 

-    final File file;
-    final String contentType;
-    OnDatatransferProgressListener listener;
+    final File mFile;
+    final String mContentType;
+    Set<OnDatatransferProgressListener> mListeners = new HashSet<OnDatatransferProgressListener>();

 
     public FileRequestEntity(final File file, final String contentType) {
         super();
 
     public FileRequestEntity(final File file, final String contentType) {
         super();

+        this.mFile = file;
+        this.mContentType = contentType;

         if (file == null) {
             throw new IllegalArgumentException("File may not be null");
         }
         if (file == null) {
             throw new IllegalArgumentException("File may not be null");
         }

-        this.file = file;
-        this.contentType = contentType;

     }
     
     }
     

+    @Override

     public long getContentLength() {
     public long getContentLength() {

-        return this.file.length();
+        return mFile.length();

     }
 
     }
 

+    @Override

     public String getContentType() {
     public String getContentType() {

-        return this.contentType;
+        return mContentType;

     }
 
     }
 

+    @Override

     public boolean isRepeatable() {
         return true;
     }
     
     public boolean isRepeatable() {
         return true;
     }
     

-    public void setOnDatatransferProgressListener(OnDatatransferProgressListener listener) {
-        this.listener = listener;
+    public void addOnDatatransferProgressListener(OnDatatransferProgressListener listener) {
+        mListeners.add(listener);

     }
     }

-
+    
+    public void addOnDatatransferProgressListeners(Collection<OnDatatransferProgressListener> listeners) {
+        mListeners.addAll(listeners);
+    }
+    
+    public void removeOnDatatransferProgressListener(OnDatatransferProgressListener listener) {
+        mListeners.remove(listener);
+    }
+    
+    
+    @Override

     public void writeRequest(final OutputStream out) throws IOException {
     public void writeRequest(final OutputStream out) throws IOException {

-        byte[] tmp = new byte[4096];
+        //byte[] tmp = new byte[4096];
+        ByteBuffer tmp = ByteBuffer.allocate(4096);

         int i = 0;
         int i = 0;

-        InputStream instream = new FileInputStream(this.file);
+        
+        // TODO(bprzybylski): each mem allocation can throw OutOfMemoryError we need to handle it
+        //                    globally in some fashionable manner
+        RandomAccessFile raf = new RandomAccessFile(mFile, "rw");
+        FileChannel channel = raf.getChannel();
+        FileLock lock = channel.tryLock();
+        Iterator<OnDatatransferProgressListener> it = null;

         try {
         try {

-            while ((i = instream.read(tmp)) >= 0) {
-                out.write(tmp, 0, i);
-                if (listener != null) 
-                    listener.transferProgress(i);
+            while ((i = channel.read(tmp)) >= 0) {
+                out.write(tmp.array(), 0, i);
+                tmp.clear();
+                it = mListeners.iterator();
+                while (it.hasNext()) {
+                    it.next().onTransferProgress(i);
+                }

             }
             }

+            
+        } catch (IOException io) {
+            Log.e("FileRequestException", io.getMessage());
+            throw new RuntimeException("Ugly solution to workaround the default policy of retries when the server falls while uploading ; temporal fix; really", io);   
+            

         } finally {
         } finally {

-            instream.close();
+            lock.release();
+            channel.close();
+            raf.close();

         }
     }
 
         }
     }