Skip to content

Gallery search #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobiasKaminsky merged 4 commits into from
Jun 12, 2018
Merged

Gallery search #147

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c918492
Attempt at making gallery work
mario May 24, 2018
9002d57
Test
mario May 24, 2018
3369733
New attempt
mario May 24, 2018
b40082f
Implement gallery serch support
mario May 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 76 additions & 34 deletions src/com/owncloud/android/lib/resources/files/SearchOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ public enum SearchType {
CONTENT_TYPE_SEARCH,
RECENTLY_MODIFIED_SEARCH,
RECENTLY_ADDED_SEARCH,
SHARED_SEARCH
SHARED_SEARCH,
GALLERY_SEARCH
}

private String searchQuery;
Expand Down Expand Up @@ -96,7 +97,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {

// check and process response
boolean isSuccess = (status == HttpStatus.SC_MULTI_STATUS || status == HttpStatus.SC_OK);

if (isSuccess) {
// get data from remote folder
MultiStatus dataInServer = searchMethod.getResponseBodyAsMultiStatus();
Expand Down Expand Up @@ -212,48 +213,83 @@ private Document createQuery() {
Element folderElement = null;
if (filterOutFiles) {
folderElement = query.createElementNS(DAV_NAMESPACE, "d:is-collection");
}
}
Element equalsElement;
if (searchType == SearchType.FAVORITE_SEARCH) {
equalsElement = query.createElementNS(DAV_NAMESPACE, "d:eq");
} else if (searchType == SearchType.RECENTLY_MODIFIED_SEARCH ||
searchType == SearchType.RECENTLY_ADDED_SEARCH) {
equalsElement = query.createElementNS(DAV_NAMESPACE, "d:gt");
} else if (searchType == SearchType.GALLERY_SEARCH) {
equalsElement = query.createElementNS(DAV_NAMESPACE, "d:or");
} else {
equalsElement = query.createElementNS(DAV_NAMESPACE, "d:like");
}
Element propElement = query.createElementNS(DAV_NAMESPACE, "d:prop");

Element propElement = null;
Element queryElement = null;
if (searchType == SearchType.CONTENT_TYPE_SEARCH) {
queryElement = query.createElementNS(DAV_NAMESPACE, "d:getcontenttype");
} else if (searchType == SearchType.FILE_SEARCH) {
queryElement = query.createElementNS(DAV_NAMESPACE, "d:displayname");
} else if (searchType == SearchType.FAVORITE_SEARCH) {
queryElement = query.createElementNS(WebdavEntry.NAMESPACE_OC, "oc:favorite");
} else if (searchType == SearchType.RECENTLY_MODIFIED_SEARCH) {
queryElement = query.createElementNS(DAV_NAMESPACE, "d:getlastmodified");
} else if (searchType == SearchType.RECENTLY_ADDED_SEARCH) {
queryElement = query.createElementNS(DAV_NAMESPACE, "d:creationdate");
}
Element literalElement = query.createElementNS(DAV_NAMESPACE, "d:literal");
Text literalTextElement;
if (searchType != SearchType.RECENTLY_MODIFIED_SEARCH && searchType != SearchType.RECENTLY_ADDED_SEARCH) {
if (searchType == SearchType.FILE_SEARCH) {
internalSearchString = "%" + internalSearchString + "%";
Element literalElement = null;
Text literalTextElement = null;
Element imageLikeElement = null;
Element videoLikeElement = null;

if (searchType != SearchType.GALLERY_SEARCH) {
propElement = query.createElementNS(DAV_NAMESPACE, "d:prop");
queryElement = null;
if (searchType == SearchType.CONTENT_TYPE_SEARCH) {
queryElement = query.createElementNS(DAV_NAMESPACE, "d:getcontenttype");
} else if (searchType == SearchType.FILE_SEARCH) {
queryElement = query.createElementNS(DAV_NAMESPACE, "d:displayname");
} else if (searchType == SearchType.FAVORITE_SEARCH) {
queryElement = query.createElementNS(WebdavEntry.NAMESPACE_OC, "oc:favorite");
} else if (searchType == SearchType.RECENTLY_MODIFIED_SEARCH) {
queryElement = query.createElementNS(DAV_NAMESPACE, "d:getlastmodified");
} else if (searchType == SearchType.RECENTLY_ADDED_SEARCH) {
queryElement = query.createElementNS(DAV_NAMESPACE, "d:creationdate");
}
literalElement = query.createElementNS(DAV_NAMESPACE, "d:literal");
if (searchType != SearchType.RECENTLY_MODIFIED_SEARCH && searchType != SearchType.RECENTLY_ADDED_SEARCH) {
if (searchType == SearchType.FILE_SEARCH) {
internalSearchString = "%" + internalSearchString + "%";
}
literalTextElement = query.createTextNode(internalSearchString);
} else {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.getDefault());
dateFormat.setTimeZone(TimeZone.getDefault());
Date date = new Date();

Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.add(Calendar.DAY_OF_YEAR, -7);
date = calendar.getTime();

String formattedDateString = dateFormat.format(date);
literalTextElement = query.createTextNode(formattedDateString);
}
literalTextElement = query.createTextNode(internalSearchString);
} else {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.getDefault());
dateFormat.setTimeZone(TimeZone.getDefault());
Date date = new Date();
imageLikeElement = query.createElementNS(DAV_NAMESPACE, "d:like");
Element imagePropElement = query.createElementNS(DAV_NAMESPACE, "d:prop");
Element imageQueryElement = query.createElementNS(DAV_NAMESPACE, "d:getcontenttype");
Element imageLiteralElement = query.createElementNS(DAV_NAMESPACE, "d:literal");
Text imageLiteralTextElement = query.createTextNode("image/%");
videoLikeElement = query.createElementNS(DAV_NAMESPACE, "d:like");
Element videoPropElement = query.createElementNS(DAV_NAMESPACE, "d:prop");
Element videoQueryElement = query.createElementNS(DAV_NAMESPACE, "d:getcontenttype");
Element videoLiteralElement = query.createElementNS(DAV_NAMESPACE, "d:literal");
Text videoLiteralTextElement = query.createTextNode("video/%");

videoLiteralElement.appendChild(videoLiteralTextElement);
imageLiteralElement.appendChild(imageLiteralTextElement);

videoPropElement.appendChild(videoQueryElement);
videoLikeElement.appendChild(videoPropElement);
videoLikeElement.appendChild(videoLiteralElement);


Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.add(Calendar.DAY_OF_YEAR, -7);
date = calendar.getTime();
imagePropElement.appendChild(imageQueryElement);
imageLikeElement.appendChild(imagePropElement);
imageLikeElement.appendChild(imageLiteralElement);

String formattedDateString = dateFormat.format(date);
literalTextElement = query.createTextNode(formattedDateString);
}

Element orderByElement = query.createElementNS(DAV_NAMESPACE, "d:orderby");
Expand Down Expand Up @@ -292,10 +328,16 @@ private Document createQuery() {
} else {
whereElement.appendChild(equalsElement);
}
equalsElement.appendChild(propElement);
equalsElement.appendChild(literalElement);
propElement.appendChild(queryElement);
literalElement.appendChild(literalTextElement);

if (searchType != SearchType.GALLERY_SEARCH) {
equalsElement.appendChild(propElement);
equalsElement.appendChild(literalElement);
propElement.appendChild(queryElement);
literalElement.appendChild(literalTextElement);
} else {
equalsElement.appendChild(imageLikeElement);
equalsElement.appendChild(videoLikeElement);
}
basicSearchElement.appendChild(orderByElement);

return query;
Expand Down