X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/d5627b41653ee1549e23116fc6a90a1725d62fba..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 4c74ad39..9c40b947 100644 --- a/src/eu/alefzero/owncloud/datamodel/OCFile.java +++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java @@ -19,20 +19,8 @@ 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 parentId; @@ -40,164 +28,22 @@ public class OCFile { private long creationTimestamp; private long modifiedTimestamp; private String remotePath; - private String localStoragePath; + private String localPath; private String mimeType; + private boolean needsUpdating; - private ContentResolver contentResolver; - private ContentProviderClient providerClient; - private Account account; - - private OCFile(ContentProviderClient providerClient, Account account) { - this.account = account; - this.providerClient = providerClient; - resetData(); - } - - private OCFile(ContentResolver contentResolver, Account account) { - this.account = account; - this.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) { - this.contentResolver = resolver; - this.account = account; - Cursor c = this.contentResolver.query(ProviderTableMeta.CONTENT_URI_FILE, - null, ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND " - + ProviderTableMeta._ID + "=?", new String[] { - this.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) { - this.contentResolver = contentResolver; - this.account = account; - - Cursor c = this.contentResolver.query(ProviderTableMeta.CONTENT_URI_FILE, - null, ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND " - + ProviderTableMeta.FILE_PATH + "=?", new String[] { - this.account.name, path }, null); - if (c.moveToFirst()) { - setFileData(c); - if (remotePath != null) - remotePath = path; - } - } - - public OCFile(ContentProviderClient cp, Account account, String path) { - this.providerClient = cp; - this.account = account; - - try { - Cursor c = this.providerClient.query(ProviderTableMeta.CONTENT_URI_FILE, null, - ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND " - + ProviderTableMeta.FILE_PATH + "=?", new String[] { - this.account.name, path }, null); - if (c.moveToFirst()) { - setFileData(c); - if (remotePath != null) - remotePath = 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.remotePath = path; - new_file.length = length; - new_file.creationTimestamp = creation_timestamp; - new_file.modifiedTimestamp = modified_timestamp; - new_file.mimeType = mimetype; - new_file.parentId = 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.remotePath = path; - new_file.length = length; - new_file.creationTimestamp = creation_timestamp; - new_file.modifiedTimestamp = modified_timestamp; - new_file.mimeType = mimetype; - new_file.parentId = parent_id; - - return new_file; - } - - - /** * Gets the ID of the file * * @return the file ID @@ -240,7 +86,7 @@ public class OCFile { * @return true if it is */ public boolean isDownloaded() { - return localStoragePath != null; + return localPath != null; } /** @@ -249,7 +95,7 @@ public class OCFile { * @return The local path to the file */ public String getStoragePath() { - return localStoragePath; + return localPath; } /** @@ -259,7 +105,7 @@ public class OCFile { * to set */ public void setStoragePath(String storage_path) { - localStoragePath = storage_path; + localPath = storage_path; } /** @@ -323,117 +169,19 @@ public class OCFile { } /** - * Instruct the file to save itself to the database - */ - public void save() { - ContentValues cv = new ContentValues(); - cv.put(ProviderTableMeta.FILE_MODIFIED, modifiedTimestamp); - cv.put(ProviderTableMeta.FILE_CREATION, creationTimestamp); - cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, length); - cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, mimeType); - cv.put(ProviderTableMeta.FILE_NAME, getFileName()); - if (parentId != 0) - cv.put(ProviderTableMeta.FILE_PARENT, parentId); - cv.put(ProviderTableMeta.FILE_PATH, remotePath); - cv.put(ProviderTableMeta.FILE_STORAGE_PATH, localStoragePath); - 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 getDirectoryContent() { - if (isDirectory() && id != -1) { - Vector ret = new Vector(); - - 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; - } - - /** * 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.parentId = id; - file.save(); + 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!"); } /** @@ -443,7 +191,7 @@ public class OCFile { id = -1; remotePath = null; parentId = 0; - localStoragePath = null; + localPath = null; mimeType = null; length = 0; creationTimestamp = 0; @@ -451,26 +199,58 @@ public class OCFile { } /** - * 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)); - remotePath = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PATH)); - parentId = c.getLong(c - .getColumnIndex(ProviderTableMeta.FILE_PARENT)); - localStoragePath = 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)); - creationTimestamp = c.getLong(c - .getColumnIndex(ProviderTableMeta.FILE_CREATION)); - modifiedTimestamp = 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; + } }