1068933 - DeviceStorage - since not working properly with enumerate

Status: RESOLVED FIXED

(Core :: DOM: Device Interfaces, defect)

Description

[Dave Hylands [:dhylands]]

I added the following function to ds-test:

> function ds_test_enumerate_since() {
>   log('ds_test_enumerate_since');
>
>   var storage = navigator.getDeviceStorage('sdcard');
>   var cursor = storage.enumerate();
>   var timestamp = null
>   var do_since = true;
>   cursor.onsuccess = function enumSuccess(e) {
>     if (e.target.result == null) {
>       if (do_since) {
>         do_since = false;
>         if (timestamp) {
>           log('===== since.txt timestamp = ' + timestamp + ' =====');
>           var cursor_since = storage.enumerate({'since' : timestamp});
>           cursor_since.onsuccess = cursor.onsuccess;
>           cursor_since.onerror = cursor.onerror;
>         } else {
>           log("since.txt file not found");
>         }
>       } else {
>         log('===== Done =====');
>       }
>       return;
>     }
>     log(e.target.result.name + ' - ' + e.target.result.lastModifiedDate);
>     if (e.target.result.name.slice(-9) == 'since.txt') {
>       timestamp = e.target.result.lastModifiedDate;
>     }
>     e.target.continue();
>   };
>   cursor.onerror = function enumError(e) {
>     log('enumError');
>   };
> }

If I then take a few pictures, and then do:
> adb shell touch /storage/sdcard0/DCIM/100MZLLA/since.txt
and then take a few more pictures, I get this output:

> /sdcard/DCIM/100MZLLA/IMG_0009.jpg - Wed Sep 17 2014 12:42:14 GMT-0700 (UTC)
> /sdcard/DCIM/100MZLLA/IMG_0010.jpg - Wed Sep 17 2014 12:42:18 GMT-0700 (UTC)
> /sdcard/DCIM/100MZLLA/since.txt    - Wed Sep 17 2014 12:43:38 GMT-0700 (UTC)
> /sdcard/DCIM/100MZLLA/IMG_0011.jpg - Wed Sep 17 2014 12:44:00 GMT-0700 (UTC)
> /sdcard/DCIM/100MZLLA/IMG_0012.jpg - Wed Sep 17 2014 12:44:04 GMT-0700 (UTC)
> ===== since.txt timestamp = Wed Sep 17 2014 12:43:38 GMT-0700 (UTC) =====
> ===== Done =====

It should report IMG_0011.jpg and IMG_0012.jpg from the since enumeration and it doesn't.

There is a similar test case for this in:
http://dxr.mozilla.org/mozilla-central/source/dom/devicestorage/test/test_lastModificationFilter.html?from=test_lastModificationFilter.html#1

so I need to figure out why the test is working (or not being run, or whatever) and why the code I posted above isn't working.

Comment 1

[Dave Hylands [:dhylands]]

Attachment: Only look at timestamps of files (not directories)

DeviceStorage only returns files, so it should only be filtering files.

The way it was implemented it would discard entire directory trees if the timestamp on the directory was less than the since modifier.

Comment 2

[Dave Hylands [:dhylands]]

Attachment: Only look at timestamps of files (not directories) v2

Updated the last filter test.
Verified that the test fails without the rest of the patch and pass with the patch.

Comment 3

[Dave Hylands [:dhylands]]

Any ETA on the review?

Comment 4

[Jan Varga [:janv]]

sorry, I was finishing something else, will do tomorrow

Comment 5

[Jan Varga [:janv]]

Comment on attachment 8491218 [details] [diff] [review]
Only look at timestamps of files (not directories) v2

Review of attachment 8491218 [details] [diff] [review]:
-----------------------------------------------------------------

sorry for the delay

Comment 6

[Dave Hylands [:dhylands]]

https://hg.mozilla.org/integration/b2g-inbound/rev/e5e33d14ee28

Forgot to add r=janv so backed out
https://hg.mozilla.org/integration/b2g-inbound/rev/9fa73a2c4c2b

and relanded
https://hg.mozilla.org/integration/b2g-inbound/rev/12d4584713e5

Comment 7

[Dave Hylands [:dhylands]]

Commited the code from comment 0 to ds-test

https://github.com/mozilla-b2g/gaia/commit/31bb61b698775ce88ffe509aa7ae48678aea2174

Comment 8

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/12d4584713e5