Minor typos and spelling corrected

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / datamodel / OCFile.java

diff --git a/src/eu/alefzero/owncloud/datamodel/OCFile.java b/src/eu/alefzero/owncloud/datamodel/OCFile.java
index 3a720b9..7284604 100644 (file)
--- a/src/eu/alefzero/owncloud/datamodel/OCFile.java
+++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java
@@ -22,6 +22,8 @@ import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 

+import eu.alefzero.owncloud.files.services.FileDownloader;
+

 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;


@@ -40,6 +42,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         }
     };
 
         }
     };
 

+    public static final String PATH_SEPARATOR = "/";
+    

     private long mId;
     private long mParentId;
     private long mLength;
     private long mId;
     private long mParentId;
     private long mLength;


@@ -50,24 +54,21 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     private String mMimeType;
     private boolean mNeedsUpdating;
     private long mLastSyncDate;
     private String mMimeType;
     private boolean mNeedsUpdating;
     private long mLastSyncDate;

+    private boolean mKeepInSync;

 
     /**
 
     /**

-     * Create new {@link OCFile} with given path
+     * Create new {@link OCFile} with given path.

      * 
      * 

-     * @param path The remote path of the file
-     * @throws MalformedURLException 
+     * The path received must be URL-decoded. Path separator must be OCFile.PATH_SEPARATOR, and it must be the first character in 'path'.
+     * 
+     * @param path The remote path of the file.

      */
     public OCFile(String path) {
         resetData();
         mNeedsUpdating = false;
      */
     public OCFile(String path) {
         resetData();
         mNeedsUpdating = false;

-        // dvelasco: let's make mandatory that mRemotePath is a valid URL always; this will make our life easier with the URL-encoding/decoding
-        if (path != null && path.length() > 0) {
-            try {
-                new URL("http://silly.test.com:8888" + path);
-            } catch (MalformedURLException e) {
-                throw new RuntimeException("Trying to create a OCFile with a non valid remote path: " + path , e);
-            }
-        } else throw new RuntimeException("Trying to create a OCFile with a non valid remote path: " + path);
+        if (path == null || path.length() <= 0 || !path.startsWith(PATH_SEPARATOR)) {
+            throw new IllegalArgumentException("Trying to create a OCFile with a non valid remote path: " + path);
+        }

         mRemotePath = path;
     }
 
         mRemotePath = path;
     }
 


@@ -86,8 +87,25 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mLocalPath = source.readString();
         mMimeType = source.readString();
         mNeedsUpdating = source.readInt() == 0;
         mLocalPath = source.readString();
         mMimeType = source.readString();
         mNeedsUpdating = source.readInt() == 0;

+        mKeepInSync = source.readInt() == 1;
+        mLastSyncDate = source.readLong();

     }
 
     }
 

+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeLong(mId);
+        dest.writeLong(mParentId);
+        dest.writeLong(mLength);
+        dest.writeLong(mCreationTimestamp);
+        dest.writeLong(mModifiedTimestamp);
+        dest.writeString(mRemotePath);
+        dest.writeString(mLocalPath);
+        dest.writeString(mMimeType);
+        dest.writeInt(mNeedsUpdating ? 1 : 0);
+        dest.writeInt(mKeepInSync ? 1 : 0);
+        dest.writeLong(mLastSyncDate);
+    }
+    

     /**
      * Gets the ID of the file
      * 
     /**
      * Gets the ID of the file
      * 


@@ -107,15 +125,6 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     }
 
     /**
     }
 
     /**

-     * Returns the remote path of the file on ownCloud
-     * 
-     * @return The remote path to the file
-     */
-    public String getURLDecodedRemotePath() {
-        return Uri.decode(mRemotePath);
-    }
-
-    /**

      * Can be used to check, whether or not this file exists in the database
      * already
      * 
      * Can be used to check, whether or not this file exists in the database
      * already
      * 


@@ -139,8 +148,26 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
      * 
      * @return true if it is
      */
      * 
      * @return true if it is
      */

-    public boolean isDownloaded() {
-        return mLocalPath != null && !mLocalPath.equals("");
+    public boolean isDown() {
+        if (mLocalPath != null && mLocalPath.length() > 0) {
+            File file = new File(mLocalPath);
+            return (file.exists());
+        }
+        return false;
+    }
+    
+    /**
+     * Use this to check if this file is downloading
+     * 
+     * @return true if it is in a download in progress
+     */
+    public boolean isDownloading() {
+        if (mLocalPath != null && mLocalPath.length() > 0) {
+            String savePath = FileDownloader.getSavePath();
+            File file = new File(FileDownloader.getTemporalPath() + mLocalPath.substring(savePath.length()));
+            return (file.exists());  
+        }
+        return false;

     }
 
     /**
     }
 
     /**


@@ -203,7 +230,7 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
      * @return The name of the file
      */
     public String getFileName() {
      * @return The name of the file
      */
     public String getFileName() {

-        File f = new File(getURLDecodedRemotePath());
+        File f = new File(getRemotePath());

         return f.getName().length() == 0 ? "/" : f.getName();
     }
 
         return f.getName().length() == 0 ? "/" : f.getName();
     }
 


@@ -247,6 +274,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mCreationTimestamp = 0;
         mModifiedTimestamp = 0;
         mLastSyncDate = 0;
         mCreationTimestamp = 0;
         mModifiedTimestamp = 0;
         mLastSyncDate = 0;

+        mKeepInSync = false;
+        mNeedsUpdating = false;

     }
 
     /**
     }
 
     /**


@@ -320,26 +349,20 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mLastSyncDate = lastSyncDate;
     }
 
         mLastSyncDate = lastSyncDate;
     }
 

+    public void setKeepInSync(boolean keepInSync) {
+        mKeepInSync = keepInSync;
+    }
+    
+    public boolean keepInSync() {
+        return mKeepInSync;
+    }
+    

     @Override
     public int describeContents() {
         return this.hashCode();
     }
 
     @Override
     @Override
     public int describeContents() {
         return this.hashCode();
     }
 
     @Override

-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeLong(mId);
-        dest.writeLong(mParentId);
-        dest.writeLong(mLength);
-        dest.writeLong(mCreationTimestamp);
-        dest.writeLong(mModifiedTimestamp);
-        dest.writeString(mRemotePath);
-        dest.writeString(mLocalPath);
-        dest.writeString(mMimeType);
-        dest.writeInt(mNeedsUpdating ? 1 : 0);
-        dest.writeLong(mLastSyncDate);
-    }
-
-    @Override

     public int compareTo(OCFile another) {
         if (isDirectory() && another.isDirectory()) {
             return getRemotePath().toLowerCase().compareTo(another.getRemotePath().toLowerCase());
     public int compareTo(OCFile another) {
         if (isDirectory() && another.isDirectory()) {
             return getRemotePath().toLowerCase().compareTo(another.getRemotePath().toLowerCase());


@@ -365,7 +388,7 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     @Override
     public String toString() {
         String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s]";
     @Override
     public String toString() {
         String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s]";

-        asString = String.format(asString, new Long(mId), getFileName(), mMimeType, isDownloaded(), mLocalPath, mRemotePath);
+        asString = String.format(asString, new Long(mId), getFileName(), mMimeType, isDown(), mLocalPath, mRemotePath);

         return asString;
     }
 
         return asString;
     }