X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/85e9a40dbeb521029a592a3d85e9fa583cce0c19..ec19a11a385ff21d3e85a94e618d48d8be9ef20d:/src/com/owncloud/android/datamodel/OCFile.java diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java index 21b8c375..392d03bc 100644 --- a/src/com/owncloud/android/datamodel/OCFile.java +++ b/src/com/owncloud/android/datamodel/OCFile.java @@ -1,10 +1,10 @@ /* ownCloud Android client application * Copyright (C) 2012 Bartek Przybylski + * Copyright (C) 2012-2013 ownCloud Inc. * * This program 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. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,9 +20,12 @@ package com.owncloud.android.datamodel; import java.io.File; +import com.owncloud.android.lib.common.utils.Log_OC; +import third_parties.daveKoeller.AlphanumComparator; + import android.os.Parcel; import android.os.Parcelable; -import android.util.Log; +import android.webkit.MimeTypeMap; public class OCFile implements Parcelable, Comparable { @@ -39,6 +42,7 @@ public class OCFile implements Parcelable, Comparable { }; public static final String PATH_SEPARATOR = "/"; + public static final String ROOT_PATH = PATH_SEPARATOR; private static final String TAG = OCFile.class.getSimpleName(); @@ -47,13 +51,26 @@ public class OCFile implements Parcelable, Comparable { private long mLength; private long mCreationTimestamp; private long mModifiedTimestamp; + private long mModifiedTimestampAtLastSyncForData; private String mRemotePath; private String mLocalPath; private String mMimeType; private boolean mNeedsUpdating; - private long mLastSyncDate; + private long mLastSyncDateForProperties; + private long mLastSyncDateForData; private boolean mKeepInSync; + private String mEtag; + + private boolean mShareByLink; + private String mPublicLink; + + private String mPermissions; + private String mRemoteId; + + private boolean mNeedsUpdateThumbnail; + + /** * Create new {@link OCFile} with given path. * @@ -81,12 +98,21 @@ public class OCFile implements Parcelable, Comparable { mLength = source.readLong(); mCreationTimestamp = source.readLong(); mModifiedTimestamp = source.readLong(); + mModifiedTimestampAtLastSyncForData = source.readLong(); mRemotePath = source.readString(); mLocalPath = source.readString(); mMimeType = source.readString(); mNeedsUpdating = source.readInt() == 0; mKeepInSync = source.readInt() == 1; - mLastSyncDate = source.readLong(); + mLastSyncDateForProperties = source.readLong(); + mLastSyncDateForData = source.readLong(); + mEtag = source.readString(); + mShareByLink = source.readInt() == 1; + mPublicLink = source.readString(); + mPermissions = source.readString(); + mRemoteId = source.readString(); + mNeedsUpdateThumbnail = source.readInt() == 0; + } @Override @@ -96,12 +122,20 @@ public class OCFile implements Parcelable, Comparable { dest.writeLong(mLength); dest.writeLong(mCreationTimestamp); dest.writeLong(mModifiedTimestamp); + dest.writeLong(mModifiedTimestampAtLastSyncForData); dest.writeString(mRemotePath); dest.writeString(mLocalPath); dest.writeString(mMimeType); dest.writeInt(mNeedsUpdating ? 1 : 0); dest.writeInt(mKeepInSync ? 1 : 0); - dest.writeLong(mLastSyncDate); + dest.writeLong(mLastSyncDateForProperties); + dest.writeLong(mLastSyncDateForData); + dest.writeString(mEtag); + dest.writeInt(mShareByLink ? 1 : 0); + dest.writeString(mPublicLink); + dest.writeString(mPermissions); + dest.writeString(mRemoteId); + dest.writeInt(mNeedsUpdateThumbnail ? 1 : 0); } /** @@ -133,11 +167,11 @@ public class OCFile implements Parcelable, Comparable { } /** - * Use this to find out if this file is a Directory + * Use this to find out if this file is a folder. * - * @return true if it is a directory + * @return true if it is a folder */ - public boolean isDirectory() { + public boolean isFolder() { return mMimeType != null && mMimeType.equals("DIR"); } @@ -191,9 +225,10 @@ public class OCFile implements Parcelable, Comparable { } /** - * Get a UNIX timestamp of the file modification time - * - * @return A UNIX timestamp of the modification time + * Get a UNIX timestamp of the file modification time. + * + * @return A UNIX timestamp of the modification time, corresponding to the value returned by the server + * in the last synchronization of the properties of this file. */ public long getModificationTimestamp() { return mModifiedTimestamp; @@ -202,12 +237,40 @@ public class OCFile implements Parcelable, Comparable { /** * Set a UNIX timestamp of the time the time the file was modified. * + * To update with the value returned by the server in every synchronization of the properties + * of this file. + * * @param modification_timestamp to set */ public void setModificationTimestamp(long modification_timestamp) { mModifiedTimestamp = modification_timestamp; } + + /** + * Get a UNIX timestamp of the file modification time. + * + * @return A UNIX timestamp of the modification time, corresponding to the value returned by the server + * in the last synchronization of THE CONTENTS of this file. + */ + public long getModificationTimestampAtLastSyncForData() { + return mModifiedTimestampAtLastSyncForData; + } + + /** + * Set a UNIX timestamp of the time the time the file was modified. + * + * To update with the value returned by the server in every synchronization of THE CONTENTS + * of this file. + * + * @param modification_timestamp to set + */ + public void setModificationTimestampAtLastSyncForData(long modificationTimestamp) { + mModifiedTimestampAtLastSyncForData = modificationTimestamp; + } + + + /** * Returns the filename and "/" for the root directory * @@ -215,7 +278,7 @@ public class OCFile implements Parcelable, Comparable { */ public String getFileName() { File f = new File(getRemotePath()); - return f.getName().length() == 0 ? PATH_SEPARATOR : f.getName(); + return f.getName().length() == 0 ? ROOT_PATH : f.getName(); } /** @@ -224,15 +287,15 @@ public class OCFile implements Parcelable, Comparable { * Does nothing if the new name is null, empty or includes "/" ; or if the file is the root directory */ public void setFileName(String name) { - Log.d(TAG, "OCFile name changin from " + mRemotePath); - if (name != null && name.length() > 0 && !name.contains(PATH_SEPARATOR) && !mRemotePath.equals(PATH_SEPARATOR)) { + Log_OC.d(TAG, "OCFile name changin from " + mRemotePath); + if (name != null && name.length() > 0 && !name.contains(PATH_SEPARATOR) && !mRemotePath.equals(ROOT_PATH)) { String parent = (new File(getRemotePath())).getParent(); parent = (parent.endsWith(PATH_SEPARATOR)) ? parent : parent + PATH_SEPARATOR; mRemotePath = parent + name; - if (isDirectory()) { + if (isFolder()) { mRemotePath += PATH_SEPARATOR; } - Log.d(TAG, "OCFile name changed to " + mRemotePath); + Log_OC.d(TAG, "OCFile name changed to " + mRemotePath); } } @@ -254,7 +317,7 @@ public class OCFile implements Parcelable, Comparable { * not a directory */ public void addFile(OCFile file) throws IllegalStateException { - if (isDirectory()) { + if (isFolder()) { file.mParentId = mId; mNeedsUpdating = true; return; @@ -275,9 +338,17 @@ public class OCFile implements Parcelable, Comparable { mLength = 0; mCreationTimestamp = 0; mModifiedTimestamp = 0; - mLastSyncDate = 0; + mModifiedTimestampAtLastSyncForData = 0; + mLastSyncDateForProperties = 0; + mLastSyncDateForData = 0; mKeepInSync = false; mNeedsUpdating = false; + mEtag = null; + mShareByLink = false; + mPublicLink = null; + mPermissions = null; + mRemoteId = null; + mNeedsUpdateThumbnail = false; } /** @@ -343,12 +414,28 @@ public class OCFile implements Parcelable, Comparable { return mNeedsUpdating; } - public long getLastSyncDate() { - return mLastSyncDate; + public boolean needsUpdateThumbnail() { + return mNeedsUpdateThumbnail; + } + + public void setNeedsUpdateThumbnail(boolean needsUpdateThumbnail) { + this.mNeedsUpdateThumbnail = needsUpdateThumbnail; + } + + public long getLastSyncDateForProperties() { + return mLastSyncDateForProperties; + } + + public void setLastSyncDateForProperties(long lastSyncDate) { + mLastSyncDateForProperties = lastSyncDate; } - public void setLastSyncDate(long lastSyncDate) { - mLastSyncDate = lastSyncDate; + public long getLastSyncDateForData() { + return mLastSyncDateForData; + } + + public void setLastSyncDateForData(long lastSyncDate) { + mLastSyncDateForData = lastSyncDate; } public void setKeepInSync(boolean keepInSync) { @@ -366,14 +453,14 @@ public class OCFile implements Parcelable, Comparable { @Override public int compareTo(OCFile another) { - if (isDirectory() && another.isDirectory()) { + if (isFolder() && another.isFolder()) { return getRemotePath().toLowerCase().compareTo(another.getRemotePath().toLowerCase()); - } else if (isDirectory()) { + } else if (isFolder()) { return -1; - } else if (another.isDirectory()) { + } else if (another.isFolder()) { return 1; } - return getRemotePath().toLowerCase().compareTo(another.getRemotePath().toLowerCase()); + return new AlphanumComparator().compare(this, another); } @Override @@ -390,9 +477,84 @@ public class OCFile implements Parcelable, Comparable { @Override public String toString() { - String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s, parentId=%s, keepInSinc=%s]"; - asString = String.format(asString, Long.valueOf(mId), getFileName(), mMimeType, isDown(), mLocalPath, mRemotePath, Long.valueOf(mParentId), Boolean.valueOf(mKeepInSync)); + String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s, parentId=%s, keepInSync=%s etag=%s]"; + asString = String.format(asString, Long.valueOf(mId), getFileName(), mMimeType, isDown(), mLocalPath, mRemotePath, Long.valueOf(mParentId), Boolean.valueOf(mKeepInSync), mEtag); return asString; } + public String getEtag() { + return mEtag; + } + + public void setEtag(String etag) { + this.mEtag = etag; + } + + + public boolean isShareByLink() { + return mShareByLink; + } + + public void setShareByLink(boolean shareByLink) { + this.mShareByLink = shareByLink; + } + + public String getPublicLink() { + return mPublicLink; + } + + public void setPublicLink(String publicLink) { + this.mPublicLink = publicLink; + } + + public long getLocalModificationTimestamp() { + if (mLocalPath != null && mLocalPath.length() > 0) { + File f = new File(mLocalPath); + return f.lastModified(); + } + return 0; + } + + /** @return 'True' if the file contains audio */ + public boolean isAudio() { + return (mMimeType != null && mMimeType.startsWith("audio/")); + } + + /** @return 'True' if the file contains video */ + public boolean isVideo() { + return (mMimeType != null && mMimeType.startsWith("video/")); + } + + /** @return 'True' if the file contains an image */ + public boolean isImage() { + return ((mMimeType != null && mMimeType.startsWith("image/")) || + getMimeTypeFromName().startsWith("image/")); + } + + public String getMimeTypeFromName() { + String extension = ""; + int pos = mRemotePath.lastIndexOf('.'); + if (pos >= 0) { + extension = mRemotePath.substring(pos + 1); + } + String result = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.toLowerCase()); + return (result != null) ? result : ""; + } + + public String getPermissions() { + return mPermissions; + } + + public void setPermissions(String permissions) { + this.mPermissions = permissions; + } + + public String getRemoteId() { + return mRemoteId; + } + + public void setRemoteId(String remoteId) { + this.mRemoteId = remoteId; + } + }