X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/399b8409f59677b84f7012306e54a1ec84d0a6af..6e43d84b17a15b934989d0b71c1ac795186f26b4:/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 46f5fa18..9c40b947 100644
--- a/src/eu/alefzero/owncloud/datamodel/OCFile.java
+++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java
@@ -19,191 +19,37 @@
 package eu.alefzero.owncloud.datamodel;
 
 import java.io.File;
-import java.util.Vector;
-
-import android.accounts.Account;
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.util.Log;
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 
 public class OCFile {
-	private static String TAG = "OCFile";
 
-	private long id_;
-	private long parent_id_;
-	private long length_;
-	private long creation_timestamp_;
-	private long modified_timestamp_;
-	private String path_;
-	private String storage_path_;
-	private String mimetype_;
+	private long id;
+	private long parentId;
+	private long length;
+	private long creationTimestamp;
+	private long modifiedTimestamp;
+	private String remotePath;
+	private String localPath;
+	private String mimeType;
+	private boolean needsUpdating;
 
-	private ContentResolver contentResolver_;
-	private ContentProviderClient providerClient_;
-	private Account account_;
-	
-	private OCFile(ContentProviderClient providerClient, Account account) {
-		account_ = account;
-		providerClient_ = providerClient;
-		resetData();
-	}
-
-	private OCFile(ContentResolver contentResolver, Account account) {
-		account_ = account;
-		contentResolver_ = contentResolver;
-		resetData();
-	}
-	
 	/**
-	 * Query the database for a {@link OCFile} belonging to a given account 
-	 * and id.
+	 * Create new {@link OCFile} with given path
 	 * 
-	 * @param resolver The {@link ContentResolver} to use
-	 * @param account The {@link Account} the {@link OCFile} belongs to
-	 * @param id The ID the file has in the database
-	 */
-	public OCFile(ContentResolver resolver, Account account, long id) {
-		contentResolver_ = resolver;
-		account_ = account;
-		Cursor c = contentResolver_.query(ProviderTableMeta.CONTENT_URI_FILE,
-				null, ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND "
-						+ ProviderTableMeta._ID + "=?", new String[] {
-						account_.name, String.valueOf(id) }, null);
-		if (c.moveToFirst())
-			setFileData(c);
-	}
-
-	/**
-	 * Query the database for a {@link OCFile} belonging to a given account
-	 * and that matches remote path
-	 * 
-	 * @param contentResolver The {@link ContentResolver} to use
-	 * @param account The {@link Account} the {@link OCFile} belongs to
 	 * @param path The remote path of the file
 	 */
-	public OCFile(ContentResolver contentResolver, Account account, String path) {
-		contentResolver_ = contentResolver;
-		account_ = account;
-
-		Cursor c = contentResolver_.query(ProviderTableMeta.CONTENT_URI_FILE,
-				null, ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND "
-						+ ProviderTableMeta.FILE_PATH + "=?", new String[] {
-						account_.name, path }, null);
-		if (c.moveToFirst()) {
-			setFileData(c);
-			if (path_ != null)
-				path_ = path;
-		}
-	}
-	
-	public OCFile(ContentProviderClient cp, Account account, String path) {
-		providerClient_ = cp;
-		account_ = account;
-
-		try {
-			Cursor c = providerClient_.query(ProviderTableMeta.CONTENT_URI_FILE, null,
-					ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND "
-							+ ProviderTableMeta.FILE_PATH + "=?", new String[] {
-							account_.name, path }, null);
-			if (c.moveToFirst()) {
-				setFileData(c);
-				if (path_ != null)
-					path_ = path;
-			}
-		} catch (RemoteException e) {
-			Log.d(TAG, e.getMessage());
-		}
+	public OCFile(String path) {
+	  resetData();
+	  needsUpdating = false;
+		remotePath = path;
 	}
 
 	/**
-	 * Creates a new {@link OCFile}
-	 *  
-	 * @param providerClient The {@link ContentProviderClient} to use
-	 * @param account The {@link Account} that this file belongs to
-	 * @param path The remote path
-	 * @param length The file size in bytes 
-	 * @param creation_timestamp The UNIX timestamp of the creation date
-	 * @param modified_timestamp The UNIX timestamp of the modification date
-	 * @param mimetype The mimetype to set
-	 * @param parent_id The parent folder of that file
-	 * @return A new instance of {@link OCFile}
-	 */
-	public static OCFile createNewFile(ContentProviderClient providerClient,
-			Account account, String path, long length, long creation_timestamp,
-			long modified_timestamp, String mimetype, long parent_id) {
-		OCFile new_file = new OCFile(providerClient, account);
-
-		try {
-			Cursor c = new_file.providerClient_.query(ProviderTableMeta.CONTENT_URI_FILE,
-					null, ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND "
-							+ ProviderTableMeta.FILE_PATH + "=?", new String[] {
-							new_file.account_.name, path }, null);
-			if (c.moveToFirst())
-				new_file.setFileData(c);
-			c.close();
-		} catch (RemoteException e) {
-			Log.e(TAG, e.getMessage());
-		}
-
-		new_file.path_ = path;
-		new_file.length_ = length;
-		new_file.creation_timestamp_ = creation_timestamp;
-		new_file.modified_timestamp_ = modified_timestamp;
-		new_file.mimetype_ = mimetype;
-		new_file.parent_id_ = parent_id;
-
-		return new_file;
-	}
-
-	/**
-	 * Creates a new {@link OCFile}
-	 * 
-	 * @param contentResolver The {@link ContentResolver} to use
-	 * @param account The {@link Account} that this file belongs to
-	 * @param path The remote path
-	 * @param length The file size in bytes
-	 * @param creation_timestamp The UNIX timestamp of the creation date
-	 * @param modified_timestamp The UNIX timestamp of the modification date 
-	 * @param mimetype The mimetype to set
-	 * @param parent_id The parent folder of that file
-	 * @return A new instance of {@link OCFile}
-	 */
-	public static OCFile createNewFile(ContentResolver contentResolver,
-			Account account, String path, int length, int creation_timestamp,
-			int modified_timestamp, String mimetype, long parent_id) {
-		OCFile new_file = new OCFile(contentResolver, account);
-		Cursor c = new_file.contentResolver_.query(
-				ProviderTableMeta.CONTENT_URI_FILE, null,
-				ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND "
-						+ ProviderTableMeta.FILE_PATH + "=?", new String[] {
-						new_file.account_.name, path }, null);
-		if (c.moveToFirst())
-			new_file.setFileData(c);
-		c.close();
-
-		new_file.path_ = path;
-		new_file.length_ = length;
-		new_file.creation_timestamp_ = creation_timestamp;
-		new_file.modified_timestamp_ = modified_timestamp;
-		new_file.mimetype_ = mimetype;
-		new_file.parent_id_ = parent_id;
-
-		return new_file;
-	}
-
-
-	/**
 	 * Gets the ID of the file
 	 * 
 	 * @return the file ID
 	 */
 	public long getFileId() {
-		return id_;
+		return id;
 	}
 
 	/**
@@ -212,7 +58,7 @@ public class OCFile {
 	 * @return The path
 	 */
 	public String getPath() {
-		return path_;
+		return remotePath;
 	}
 
 	/**
@@ -222,7 +68,7 @@ public class OCFile {
 	 * @return true, if the file exists in the database
 	 */
 	public boolean fileExists() {
-		return id_ != -1;
+		return id != -1;
 	}
 
 	/**
@@ -231,7 +77,7 @@ public class OCFile {
 	 * @return true if it is a directory
 	 */
 	public boolean isDirectory() {
-		return mimetype_ != null && mimetype_.equals("DIR");
+		return mimeType != null && mimeType.equals("DIR");
 	}
 
 	/**
@@ -240,7 +86,7 @@ public class OCFile {
 	 * @return true if it is
 	 */
 	public boolean isDownloaded() {
-		return storage_path_ != null;
+		return localPath != null;
 	}
 
 	/**
@@ -249,7 +95,7 @@ public class OCFile {
 	 * @return The local path to the file
 	 */
 	public String getStoragePath() {
-		return storage_path_;
+		return localPath;
 	}
 
 	/**
@@ -259,7 +105,7 @@ public class OCFile {
 	 *            to set
 	 */
 	public void setStoragePath(String storage_path) {
-		storage_path_ = storage_path;
+		localPath = storage_path;
 	}
 
 	/**
@@ -268,7 +114,7 @@ public class OCFile {
 	 * @return A UNIX timestamp of the time that file was created
 	 */
 	public long getCreationTimestamp() {
-		return creation_timestamp_;
+		return creationTimestamp;
 	}
 
 	/**
@@ -278,7 +124,7 @@ public class OCFile {
 	 *            to set
 	 */
 	public void setCreationTimestamp(long creation_timestamp) {
-		creation_timestamp_ = creation_timestamp;
+		creationTimestamp = creation_timestamp;
 	}
 
 	/**
@@ -287,7 +133,7 @@ public class OCFile {
 	 * @return A UNIX timestamp of the modification time
 	 */
 	public long getModificationTimestamp() {
-		return modified_timestamp_;
+		return modifiedTimestamp;
 	}
 
 	/**
@@ -297,7 +143,7 @@ public class OCFile {
 	 *            to set
 	 */
 	public void setModificationTimestamp(long modification_timestamp) {
-		modified_timestamp_ = modification_timestamp;
+		modifiedTimestamp = modification_timestamp;
 	}
 
 	/**
@@ -306,8 +152,8 @@ public class OCFile {
 	 * @return The name of the file
 	 */
 	public String getFileName() {
-		if (path_ != null) {
-			File f = new File(path_);
+		if (remotePath != null) {
+			File f = new File(remotePath);
 			return f.getName().equals("") ? "/" : f.getName();
 		}
 		return null;
@@ -319,158 +165,92 @@ public class OCFile {
 	 * @return the Mimetype as a String
 	 */
 	public String getMimetype() {
-		return mimetype_;
-	}
-
-	/**
-	 * Instruct the file to save itself to the database
-	 */
-	public void save() {
-		ContentValues cv = new ContentValues();
-		cv.put(ProviderTableMeta.FILE_MODIFIED, modified_timestamp_);
-		cv.put(ProviderTableMeta.FILE_CREATION, creation_timestamp_);
-		cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, length_);
-		cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, mimetype_);
-		cv.put(ProviderTableMeta.FILE_NAME, getFileName());
-		if (parent_id_ != 0)
-			cv.put(ProviderTableMeta.FILE_PARENT, parent_id_);
-		cv.put(ProviderTableMeta.FILE_PATH, path_);
-		cv.put(ProviderTableMeta.FILE_STORAGE_PATH, storage_path_);
-		cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, account_.name);
-
-		if (fileExists()) {
-			if (providerClient_ != null) {
-				try {
-					providerClient_.update(ProviderTableMeta.CONTENT_URI, cv,
-							ProviderTableMeta._ID + "=?",
-							new String[] { String.valueOf(id_) });
-				} catch (RemoteException e) {
-					Log.e(TAG, e.getMessage());
-					return;
-				}
-			} else {
-				contentResolver_.update(ProviderTableMeta.CONTENT_URI, cv,
-						ProviderTableMeta._ID + "=?",
-						new String[] { String.valueOf(id_) });
-			}
-		} else {
-			Uri new_entry = null;
-			if (providerClient_ != null) {
-				try {
-					new_entry = providerClient_.insert(ProviderTableMeta.CONTENT_URI_FILE,
-							cv);
-				} catch (RemoteException e) {
-					Log.e(TAG, e.getMessage());
-					id_ = -1;
-					return;
-				}
-			} else {
-				new_entry = contentResolver_.insert(
-						ProviderTableMeta.CONTENT_URI_FILE, cv);
-			}
-			try {
-				String p = new_entry.getEncodedPath();
-				id_ = Integer.parseInt(p.substring(p.lastIndexOf('/') + 1));
-			} catch (NumberFormatException e) {
-				Log.e(TAG,
-						"Can't retrieve file id from uri: "
-								+ new_entry.toString() + ", reason: "
-								+ e.getMessage());
-				id_ = -1;
-			}
-		}
-	}
-
-	/**
-	 * List the directory content
-	 * 
-	 * @return The directory content or null, if the file is not a directory
-	 */
-	public Vector<OCFile> getDirectoryContent() {
-		if (isDirectory() && id_ != -1) {
-			Vector<OCFile> ret = new Vector<OCFile>();
-
-			Uri req_uri = Uri.withAppendedPath(
-					ProviderTableMeta.CONTENT_URI_DIR, String.valueOf(id_));
-			Cursor c = null;
-			if (providerClient_ != null) {
-				try {
-					c = providerClient_.query(req_uri, null, null, null, null);
-				} catch (RemoteException e) {
-					Log.e(TAG, e.getMessage());
-					return ret;
-				}
-			} else {
-				c = contentResolver_.query(req_uri, null, null, null, null);
-			}
-
-			if (c.moveToFirst())
-				do {
-					OCFile child = new OCFile(providerClient_, account_);
-					child.setFileData(c);
-					ret.add(child);
-				} while (c.moveToNext());
-
-			c.close();
-			return ret;
-		}
-		return null;
+		return mimeType;
 	}
 
 	/**
 	 * Adds a file to this directory. If this file is not a directory, an
 	 * exception gets thrown.
 	 * 
-	 * @param file
-	 *            to add
-	 * @throws IllegalStateException
-	 *             if you try to add a something and this is not a directory
+	 * @param file to add
+	 * @throws IllegalStateException if you try to add a something and this is not a directory
 	 */
 	public void addFile(OCFile file) throws IllegalStateException {
 		if (isDirectory()) {
-			file.parent_id_ = id_;
-			file.save();
+			file.parentId = id;
+			needsUpdating = true;
 			return;
 		}
-		throw new IllegalStateException(
-				"This is not a directory where you can add stuff to!");
+		throw new IllegalStateException("This is not a directory where you can add stuff to!");
 	}
 
 	/**
 	 * Used internally. Reset all file properties
 	 */
 	private void resetData() {
-		id_ = -1;
-		path_ = null;
-		parent_id_ = 0;
-		storage_path_ = null;
-		mimetype_ = null;
-		length_ = 0;
-		creation_timestamp_ = 0;
-		modified_timestamp_ = 0;
+		id = -1;
+		remotePath = null;
+		parentId = 0;
+		localPath = null;
+		mimeType = null;
+		length = 0;
+		creationTimestamp = 0;
+		modifiedTimestamp = 0;
 	}
 
 	/**
-	 * Used internally. Set properties based on the information in a {@link android.database.Cursor}
-	 * @param c the Cursor containing the information
+	 * Sets the ID of the file
+	 * @param file_id to set
 	 */
-	private void setFileData(Cursor c) {
-		resetData();
-		if (c != null) {
-			id_ = c.getLong(c.getColumnIndex(ProviderTableMeta._ID));
-			path_ = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PATH));
-			parent_id_ = c.getLong(c
-					.getColumnIndex(ProviderTableMeta.FILE_PARENT));
-			storage_path_ = c.getString(c
-					.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH));
-			mimetype_ = c.getString(c
-					.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE));
-			length_ = c.getLong(c
-					.getColumnIndex(ProviderTableMeta.FILE_CONTENT_LENGTH));
-			creation_timestamp_ = c.getLong(c
-					.getColumnIndex(ProviderTableMeta.FILE_CREATION));
-			modified_timestamp_ = c.getLong(c
-					.getColumnIndex(ProviderTableMeta.FILE_MODIFIED));
-		}
+	public void setFileId(long file_id) {
+	  id = file_id;
+	}
+	
+	/**
+	 * Sets the Mime-Type of the 
+	 * @param mimetype to set
+	 */
+	public void setMimetype(String mimetype) {
+	  mimeType = mimetype;
+	}
+	
+	/**
+	 * Sets the ID of the parent folder
+	 * @param parent_id to set
+	 */
+	public void setParentId(long parent_id) {
+	  parentId = parent_id;
+	}
+	
+	/**
+	 * Sets the file size in bytes
+	 * @param file_len to set
+	 */
+	public void setFileLength(long file_len) {
+	  length = file_len;
 	}
+	
+	/**
+	 * Returns the size of the file in bytes
+	 * @return The filesize in bytes
+	 */
+  public long getFileLength() {
+    return length;
+  }
+  
+  /**
+   * Returns the ID of the parent Folder
+   * @return The ID
+   */
+  public long getParentId() {
+    return parentId;
+  }
+  
+  /**
+   * Check, if this file needs updating
+   * @return
+   */
+  public boolean needsUpdatingWhileSaving() {
+    return needsUpdating;
+  }
 }