|
|
Created:
4 years ago by yamaguchi Modified:
4 years ago Reviewers:
fukino CC:
chromium-reviews, tfarina, yamaguchi+watch_chromium.org, oka+watch_chromium.org, rginda+watch_chromium.org, mtomasz+watch_chromium.org, fukino+watch_chromium.org Target Ref:
refs/pending/heads/master Project:
chromium Visibility:
Public. |
DescriptionPostpone the content duplication check until starting import.
Skip content duplication check at the directory or selection scan, which
runs automatically upon directory or selection change.
The de-duplication by content hash check is added to the import task
instead. When it finds a file already exist in Drive, it skips the
transfer of such file but just marks as imported.
BUG=668574
TEST=browser_test: FileManagerJsTest.* , and manual test : Put 2 new image files (A and B) in /DCIM folder of a removable drive. Copy a file (A) to a folder in Drive manually. See the both file detected as "new file" by cloud backup. Execute Cloud Backup for both files and confirm only (B) is copied to Cloud Backup folder, and see the both file gets Drive icon in the Status column.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation
Committed: https://crrev.com/b02ae16b895b09fe5dd3319b37a32876abe58eaf
Cr-Commit-Position: refs/heads/master@{#440052}
Patch Set 1 #Patch Set 2 : Use typedef name to avoid repeating the full signature of the disposition check function. #Patch Set 3 : Add JS unit test testcase for MediaImportHandler. #
Total comments: 7
Patch Set 4 : Fix indent. Remove unnecessary code. #Patch Set 5 : indent fix #
Messages
Total messages: 40 (30 generated)
Description was changed from ========== Skip content duplication check at directory and selection scans. Skip content duplication check at the directory or selection scan, which runs automatically. The de-duplication by content hash check is done in import task. When it finds a file already exist in Drive, it skips the transfer of such file but just marks as imported in the history. BUG=668574 ========== to ========== Skip content duplication check at directory and selection scans. Skip content duplication check at the directory or selection scan, which runs automatically. The de-duplication by content hash check is done in import task. When it finds a file already exist in Drive, it skips the transfer of such file but just marks as imported in the history. BUG=668574 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation ==========
The CQ bit was checked by yamaguchi@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
Description was changed from ========== Skip content duplication check at directory and selection scans. Skip content duplication check at the directory or selection scan, which runs automatically. The de-duplication by content hash check is done in import task. When it finds a file already exist in Drive, it skips the transfer of such file but just marks as imported in the history. BUG=668574 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation ========== to ========== Skip content duplication check at the directory or selection scan, which runs automatically upon directory or selection change. The de-duplication by content hash check is added to the import task instead. When it finds a file already exist in Drive, it skips the transfer of such file but just marks as imported. BUG=668574 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation ==========
The CQ bit was checked by yamaguchi@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was checked by yamaguchi@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
Description was changed from ========== Skip content duplication check at the directory or selection scan, which runs automatically upon directory or selection change. The de-duplication by content hash check is added to the import task instead. When it finds a file already exist in Drive, it skips the transfer of such file but just marks as imported. BUG=668574 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation ========== to ========== Skip content duplication check at the directory or selection scan, which runs automatically upon directory or selection change. The de-duplication by content hash check is added to the import task instead. When it finds a file already exist in Drive, it skips the transfer of such file but just marks as imported. BUG=668574 TEST=Put 2 new image files (A and B) in /DCIM folder of a removable drive. Copy one of the files (A) to Drive manually. See the both file detected as "new file" by cloud backup. Execute Cloud Backup for both files and confirm only (B) is copied to Cloud Backup folder, and see the both file gets Drive icon in the Status column. CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation ==========
Description was changed from ========== Skip content duplication check at the directory or selection scan, which runs automatically upon directory or selection change. The de-duplication by content hash check is added to the import task instead. When it finds a file already exist in Drive, it skips the transfer of such file but just marks as imported. BUG=668574 TEST=Put 2 new image files (A and B) in /DCIM folder of a removable drive. Copy one of the files (A) to Drive manually. See the both file detected as "new file" by cloud backup. Execute Cloud Backup for both files and confirm only (B) is copied to Cloud Backup folder, and see the both file gets Drive icon in the Status column. CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation ========== to ========== Skip content duplication check at the directory or selection scan, which runs automatically upon directory or selection change. The de-duplication by content hash check is added to the import task instead. When it finds a file already exist in Drive, it skips the transfer of such file but just marks as imported. BUG=668574 TEST=Put 2 new image files (A and B) in /DCIM folder of a removable drive. Copy a file (A) to a folder in Drive manually. See the both file detected as "new file" by cloud backup. Execute Cloud Backup for both files and confirm only (B) is copied to Cloud Backup folder, and see the both file gets Drive icon in the Status column. CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation ==========
yamaguchi@chromium.org changed reviewers: + fukino@chromium.org
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: linux_chromium_chromeos_rel_ng on master.tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
yamaguchi@chromium.org changed reviewers: - fukino@chromium.org
I'll fix the unittest first.
The CQ bit was checked by yamaguchi@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
Description was changed from ========== Skip content duplication check at the directory or selection scan, which runs automatically upon directory or selection change. The de-duplication by content hash check is added to the import task instead. When it finds a file already exist in Drive, it skips the transfer of such file but just marks as imported. BUG=668574 TEST=Put 2 new image files (A and B) in /DCIM folder of a removable drive. Copy a file (A) to a folder in Drive manually. See the both file detected as "new file" by cloud backup. Execute Cloud Backup for both files and confirm only (B) is copied to Cloud Backup folder, and see the both file gets Drive icon in the Status column. CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation ========== to ========== Skip content duplication check at the directory or selection scan, which runs automatically upon directory or selection change. The de-duplication by content hash check is added to the import task instead. When it finds a file already exist in Drive, it skips the transfer of such file but just marks as imported. BUG=668574 TEST=browser_test: FileManagerJsTest.* , and manual test : Put 2 new image files (A and B) in /DCIM folder of a removable drive. Copy a file (A) to a folder in Drive manually. See the both file detected as "new file" by cloud backup. Execute Cloud Backup for both files and confirm only (B) is copied to Cloud Backup folder, and see the both file gets Drive icon in the Status column. CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation ==========
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: This issue passed the CQ dry run.
yamaguchi@chromium.org changed reviewers: + fukino@chromium.org
ptal.
Please add the title in the first line of bug description. (The title in Rietveld is not visible in git log) https://codereview.chromium.org/2594523002/diff/40001/ui/file_manager/file_ma... File ui/file_manager/file_manager/background/js/media_import_handler.js (right): https://codereview.chromium.org/2594523002/diff/40001/ui/file_manager/file_ma... ui/file_manager/file_manager/background/js/media_import_handler.js:405: this.markAsImported_(entry); You don't need two wrap markAsImported_() by a Promise. function(disposition) { if () return this.copy_(.. this.markAsImported_(entry); } should work. Then function is resolved by the returned value (in this case, 'undefined') if it's not a promise. https://codereview.chromium.org/2594523002/diff/40001/ui/file_manager/file_ma... File ui/file_manager/file_manager/background/js/media_import_handler_unittest.js (right): https://codereview.chromium.org/2594523002/diff/40001/ui/file_manager/file_ma... ui/file_manager/file_manager/background/js/media_import_handler_unittest.js:176: scanResult, nit: indent depth https://codereview.chromium.org/2594523002/diff/40001/ui/file_manager/file_ma... ui/file_manager/file_manager/background/js/media_import_handler_unittest.js:199: whenImportDone.then( nit: indent depth. whenImportDone.then(function() { var ... or, whenImportDone.then( function() { var ... (I think the former is common if it fits 80 columns)
Description was changed from ========== Skip content duplication check at the directory or selection scan, which runs automatically upon directory or selection change. The de-duplication by content hash check is added to the import task instead. When it finds a file already exist in Drive, it skips the transfer of such file but just marks as imported. BUG=668574 TEST=browser_test: FileManagerJsTest.* , and manual test : Put 2 new image files (A and B) in /DCIM folder of a removable drive. Copy a file (A) to a folder in Drive manually. See the both file detected as "new file" by cloud backup. Execute Cloud Backup for both files and confirm only (B) is copied to Cloud Backup folder, and see the both file gets Drive icon in the Status column. CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation ========== to ========== Postpone the content duplication check until starting import. Skip content duplication check at the directory or selection scan, which runs automatically upon directory or selection change. The de-duplication by content hash check is added to the import task instead. When it finds a file already exist in Drive, it skips the transfer of such file but just marks as imported. BUG=668574 TEST=browser_test: FileManagerJsTest.* , and manual test : Put 2 new image files (A and B) in /DCIM folder of a removable drive. Copy a file (A) to a folder in Drive manually. See the both file detected as "new file" by cloud backup. Execute Cloud Backup for both files and confirm only (B) is copied to Cloud Backup folder, and see the both file gets Drive icon in the Status column. CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation ==========
The CQ bit was checked by yamaguchi@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: This issue passed the CQ dry run.
https://codereview.chromium.org/2594523002/diff/40001/ui/file_manager/file_ma... File ui/file_manager/file_manager/background/js/media_import_handler.js (right): https://codereview.chromium.org/2594523002/diff/40001/ui/file_manager/file_ma... ui/file_manager/file_manager/background/js/media_import_handler.js:405: this.markAsImported_(entry); On 2016/12/21 05:56:59, fukino wrote: > You don't need two wrap markAsImported_() by a Promise. > > function(disposition) { > if () > return this.copy_(.. > > this.markAsImported_(entry); > } > > should work. > Then function is resolved by the returned value (in this case, 'undefined') if > it's not a promise. Done. https://codereview.chromium.org/2594523002/diff/40001/ui/file_manager/file_ma... File ui/file_manager/file_manager/background/js/media_import_handler_unittest.js (right): https://codereview.chromium.org/2594523002/diff/40001/ui/file_manager/file_ma... ui/file_manager/file_manager/background/js/media_import_handler_unittest.js:176: scanResult, On 2016/12/21 05:56:59, fukino wrote: > nit: indent depth Done. https://codereview.chromium.org/2594523002/diff/40001/ui/file_manager/file_ma... ui/file_manager/file_manager/background/js/media_import_handler_unittest.js:199: whenImportDone.then( On 2016/12/21 05:56:59, fukino wrote: > nit: indent depth. > > whenImportDone.then(function() { > var ... > > or, > > whenImportDone.then( > function() { > var ... > > (I think the former is common if it fits 80 columns) I agree, but I'd like to keep it consistent with other test cases in this file for now.
https://codereview.chromium.org/2594523002/diff/40001/ui/file_manager/file_ma... File ui/file_manager/file_manager/background/js/media_import_handler_unittest.js (right): https://codereview.chromium.org/2594523002/diff/40001/ui/file_manager/file_ma... ui/file_manager/file_manager/background/js/media_import_handler_unittest.js:199: whenImportDone.then( On 2016/12/21 07:36:57, yamaguchi wrote: > On 2016/12/21 05:56:59, fukino wrote: > > nit: indent depth. > > > > whenImportDone.then(function() { > > var ... > > > > or, > > > > whenImportDone.then( > > function() { > > var ... > > > > (I think the former is common if it fits 80 columns) > > I agree, but I'd like to keep it consistent with other test cases in this file > for now. You can choose the latter, but still you need to correct the indent depth. After 'then(', 4 space indent is needed.
lgtm assuming you correct the indent depth.
On 2016/12/21 07:46:16, fukino wrote: > https://codereview.chromium.org/2594523002/diff/40001/ui/file_manager/file_ma... > File ui/file_manager/file_manager/background/js/media_import_handler_unittest.js > (right): > > https://codereview.chromium.org/2594523002/diff/40001/ui/file_manager/file_ma... > ui/file_manager/file_manager/background/js/media_import_handler_unittest.js:199: > whenImportDone.then( > On 2016/12/21 07:36:57, yamaguchi wrote: > > On 2016/12/21 05:56:59, fukino wrote: > > > nit: indent depth. > > > > > > whenImportDone.then(function() { > > > var ... > > > > > > or, > > > > > > whenImportDone.then( > > > function() { > > > var ... > > > > > > (I think the former is common if it fits 80 columns) > > > > I agree, but I'd like to keep it consistent with other test cases in this file > > for now. > > You can choose the latter, but still you need to correct the indent depth. > After 'then(', 4 space indent is needed. Done.
The CQ bit was checked by yamaguchi@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from fukino@chromium.org Link to the patchset: https://codereview.chromium.org/2594523002/#ps80001 (title: "indent fix")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
CQ is committing da patch. Bot data: {"patchset_id": 80001, "attempt_start_ts": 1482306902398480, "parent_rev": "8b57b448a2da813240572d36187185392ede41ee", "commit_rev": "9bf54e8e07cf9c141381808d5696bb656290b2aa"}
Message was sent while issue was closed.
Description was changed from ========== Postpone the content duplication check until starting import. Skip content duplication check at the directory or selection scan, which runs automatically upon directory or selection change. The de-duplication by content hash check is added to the import task instead. When it finds a file already exist in Drive, it skips the transfer of such file but just marks as imported. BUG=668574 TEST=browser_test: FileManagerJsTest.* , and manual test : Put 2 new image files (A and B) in /DCIM folder of a removable drive. Copy a file (A) to a folder in Drive manually. See the both file detected as "new file" by cloud backup. Execute Cloud Backup for both files and confirm only (B) is copied to Cloud Backup folder, and see the both file gets Drive icon in the Status column. CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation ========== to ========== Postpone the content duplication check until starting import. Skip content duplication check at the directory or selection scan, which runs automatically upon directory or selection change. The de-duplication by content hash check is added to the import task instead. When it finds a file already exist in Drive, it skips the transfer of such file but just marks as imported. BUG=668574 TEST=browser_test: FileManagerJsTest.* , and manual test : Put 2 new image files (A and B) in /DCIM folder of a removable drive. Copy a file (A) to a folder in Drive manually. See the both file detected as "new file" by cloud backup. Execute Cloud Backup for both files and confirm only (B) is copied to Cloud Backup folder, and see the both file gets Drive icon in the Status column. CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation Review-Url: https://codereview.chromium.org/2594523002 ==========
Message was sent while issue was closed.
Committed patchset #5 (id:80001)
Message was sent while issue was closed.
Description was changed from ========== Postpone the content duplication check until starting import. Skip content duplication check at the directory or selection scan, which runs automatically upon directory or selection change. The de-duplication by content hash check is added to the import task instead. When it finds a file already exist in Drive, it skips the transfer of such file but just marks as imported. BUG=668574 TEST=browser_test: FileManagerJsTest.* , and manual test : Put 2 new image files (A and B) in /DCIM folder of a removable drive. Copy a file (A) to a folder in Drive manually. See the both file detected as "new file" by cloud backup. Execute Cloud Backup for both files and confirm only (B) is copied to Cloud Backup folder, and see the both file gets Drive icon in the Status column. CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation Review-Url: https://codereview.chromium.org/2594523002 ========== to ========== Postpone the content duplication check until starting import. Skip content duplication check at the directory or selection scan, which runs automatically upon directory or selection change. The de-duplication by content hash check is added to the import task instead. When it finds a file already exist in Drive, it skips the transfer of such file but just marks as imported. BUG=668574 TEST=browser_test: FileManagerJsTest.* , and manual test : Put 2 new image files (A and B) in /DCIM folder of a removable drive. Copy a file (A) to a folder in Drive manually. See the both file detected as "new file" by cloud backup. Execute Cloud Backup for both files and confirm only (B) is copied to Cloud Backup folder, and see the both file gets Drive icon in the Status column. CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation Committed: https://crrev.com/b02ae16b895b09fe5dd3319b37a32876abe58eaf Cr-Commit-Position: refs/heads/master@{#440052} ==========
Message was sent while issue was closed.
Patchset 5 (id:??) landed as https://crrev.com/b02ae16b895b09fe5dd3319b37a32876abe58eaf Cr-Commit-Position: refs/heads/master@{#440052} |