90361 2012-07-02 00:32:37 -0700 Web Inspector: Make DirectoryContentView sortable 2012-07-03 02:17:46 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 89961 68203 0 tzik tzik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy vsevik webkit.review.bot yurys oldest_to_newest 661303 0 tzik 2012-07-02 00:32:37 -0700 DirectoryContentView should have sortable columns. 661308 1 150371 tzik 2012-07-02 00:39:50 -0700 Created attachment 150371 Patch 661344 2 150371 vsevik 2012-07-02 02:28:25 -0700 Comment on attachment 150371 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150371&action=review Please make sure directories are correctly sorted. > Source/WebCore/inspector/front-end/DirectoryContentView.js:139 > + if (x._entry.isDirectory) This means directories order would be undefined. We should sort them by name instead. > Source/WebCore/inspector/front-end/DirectoryContentView.js:146 > + return (x._metadata ? x._metadata.size || 0 : 0) - (y._metadata ? y._metadata.size || 0 : 0); Is size defined for directories? > Source/WebCore/inspector/front-end/DirectoryContentView.js:151 > + return (x._metadata ? x._metadata.modificationTime : 0) - (y._metadata ? y._metadata.modificationTime : 0); Is modification time defined for directories? 661359 3 150371 tzik 2012-07-02 03:24:43 -0700 Comment on attachment 150371 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150371&action=review >> Source/WebCore/inspector/front-end/DirectoryContentView.js:139 >> + if (x._entry.isDirectory) > > This means directories order would be undefined. We should sort them by name instead. I meant, all directories have same type. Should we also sort other same-mimetype files by name? >> Source/WebCore/inspector/front-end/DirectoryContentView.js:146 >> + return (x._metadata ? x._metadata.size || 0 : 0) - (y._metadata ? y._metadata.size || 0 : 0); > > Is size defined for directories? No, it doesn't have size, currently. Should we assign dummy value to directory size? It seems make thing simpler. >> Source/WebCore/inspector/front-end/DirectoryContentView.js:151 >> + return (x._metadata ? x._metadata.modificationTime : 0) - (y._metadata ? y._metadata.modificationTime : 0); > > Is modification time defined for directories? Yes, directories have modification time. It'll be updated when its content is created or removed. 661397 4 vsevik 2012-07-02 04:36:44 -0700 (In reply to comment #3) > (From update of attachment 150371 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=150371&action=review > > >> Source/WebCore/inspector/front-end/DirectoryContentView.js:139 > >> + if (x._entry.isDirectory) > > > > This means directories order would be undefined. We should sort them by name instead. > > I meant, all directories have same type. > Should we also sort other same-mimetype files by name? > > >> Source/WebCore/inspector/front-end/DirectoryContentView.js:146 > >> + return (x._metadata ? x._metadata.size || 0 : 0) - (y._metadata ? y._metadata.size || 0 : 0); > > > > Is size defined for directories? > > No, it doesn't have size, currently. > Should we assign dummy value to directory size? It seems make thing simpler. > > >> Source/WebCore/inspector/front-end/DirectoryContentView.js:151 > >> + return (x._metadata ? x._metadata.modificationTime : 0) - (y._metadata ? y._metadata.modificationTime : 0); > > > > Is modification time defined for directories? > > Yes, directories have modification time. It'll be updated when its content is created or removed. I think there two basic requirements: - directories should always precede files - "equal" entries should be sorted by name You might want to use some file manager for the reference. 661958 5 150533 tzik 2012-07-02 22:10:34 -0700 Created attachment 150533 Patch 661961 6 150371 tzik 2012-07-02 22:20:19 -0700 Comment on attachment 150371 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150371&action=review >>>> Source/WebCore/inspector/front-end/DirectoryContentView.js:139 >>>> + if (x._entry.isDirectory) >>> >>> This means directories order would be undefined. We should sort them by name instead. >> >> I meant, all directories have same type. >> Should we also sort other same-mimetype files by name? > > I think there two basic requirements: > - directories should always precede files > - "equal" entries should be sorted by name > You might want to use some file manager for the reference. Updated. The ordering is differ for each file manager. That looks ubuntu style. 662066 7 150533 webkit.review.bot 2012-07-03 02:17:40 -0700 Comment on attachment 150533 Patch Clearing flags on attachment: 150533 Committed r121748: <http://trac.webkit.org/changeset/121748> 662067 8 webkit.review.bot 2012-07-03 02:17:46 -0700 All reviewed patches have been landed. Closing bug. 150371 2012-07-02 00:39:50 -0700 2012-07-02 22:20:19 -0700 Patch bug-90361-20120702163948.patch text/plain 4746 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxNjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDI5MTUyMzJkZmYzMjA1 Yjk0N2Y5M2VkNTBjY2Q2OTkwMWNlM2EzZS4uYjZhYTVlNzM3MzFjYzM3MmE3ZTk3ZTUyOWEyOTRh MWUzZmIxYTgzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDEyLTA3LTAyICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBN YWtlIERpcmVjdG9yeUNvbnRlbnRWaWV3IHNvcnRhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDM2MQorCisgICAgICAgIERpcmVjdG9yeUNvbnRl bnRWaWV3IHNob3VsZCBoYXZlIHNvcnRhYmxlIGNvbHVtbi4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGlyZWN0 b3J5Q29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGlyZWN0b3J5Q29udGVu dFZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRpcmVjdG9yeUNvbnRlbnRWaWV3LnByb3Rv dHlwZS5zaG93RW50cmllcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGlyZWN0b3J5Q29udGVu dFZpZXcucHJvdG90eXBlLl9zb3J0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EaXJlY3RvcnlD b250ZW50Vmlldy5Ob2RlLmNvbXBhcmF0b3IuZW50cnlDb21wYXJlKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5EaXJlY3RvcnlDb250ZW50Vmlldy5Ob2RlLmNvbXBhcmF0b3IudHlwZUNvbXBhcmUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRpcmVjdG9yeUNvbnRlbnRWaWV3Lk5vZGUuY29tcGFy YXRvci5zaXplQ29tcGFyZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGlyZWN0b3J5Q29udGVu dFZpZXcuTm9kZS5jb21wYXJhdG9yKToKKworMjAxMi0wNy0wMiAgVGFpanUgVHN1aWtpICA8dHpp a0BjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIERpcmVjdG9yeUNv bnRlbnRWaWV3IGZvciBGaWxlU3lzdGVtVmlldwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk5NjEKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9EaXJlY3RvcnlDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGlyZWN0b3J5Q29udGVudFZpZXcuanMKaW5kZXggZjk4 ZjBhY2JmNTIwMGI0ZDY0ZmNhYzMxOTZhZTg0MmUzODUxNDZhYy4uNjA5OTUyMTg0MTU0ZjdiYTFk MTQyNTNhNDlhMzZkMGU2MTM3NmQxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9EaXJlY3RvcnlDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RpcmVjdG9yeUNvbnRlbnRWaWV3LmpzCkBAIC0zOCwyMSAr MzgsMjggQEAgV2ViSW5zcGVjdG9yLkRpcmVjdG9yeUNvbnRlbnRWaWV3ID0gZnVuY3Rpb24oKQog ICAgIHZhciBjb2x1bW5zID0ge307CiAgICAgY29sdW1uc1tpbmRleGVzLk5hbWVdID0ge307CiAg ICAgY29sdW1uc1tpbmRleGVzLk5hbWVdLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJO YW1lIik7CisgICAgY29sdW1uc1tpbmRleGVzLk5hbWVdLnNvcnQgPSAiYXNjZW5kaW5nIjsKKyAg ICBjb2x1bW5zW2luZGV4ZXMuTmFtZV0uc29ydGFibGUgPSB0cnVlOwogICAgIGNvbHVtbnNbaW5k ZXhlcy5OYW1lXS53aWR0aCA9ICIyMCUiOwogICAgIGNvbHVtbnNbaW5kZXhlcy5VUkxdID0ge307 CiAgICAgY29sdW1uc1tpbmRleGVzLlVSTF0udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlVSTCIpOworICAgIGNvbHVtbnNbaW5kZXhlcy5VUkxdLnNvcnRhYmxlID0gdHJ1ZTsKICAgICBj b2x1bW5zW2luZGV4ZXMuVVJMXS53aWR0aCA9ICIyMCUiOwogICAgIGNvbHVtbnNbaW5kZXhlcy5U eXBlXSA9IHt9OwogICAgIGNvbHVtbnNbaW5kZXhlcy5UeXBlXS50aXRsZSA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiVHlwZSIpOworICAgIGNvbHVtbnNbaW5kZXhlcy5UeXBlXS5zb3J0YWJsZSA9 IHRydWU7CiAgICAgY29sdW1uc1tpbmRleGVzLlR5cGVdLndpZHRoID0gIjE1JSI7CiAgICAgY29s dW1uc1tpbmRleGVzLlNpemVdID0ge307CiAgICAgY29sdW1uc1tpbmRleGVzLlNpemVdLnRpdGxl ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaXplIik7CisgICAgY29sdW1uc1tpbmRleGVzLlNp emVdLnNvcnRhYmxlID0gdHJ1ZTsKICAgICBjb2x1bW5zW2luZGV4ZXMuU2l6ZV0ud2lkdGggPSAi MTAlIjsKICAgICBjb2x1bW5zW2luZGV4ZXMuTW9kaWZpY2F0aW9uVGltZV0gPSB7fTsKICAgICBj b2x1bW5zW2luZGV4ZXMuTW9kaWZpY2F0aW9uVGltZV0udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIk1vZGlmaWNhdGlvbiBUaW1lIik7CisgICAgY29sdW1uc1tpbmRleGVzLk1vZGlmaWNh dGlvblRpbWVdLnNvcnRhYmxlID0gdHJ1ZTsKICAgICBjb2x1bW5zW2luZGV4ZXMuTW9kaWZpY2F0 aW9uVGltZV0ud2lkdGggPSAiMjUlIjsKIAogICAgIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5jYWxs KHRoaXMsIGNvbHVtbnMpOworICAgIHRoaXMuYWRkRXZlbnRMaXN0ZW5lcigic29ydGluZyBjaGFu Z2VkIiwgdGhpcy5fc29ydCwgdGhpcyk7CiB9CiAKIFdlYkluc3BlY3Rvci5EaXJlY3RvcnlDb250 ZW50Vmlldy5jb2x1bW5JbmRleGVzID0gewpAQCAtNzMsNiArODAsMTEgQEAgV2ViSW5zcGVjdG9y LkRpcmVjdG9yeUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5yb290Tm9k ZSgpLnJlbW92ZUNoaWxkcmVuKCk7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZW50cmll cy5sZW5ndGg7ICsraSkKICAgICAgICAgICAgIHRoaXMucm9vdE5vZGUoKS5hcHBlbmRDaGlsZChu ZXcgV2ViSW5zcGVjdG9yLkRpcmVjdG9yeUNvbnRlbnRWaWV3Lk5vZGUoZW50cmllc1tpXSkpOwor ICAgIH0sCisKKyAgICBfc29ydDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5zb3J0 Tm9kZXMoV2ViSW5zcGVjdG9yLkRpcmVjdG9yeUNvbnRlbnRWaWV3Lk5vZGUuY29tcGFyYXRvcih0 aGlzLnNvcnRDb2x1bW5JZGVudGlmaWVyKSwgdGhpcy5zb3J0T3JkZXIgPT09ICJkZXNjZW5kaW5n Iik7CiAgICAgfQogfQogCkBAIC0xMDAsNiArMTEyLDQ2IEBAIFdlYkluc3BlY3Rvci5EaXJlY3Rv cnlDb250ZW50Vmlldy5Ob2RlID0gZnVuY3Rpb24oZW50cnkpCiAgICAgdGhpcy5fZW50cnkucmVx dWVzdE1ldGFkYXRhKHRoaXMuX21ldGFkYXRhUmVjZWl2ZWQuYmluZCh0aGlzKSk7CiB9CiAKK1dl Ykluc3BlY3Rvci5EaXJlY3RvcnlDb250ZW50Vmlldy5Ob2RlLmNvbXBhcmF0b3IgPSBmdW5jdGlv bihtb2RlKQoreworICAgIGNvbnN0IGluZGV4ZXMgPSBXZWJJbnNwZWN0b3IuRGlyZWN0b3J5Q29u dGVudFZpZXcuY29sdW1uSW5kZXhlczsKKyAgICBzd2l0Y2ggKG1vZGUpIHsKKyAgICBjYXNlIGlu ZGV4ZXMuTmFtZToKKyAgICBjYXNlIGluZGV4ZXMuVVJMOgorICAgICAgICByZXR1cm4gZW50cnlD b21wYXJlOworICAgIGNhc2UgaW5kZXhlcy5UeXBlOgorICAgICAgICByZXR1cm4gdHlwZUNvbXBh cmU7CisgICAgY2FzZSBpbmRleGVzLlNpemU6CisgICAgICAgIHJldHVybiBzaXplQ29tcGFyZTsK KyAgICBjYXNlIGluZGV4ZXMuTW9kaWZpY2F0aW9uVGltZToKKyAgICAgICAgcmV0dXJuIG1vZGlm aWNhdGlvblRpbWVDb21wYXJlOworICAgIH0KKworICAgIGZ1bmN0aW9uIGVudHJ5Q29tcGFyZSh4 LCB5KQorICAgIHsKKyAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwu RW50cnkuY29tcGFyZSh4Ll9lbnRyeSwgeS5fZW50cnkpOworICAgIH0KKworICAgIGZ1bmN0aW9u IHR5cGVDb21wYXJlKHgsIHkpCisgICAgeworICAgICAgICBpZiAoeC5fZW50cnkuaXNEaXJlY3Rv cnkgIT0geS5fZW50cnkuaXNEaXJlY3RvcnkpCisgICAgICAgICAgICByZXR1cm4geS5fZW50cnku aXNEaXJlY3RvcnkgPyAxIDogLTE7CisgICAgICAgIGlmICh4Ll9lbnRyeS5pc0RpcmVjdG9yeSkK KyAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4geC5fZW50cnkubWltZVR5cGUu bG9jYWxlQ29tcGFyZSh5Ll9lbnRyeS5taW1lVHlwZSk7CisgICAgfQorCisgICAgZnVuY3Rpb24g c2l6ZUNvbXBhcmUoeCwgeSkKKyAgICB7CisgICAgICAgIHJldHVybiAoeC5fbWV0YWRhdGEgPyB4 Ll9tZXRhZGF0YS5zaXplIHx8IDAgOiAwKSAtICh5Ll9tZXRhZGF0YSA/IHkuX21ldGFkYXRhLnNp emUgfHwgMCA6IDApOworICAgIH0KKworICAgIGZ1bmN0aW9uIG1vZGlmaWNhdGlvblRpbWVDb21w YXJlKHgsIHkpCisgICAgeworICAgICAgICByZXR1cm4gKHguX21ldGFkYXRhID8geC5fbWV0YWRh dGEubW9kaWZpY2F0aW9uVGltZSA6IDApIC0gKHkuX21ldGFkYXRhID8geS5fbWV0YWRhdGEubW9k aWZpY2F0aW9uVGltZSA6IDApOworICAgIH0KK30KKwogV2ViSW5zcGVjdG9yLkRpcmVjdG9yeUNv bnRlbnRWaWV3Lk5vZGUucHJvdG90eXBlID0gewogICAgIC8qKgogICAgICAqIEBwYXJhbSB7bnVt YmVyfSBlcnJvckNvZGUK 150533 2012-07-02 22:10:34 -0700 2012-07-03 02:17:40 -0700 Patch bug-90361-20120703141032.patch text/plain 8947 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxNjg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTY3NTQ2ZGM4YTEzOTBm ZmViZWI3MDhmYTM2MmU0ODhjNDY1MjAwYy4uMzE4NmZmOGMwODVjNzgwNmFmNTAwYzMzMThkZGEw OGIxNTQ4OTk1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA3LTAyICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBN YWtlIERpcmVjdG9yeUNvbnRlbnRWaWV3IHNvcnRhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDM2MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwOgorICAgICAgICAo V2ViQ29yZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EaXJlY3RvcnlDb250ZW50 Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EaXJlY3RvcnlDb250ZW50Vmlldyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRGlyZWN0b3J5Q29udGVudFZpZXcucHJvdG90eXBlLnNob3dF bnRyaWVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EaXJlY3RvcnlDb250ZW50Vmlldy5wcm90 b3R5cGUuX3NvcnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRpcmVjdG9yeUNvbnRlbnRWaWV3 Lk5vZGUuY29tcGFyYXRvci5pc0RpcmVjdG9yeUNvbXBhcmUpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRpcmVjdG9yeUNvbnRlbnRWaWV3Lk5vZGUuY29tcGFyYXRvci5uYW1lQ29tcGFyZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRGlyZWN0b3J5Q29udGVudFZpZXcuTm9kZS5jb21wYXJhdG9y LnR5cGVDb21wYXJlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EaXJlY3RvcnlDb250ZW50Vmll dy5Ob2RlLmNvbXBhcmF0b3Iuc2l6ZUNvbXBhcmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRp cmVjdG9yeUNvbnRlbnRWaWV3Lk5vZGUuY29tcGFyYXRvcik6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRGlyZWN0b3J5Q29udGVudFZpZXcuTm9kZS5wcm90b3R5cGUuX21ldGFkYXRhUmVjZWl2ZWQp OgorCiAyMDEyLTA3LTAyICBLd2FuZyBZdWwgU2VvICA8c2t5dWxAY29tcGFueTEwMC5uZXQ+CiAK ICAgICAgICAgQSBzdGFydCAiYm9keSIgdGFnIGluIHRoZSAiaW4gYm9keSIgaW5zZXJ0aW9uIG1v ZGUgaXMgYSBwYXJzZSBlcnJvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvci5qc29uIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29u CmluZGV4IDM3MTFjZjNmMzJhODBkNzE2ZGEzNjczY2Y4NDBkOWI2NzFjN2VmNDYuLjU5Nzk3YWJm ODFjZTRmM2IxOWFhZWU4YTAzMTU3YjFjZTQ2ZmY2NjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yLmpzb24KQEAgLTE0MjcsNyArMTQyNyw3IEBACiAgICAgICAgICAgICAgICAg InR5cGUiOiAib2JqZWN0IiwKICAgICAgICAgICAgICAgICAicHJvcGVydGllcyI6IFsKICAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJtb2RpZmljYXRpb25UaW1lIiwgInR5cGUiOiAibnVt YmVyIiwgImRlc2NyaXB0aW9uIjogIk1vZGlmaWNhdGlvbiB0aW1lLiIgfSwKLSAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJzaXplIiwgInR5cGUiOiAibnVtYmVyIiwgIm9wdGlvbmFsIjog dHJ1ZSwgImRlc2NyaXB0aW9uIjogIkZpbGUgc2l6ZS4gVGhpcyBmaWVsZCBpcyBhdmFpbGFibGUg b25seSBmb3IgYSBmaWxlLiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNpemUi LCAidHlwZSI6ICJudW1iZXIiLCAiZGVzY3JpcHRpb24iOiAiRmlsZSBzaXplLiBUaGlzIGZpZWxk IGlzIGFsd2F5cyB6ZXJvIGZvciBkaXJlY3Rvcmllcy4iIH0KICAgICAgICAgICAgICAgICBdLAog ICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJSZXByZXNlbnRzIG1ldGFkYXRhIG9mIGEg ZmlsZSBvciBlbnRyeS4iCiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCmluZGV4IGFkYWZlZWE3ZmFm NWU0YTRhNzcxOTE4MDJiZTllMjFkOGEwNDQ4ODMuLjJhMmY2YThmMGNiMDBmNWQxOTMwNDU5MGE5 M2U3MTA0YzhjYjBkMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCkBAIC0zOTksOSArMzk5LDcgQEAgYm9vbCBHZXRN ZXRhZGF0YVRhc2s6OmRpZEdldEVudHJ5KEVudHJ5KiBlbnRyeSkKIGJvb2wgR2V0TWV0YWRhdGFU YXNrOjpkaWRHZXRNZXRhZGF0YShNZXRhZGF0YSogbWV0YWRhdGEpCiB7CiAgICAgdXNpbmcgVHlw ZUJ1aWxkZXI6OkZpbGVTeXN0ZW06Ok1ldGFkYXRhOwotICAgIFJlZlB0cjxNZXRhZGF0YT4gcmVz dWx0ID0gTWV0YWRhdGE6OmNyZWF0ZSgpLnNldE1vZGlmaWNhdGlvblRpbWUobWV0YWRhdGEtPm1v ZGlmaWNhdGlvblRpbWUoKSk7Ci0gICAgaWYgKCFtX2lzRGlyZWN0b3J5KQotICAgICAgICByZXN1 bHQtPnNldFNpemUobWV0YWRhdGEtPnNpemUoKSk7CisgICAgUmVmUHRyPE1ldGFkYXRhPiByZXN1 bHQgPSBNZXRhZGF0YTo6Y3JlYXRlKCkuc2V0TW9kaWZpY2F0aW9uVGltZShtZXRhZGF0YS0+bW9k aWZpY2F0aW9uVGltZSgpKS5zZXRTaXplKG1ldGFkYXRhLT5zaXplKCkpOwogICAgIHJlcG9ydFJl c3VsdChzdGF0aWNfY2FzdDxGaWxlRXJyb3I6OkVycm9yQ29kZT4oMCksIHJlc3VsdCk7CiAgICAg cmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0RpcmVjdG9yeUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9EaXJlY3RvcnlDb250ZW50Vmlldy5qcwppbmRleCBmOThmMGFjYmY1MjAwYjRk NjRmY2FjMzE5NmFlODQyZTM4NTE0NmFjLi4yMWNlZDI1MTUzNjRmNDI0N2M4ZTQwZmRmMjY0ZjA4 ZTQ3MDJmMmY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RpcmVjdG9yeUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRGlyZWN0b3J5Q29udGVudFZpZXcuanMKQEAgLTM4LDIxICszOCwyOCBAQCBXZWJJ bnNwZWN0b3IuRGlyZWN0b3J5Q29udGVudFZpZXcgPSBmdW5jdGlvbigpCiAgICAgdmFyIGNvbHVt bnMgPSB7fTsKICAgICBjb2x1bW5zW2luZGV4ZXMuTmFtZV0gPSB7fTsKICAgICBjb2x1bW5zW2lu ZGV4ZXMuTmFtZV0udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5hbWUiKTsKKyAgICBj b2x1bW5zW2luZGV4ZXMuTmFtZV0uc29ydCA9ICJhc2NlbmRpbmciOworICAgIGNvbHVtbnNbaW5k ZXhlcy5OYW1lXS5zb3J0YWJsZSA9IHRydWU7CiAgICAgY29sdW1uc1tpbmRleGVzLk5hbWVdLndp ZHRoID0gIjIwJSI7CiAgICAgY29sdW1uc1tpbmRleGVzLlVSTF0gPSB7fTsKICAgICBjb2x1bW5z W2luZGV4ZXMuVVJMXS50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVVJMIik7CisgICAg Y29sdW1uc1tpbmRleGVzLlVSTF0uc29ydGFibGUgPSB0cnVlOwogICAgIGNvbHVtbnNbaW5kZXhl cy5VUkxdLndpZHRoID0gIjIwJSI7CiAgICAgY29sdW1uc1tpbmRleGVzLlR5cGVdID0ge307CiAg ICAgY29sdW1uc1tpbmRleGVzLlR5cGVdLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJU eXBlIik7CisgICAgY29sdW1uc1tpbmRleGVzLlR5cGVdLnNvcnRhYmxlID0gdHJ1ZTsKICAgICBj b2x1bW5zW2luZGV4ZXMuVHlwZV0ud2lkdGggPSAiMTUlIjsKICAgICBjb2x1bW5zW2luZGV4ZXMu U2l6ZV0gPSB7fTsKICAgICBjb2x1bW5zW2luZGV4ZXMuU2l6ZV0udGl0bGUgPSBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIlNpemUiKTsKKyAgICBjb2x1bW5zW2luZGV4ZXMuU2l6ZV0uc29ydGFibGUg PSB0cnVlOwogICAgIGNvbHVtbnNbaW5kZXhlcy5TaXplXS53aWR0aCA9ICIxMCUiOwogICAgIGNv bHVtbnNbaW5kZXhlcy5Nb2RpZmljYXRpb25UaW1lXSA9IHt9OwogICAgIGNvbHVtbnNbaW5kZXhl cy5Nb2RpZmljYXRpb25UaW1lXS50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTW9kaWZp Y2F0aW9uIFRpbWUiKTsKKyAgICBjb2x1bW5zW2luZGV4ZXMuTW9kaWZpY2F0aW9uVGltZV0uc29y dGFibGUgPSB0cnVlOwogICAgIGNvbHVtbnNbaW5kZXhlcy5Nb2RpZmljYXRpb25UaW1lXS53aWR0 aCA9ICIyNSUiOwogCiAgICAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLmNhbGwodGhpcywgY29sdW1u cyk7CisgICAgdGhpcy5hZGRFdmVudExpc3RlbmVyKCJzb3J0aW5nIGNoYW5nZWQiLCB0aGlzLl9z b3J0LCB0aGlzKTsKIH0KIAogV2ViSW5zcGVjdG9yLkRpcmVjdG9yeUNvbnRlbnRWaWV3LmNvbHVt bkluZGV4ZXMgPSB7CkBAIC03Myw2ICs4MCwxMiBAQCBXZWJJbnNwZWN0b3IuRGlyZWN0b3J5Q29u dGVudFZpZXcucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnJvb3ROb2RlKCkucmVtb3ZlQ2hp bGRyZW4oKTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBlbnRyaWVzLmxlbmd0aDsgKytp KQogICAgICAgICAgICAgdGhpcy5yb290Tm9kZSgpLmFwcGVuZENoaWxkKG5ldyBXZWJJbnNwZWN0 b3IuRGlyZWN0b3J5Q29udGVudFZpZXcuTm9kZShlbnRyaWVzW2ldKSk7CisgICAgfSwKKworICAg IF9zb3J0OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB2YXIgY29sdW1uID0gLyoqIEB0eXBl IHtzdHJpbmd9ICovIHRoaXMuc29ydENvbHVtbklkZW50aWZpZXI7CisgICAgICAgIHRoaXMuc29y dE5vZGVzKFdlYkluc3BlY3Rvci5EaXJlY3RvcnlDb250ZW50Vmlldy5Ob2RlLmNvbXBhcmF0b3Io Y29sdW1uLCB0aGlzLnNvcnRPcmRlciA9PT0gImRlc2NlbmRpbmciKSwgZmFsc2UpOwogICAgIH0K IH0KIApAQCAtMTAwLDYgKzExMyw2NyBAQCBXZWJJbnNwZWN0b3IuRGlyZWN0b3J5Q29udGVudFZp ZXcuTm9kZSA9IGZ1bmN0aW9uKGVudHJ5KQogICAgIHRoaXMuX2VudHJ5LnJlcXVlc3RNZXRhZGF0 YSh0aGlzLl9tZXRhZGF0YVJlY2VpdmVkLmJpbmQodGhpcykpOwogfQogCisvKioKKyAqIEBwYXJh bSB7c3RyaW5nfSBjb2x1bW4KKyAqIEBwYXJhbSB7Ym9vbGVhbn0gcmV2ZXJzZQorICovCitXZWJJ bnNwZWN0b3IuRGlyZWN0b3J5Q29udGVudFZpZXcuTm9kZS5jb21wYXJhdG9yID0gZnVuY3Rpb24o Y29sdW1uLCByZXZlcnNlKQoreworICAgIHZhciByZXZlcnNlRmFjdG9yID0gcmV2ZXJzZSA/IC0x IDogMTsKKyAgICBjb25zdCBpbmRleGVzID0gV2ViSW5zcGVjdG9yLkRpcmVjdG9yeUNvbnRlbnRW aWV3LmNvbHVtbkluZGV4ZXM7CisKKyAgICBzd2l0Y2ggKGNvbHVtbikgeworICAgIGNhc2UgaW5k ZXhlcy5OYW1lOgorICAgIGNhc2UgaW5kZXhlcy5VUkw6CisgICAgICAgIHJldHVybiBmdW5jdGlv bih4LCB5KQorICAgICAgICB7CisgICAgICAgICAgICByZXR1cm4gaXNEaXJlY3RvcnlDb21wYXJl KHgsIHkpIHx8IG5hbWVDb21wYXJlKHgsIHkpOworICAgICAgICB9OworICAgIGNhc2UgaW5kZXhl cy5UeXBlOgorICAgICAgICByZXR1cm4gZnVuY3Rpb24oeCwgeSkKKyAgICAgICAgeworICAgICAg ICAgICAgcmV0dXJuIGlzRGlyZWN0b3J5Q29tcGFyZSh4ICx5KSB8fCB0eXBlQ29tcGFyZSh4LCB5 KSB8fCBuYW1lQ29tcGFyZSh4LCB5KTsKKyAgICAgICAgfTsKKyAgICBjYXNlIGluZGV4ZXMuU2l6 ZToKKyAgICAgICAgcmV0dXJuIGZ1bmN0aW9uKHgsIHkpCisgICAgICAgIHsKKyAgICAgICAgICAg IHJldHVybiBpc0RpcmVjdG9yeUNvbXBhcmUoeCwgeSkgfHwgc2l6ZUNvbXBhcmUoeCwgeSkgfHwg bmFtZUNvbXBhcmUoeCwgeSk7CisgICAgICAgIH07CisgICAgY2FzZSBpbmRleGVzLk1vZGlmaWNh dGlvblRpbWU6CisgICAgICAgIHJldHVybiBmdW5jdGlvbih4LCB5KQorICAgICAgICB7CisgICAg ICAgICAgICByZXR1cm4gaXNEaXJlY3RvcnlDb21wYXJlKHgsIHkpIHx8IG1vZGlmaWNhdGlvblRp bWVDb21wYXJlKHgsIHkpIHx8IG5hbWVDb21wYXJlKHgsIHkpOworICAgICAgICB9OworICAgIH0K KworICAgIGZ1bmN0aW9uIGlzRGlyZWN0b3J5Q29tcGFyZSh4LCB5KQorICAgIHsKKyAgICAgICAg aWYgKHguX2VudHJ5LmlzRGlyZWN0b3J5ICE9IHkuX2VudHJ5LmlzRGlyZWN0b3J5KQorICAgICAg ICAgICAgcmV0dXJuIHkuX2VudHJ5LmlzRGlyZWN0b3J5ID8gMSA6IC0xOworICAgICAgICByZXR1 cm4gMDsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBuYW1lQ29tcGFyZSh4LCB5KQorICAgIHsKKyAg ICAgICAgcmV0dXJuIHJldmVyc2VGYWN0b3IgKiB4Ll9lbnRyeS5uYW1lLmxvY2FsZUNvbXBhcmUo eS5fZW50cnkubmFtZSk7CisgICAgfQorCisgICAgZnVuY3Rpb24gdHlwZUNvbXBhcmUoeCwgeSkK KyAgICB7CisgICAgICAgIHJldHVybiByZXZlcnNlRmFjdG9yICogKHguX2VudHJ5Lm1pbWVUeXBl IHx8ICIiKS5sb2NhbGVDb21wYXJlKHkuX2VudHJ5Lm1pbWVUeXBlIHx8ICIiKTsKKyAgICB9CisK KyAgICBmdW5jdGlvbiBzaXplQ29tcGFyZSh4LCB5KQorICAgIHsKKyAgICAgICAgcmV0dXJuIHJl dmVyc2VGYWN0b3IgKiAoKHguX21ldGFkYXRhID8geC5fbWV0YWRhdGEuc2l6ZSA6IDApIC0gKHku X21ldGFkYXRhID8geS5fbWV0YWRhdGEuc2l6ZSA6IDApKTsKKyAgICB9CisKKyAgICBmdW5jdGlv biBtb2RpZmljYXRpb25UaW1lQ29tcGFyZSh4LCB5KQorICAgIHsKKyAgICAgICAgcmV0dXJuIHJl dmVyc2VGYWN0b3IgKiAoKHguX21ldGFkYXRhID8geC5fbWV0YWRhdGEubW9kaWZpY2F0aW9uVGlt ZSA6IDApIC0gKHkuX21ldGFkYXRhID8geS5fbWV0YWRhdGEubW9kaWZpY2F0aW9uVGltZSA6IDAp KTsKKyAgICB9Cit9CisKIFdlYkluc3BlY3Rvci5EaXJlY3RvcnlDb250ZW50Vmlldy5Ob2RlLnBy b3RvdHlwZSA9IHsKICAgICAvKioKICAgICAgKiBAcGFyYW0ge251bWJlcn0gZXJyb3JDb2RlCkBA IC0xMTMsNyArMTg3LDkgQEAgV2ViSW5zcGVjdG9yLkRpcmVjdG9yeUNvbnRlbnRWaWV3Lk5vZGUu cHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX21ldGFkYXRhID0gbWV0YWRhdGE7CiAgICAg ICAgIHZhciBkYXRhID0gdGhpcy5kYXRhOwotICAgICAgICBpZiAoInNpemUiIGluIG1ldGFkYXRh KQorICAgICAgICBpZiAodGhpcy5fZW50cnkuaXNEaXJlY3RvcnkpCisgICAgICAgICAgICBkYXRh W2luZGV4ZXMuU2l6ZV0gPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIi0iKTsKKyAgICAgICAgZWxz ZQogICAgICAgICAgICAgZGF0YVtpbmRleGVzLlNpemVdID0gTnVtYmVyLmJ5dGVzVG9TdHJpbmco bWV0YWRhdGEuc2l6ZSk7CiAgICAgICAgIGRhdGFbaW5kZXhlcy5Nb2RpZmljYXRpb25UaW1lXSA9 IG5ldyBEYXRlKG1ldGFkYXRhLm1vZGlmaWNhdGlvblRpbWUpLnRvR01UU3RyaW5nKCk7CiAgICAg ICAgIHRoaXMuZGF0YSA9IGRhdGE7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNmFhYTVjMWFhY2NkZGIzMDFlZTZlNDQzZjE2 ZTk1MDI4ZTBlMTNmZS4uZWM3OTkzYzQ1OTkwYjFhZThmMjEzNmNiMzkxZjk0MDE1ZjUyZmYxNSAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDEyLTA3LTAyICBUYWlqdSBUc3Vpa2kgIDx0emlrQGNo cm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBNYWtlIERpcmVjdG9yeUNvbnRl bnRWaWV3IHNvcnRhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05MDM2MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvZmlsZXN5c3RlbS9nZXQtbWV0YWRhdGEtZXhw ZWN0ZWQudHh0OgorCiAyMDEyLTA3LTAyICBFbWlsIEEgRWtsdW5kICA8ZWFlQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBVbnJldmlld2VkIGNocm9taXVtIGV4cGVjdGF0aW9ucyB1cGRhdGUuCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9maWxlc3lzdGVtL2dl dC1tZXRhZGF0YS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rv ci9maWxlc3lzdGVtL2dldC1tZXRhZGF0YS1leHBlY3RlZC50eHQKaW5kZXggNDgxODI4MTQ1NWMz ZTAwZWI4ZTNiZGNmYTRlNTQ2NDZjNTc0N2QwMC4uMmM3N2ZiZmMxNjI3ZmUzZjk2ODkwMjUyYmZj OTZkOWFkNmU5NjYwMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0 b3IvZmlsZXN5c3RlbS9nZXQtbWV0YWRhdGEtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvaW5zcGVjdG9yL2ZpbGVzeXN0ZW0vZ2V0LW1ldGFkYXRhLWV4cGVjdGVkLnR4 dApAQCAtNyw1ICs3LDUgQEAgbWV0YWRhdGE6CiBlcnJvckNvZGU6IDAKIG1ldGFkYXRhOgogICBt b2RpZmljYXRpb25UaW1lOiAoZXhpc3RzKQotICBzaXplOiAobnVsbCkKKyAgc2l6ZTogMAogCg==