158090 2008-02-20 12:34:37 +0000 Option to show on-disk folder sizes in the "size" column and include in status bar calculations 2020-05-18 11:59:41 +0000 1 1 2 Applications dolphin general 16.12.2 unspecified Linux RESOLVED FIXED HI wishlist --- 1 chaos.proton dolphin-bugs-null anand.chirag anarchic.teapot bugseforuns codestruct hoperidesalone huon jbn kde-2011.08 knecker moraru69 moritz-kdebugs nate postix psychonaut Ronny.Standtke shelhezan the.real.monkey.d.luffy werrel3 https://commits.kde.org/dolphin/e6ea3ab4c41dcc115143a237aafd3a1152849433 20.08 0 oldest_to_newest 581545 0 chaos.proton 2008-02-20 12:34:37 +0000 Version: (using KDE 4.0.1) Installed from: Unspecified I think it's better to show the size of folder in the "size" column. Maybe 'x Mb, y items' is a proper format. 581728 1 peter.penz19 2008-02-21 10:33:09 +0000 I agree this would be better, but it's technically not possible as this would mean parsing all sub directories which could take several minutes :-( I'm not sure if Nepomuk will contain such kind of meta data too, so maybe this can be implemented in later KDE releases. 581976 2 chaos.proton 2008-02-22 10:35:10 +0000 I'm very happy that you agree with me ;) I think we could give the parsing the lowest priority. At last, you could provide the options whether enable this feature or not. Sorry my English is not very good....:( But users all over the word all appreciate your Great Work. 581980 3 peter.penz19 2008-02-22 10:43:21 +0000 > I think we could give the parsing the lowest priority. Yes, if we forward this task to Nepomuk/Strigi it is anyway done in background. > But users all over the word all appreciate your Great Work. Thanks, thats nice to hear and not very common to read in bug reports ;-) 662181 4 anarchic.teapot 2008-11-09 05:35:14 +0000 hi there i would like to see this feature too. i think "on demand folder size" would be cool. not alway display folder sizes. this would consume too much resources. rather, like a button on the toolbar, that allow to "show selected folder sizes". this way it won't consume any resources and be applied only when user request it. this is useful when cleaning harddrive from old stuffs .. moving things around and etc.. instead of having to right click > select properties just a click on the toolbar would reveal selected folder sizes. tnx 817362 5 kde-2011.08 2009-08-23 14:57:47 +0000 *** Bug 44522 has been marked as a duplicate of this bug. *** 817366 6 kde-2011.08 2009-08-23 14:59:39 +0000 It turns out that Windows reports this information in a mouseover popup. The information comes up instantly, even for very large, very recursive directories. It does not seem to be calculated on the fly (due to it's speed), but it works for even newly-created directory trees. Screenshot of the Windows feature: http://bugsfiles.kde.org/attachment.cgi?id=30732 963000 7 the.real.monkey.d.luffy 2010-05-16 23:18:08 +0000 The button on the toolbar (or an option in the settings) is a good idea, you could choose when you want it on/off. I don't quite understand how the different FS work, but I've noticed it that sometimes this information takes no time (as if its static), other times I have to wait up to 10 seconds. I think it would be a good idea to have a spawned thread doing this task and that information being updated on the fly as it finishes getting the size for each child directory. And if the tab is closed before it finishes the thread should be killed. I don't see the need to use nepomuk on this. Besides, what about directories not being scanned by nepomuk? Let's not fall into the same problem as the image thumbnails issue. And while we're at it, having this information would allow it to give even more detailed info in the bottom bar for free! Currently we have: 2 Folders, 8 Files (4.3 MiB) But we could have: 10 items (3.2 GiB): 2 folders, 8 files (4.3 MiB) 1036860 8 psychonaut 2010-10-25 15:56:08 +0000 I agree that this information would be useful to calculate in the background and then displayed as it becomes available, just as with image thumbnails. However, it should definitely be given lowest CPU and I/O priority (equivalent to using ionice -c3 on the command line). 1166576 9 anand.chirag 2011-09-24 20:39:47 +0000 A bit related to bug 275236. But it still doesn't do a recursive directory count, just the number of items in the directory's root. 1230968 10 moraru69 2012-02-27 17:13:33 +0000 (In reply to comment #6) > It turns out that Windows reports this information in a mouseover popup. The > information comes up instantly, even for very large, very recursive > directories. It does not seem to be calculated on the fly (due to it's speed), > but it works for even newly-created directory trees. > > Screenshot of the Windows feature: > http://bugsfiles.kde.org/attachment.cgi?id=30732 On Windows it's not instant, it depends on how much Files(items amount but without folders) it has. You can test with a folder with a lot of files, it will take a while until it will pop-up the information. And what Windows actually does: it calculates the files size but not recursively. For example, in a folder you have: 2 Folders, each one having 100 GB and 1 .txt file that is for example 3 KB. Windows will show you that the dimension of the folder is 3 KB. And I actually think that this is the correct way to do it considering that you don't want to impact the performance. It shows you the dimension of the files you will see if you enter in there, but there sure can be other folders which you can take a look at the dimension in the same way. It's not perfect but it is okay. 1230969 11 moraru69 2012-02-27 17:15:03 +0000 That's what I remember when I used Windows. 1283591 12 adaptee 2012-08-10 14:33:19 +0000 *** Bug 302998 has been marked as a duplicate of this bug. *** 1290799 13 vanmeeuwen 2012-08-24 16:18:41 +0000 Resetting assignee to default as per bug #305719 1667534 14 nate 2017-03-21 19:50:24 +0000 it's now 2017. I have a machine with an NVMe SSD, and calculating folder size is instantaneous enough that when the properties window has on-disk size available instantly. It doesn't seem like it would be any great burden to simple cache this information and make it available to Dolphin. 1667991 15 cfeck 2017-03-24 00:18:56 +0000 > calculating folder size is instantaneous ... but pollutes kernel caches with data that you may not need. > simple cache this information Cache where? How to decide if the information in the cache is still valid? If it was simple, the Linux kernel would provide this information. 1667992 16 nate 2017-03-24 00:27:05 +0000 Right, I understand the trade-offs involved. Personally I'm willing to accept those trade-offs, but obviously not everyone would. In the macOS Finder, turning on this feature is optional, probably for the same reasons. It could be similarly optional here, too. Turn it on if you like it, don't if you don't. 1684018 17 cfeck 2017-06-22 10:06:23 +0000 *** Bug 381508 has been marked as a duplicate of this bug. *** 1706330 18 108377 nate 2017-10-16 13:24:31 +0000 Created attachment 108377 Dolphin patch to add the setting I've tried to patch this in, and it's not hard; mostly a matter of having KFileItems representing folders calculate sizes uwing KIO::DirectorySizeJob. On a modern SSD, it's even fast enough to only be slightly annoying when doing it on the same thread. The following issues/challenges arise: - Need to do it on a background thread to avoid blocking the main UI - With the information panel open, moving the mouse spawns zillions of jobs since it updates according to cursor hover position, not selection - Should probably cache results, but how without keeping around old results that *should* be recalculated? - Need to figure out a way to make this optional without violating boundaries (e.g. should baloo depend on being able to parse a setting from Dolphin?) I'm attaching the rough patches in case someone with much more skill here wants to run with them and refine the feature to actually be usable. 1706331 19 108378 nate 2017-10-16 13:25:04 +0000 Created attachment 108378 Crude baloo-widgets patch to be able to calculate directory sizes 1735828 20 huon 2018-03-05 03:01:55 +0000 For comparison Directory Opus does it like this: 1. Calculation on hovering, cancelled when mouse leaves. 2. Toolbar button calculates size of all selected folders (in foreground, progress bar shown if taking a while). 3. Config option to enable automatic calculation. I think 2 & 3 together is a good solution. This means that it doesn't slow things down by default, but users with fast storage can turn the option on. I don't think there's a need for caching. Leaving it on manual mode, users wouldn't expect it to re-calculate automatically (the wording of the action should portray it so). And if on automatic mode, users could press F5 to re-calculate (I think F5=Refresh is something we can assume users know). 1926975 21 meven29 2020-05-04 05:27:05 +0000 Git commit e6ea3ab4c41dcc115143a237aafd3a1152849433 by Méven Car. Committed on 04/05/2020 at 05:26. Pushed by meven into branch 'master'. [Details mode] Allow to fill the column size of directories with actual size Summary: Allow to compute the recursive size of directories to fill the details view size column. A setting allow to set a limit to the recursive level, allowing the user to have some power over the setting. When sorting by size and the feature is on, we get progressive ordering as the directory size are gathered. KDirectoryContentsCounter uses a cache internally to keep results so that it can display directory size faster, but counts the dir size of directories each time it is asked to count the size a directory nevertheless and when the size has changed, it is updated. KDirectoryContentsCounter uses one worker per instance only, meaning one process per view makes the disk spin. FIXED-IN: 20.08 Related: bug 190580 Test Plan: With some recursion allowed: {F8267580} Without any recursion allowed (default): {F8267581} Reviewers: elvisangelaccio, ngraham, #dolphin Reviewed By: elvisangelaccio, ngraham, #dolphin Subscribers: feverfew, anthonyfieroni, iasensio, kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D25335 M +8 -0 src/dolphinviewcontainer.cpp M +16 -4 src/kitemviews/kfileitemlistwidget.cpp M +15 -3 src/kitemviews/kfileitemmodel.cpp M +9 -11 src/kitemviews/kfileitemmodelrolesupdater.cpp M +1 -1 src/kitemviews/kfileitemmodelrolesupdater.h M +39 -32 src/kitemviews/private/kdirectorycontentscounter.cpp M +8 -13 src/kitemviews/private/kdirectorycontentscounter.h M +68 -30 src/kitemviews/private/kdirectorycontentscounterworker.cpp M +11 -3 src/kitemviews/private/kdirectorycontentscounterworker.h M +8 -0 src/settings/dolphin_detailsmodesettings.kcfg M +45 -5 src/settings/viewmodes/viewsettingstab.cpp M +5 -0 src/settings/viewmodes/viewsettingstab.h https://commits.kde.org/dolphin/e6ea3ab4c41dcc115143a237aafd3a1152849433 1930823 22 cfeck 2020-05-18 11:59:41 +0000 *** Bug 421729 has been marked as a duplicate of this bug. *** 108377 2017-10-16 13:24:31 +0000 2017-10-16 13:24:31 +0000 Dolphin patch to add the setting dolphin new setting.patch text/plain 4948 nate ZGlmZiAtLWdpdCBhL3NyYy9zZXR0aW5ncy9kb2xwaGluX2dlbmVyYWxzZXR0aW5ncy5rY2ZnIGIv c3JjL3NldHRpbmdzL2RvbHBoaW5fZ2VuZXJhbHNldHRpbmdzLmtjZmcKaW5kZXggNTg3OGFiYy4u NTYzMmJlOSAxMDA2NDQKLS0tIGEvc3JjL3NldHRpbmdzL2RvbHBoaW5fZ2VuZXJhbHNldHRpbmdz LmtjZmcKKysrIGIvc3JjL3NldHRpbmdzL2RvbHBoaW5fZ2VuZXJhbHNldHRpbmdzLmtjZmcKQEAg LTUwLDYgKzUwLDEwIEBACiAgICAgICAgICAgICA8bGFiZWw+U2hvdWxkIHRoZSB2aWV3IHByb3Bl cnRpZXMgYmUgdXNlZCBmb3IgYWxsIGZvbGRlcnM8L2xhYmVsPgogICAgICAgICAgICAgPGRlZmF1 bHQ+ZmFsc2U8L2RlZmF1bHQ+CiAgICAgICAgIDwvZW50cnk+CisgICAgICAgIDxlbnRyeSBuYW1l PSJDYWxjdWxhdGVGb2xkZXJTaXplcyIgdHlwZT0iQm9vbCI+CisgICAgICAgICAgICA8bGFiZWw+ U2hvdWxkIGZvbGRlciBzaXplcyBzaG93IHNwYWNlIHVzZWQgb24gZGlzazwvbGFiZWw+CisgICAg ICAgICAgICA8ZGVmYXVsdD5mYWxzZTwvZGVmYXVsdD4KKyAgICAgICAgPC9lbnRyeT4KICAgICAg ICAgPGVudHJ5IG5hbWU9IkJyb3dzZVRocm91Z2hBcmNoaXZlcyIgdHlwZT0iQm9vbCI+CiAgICAg ICAgICAgICA8bGFiZWw+QnJvd3NlIHRocm91Z2ggYXJjaGl2ZXM8L2xhYmVsPgogICAgICAgICAg ICAgPGRlZmF1bHQ+ZmFsc2U8L2RlZmF1bHQ+CmRpZmYgLS1naXQgYS9zcmMvc2V0dGluZ3MvZ2Vu ZXJhbC9iZWhhdmlvcnNldHRpbmdzcGFnZS5jcHAgYi9zcmMvc2V0dGluZ3MvZ2VuZXJhbC9iZWhh dmlvcnNldHRpbmdzcGFnZS5jcHAKaW5kZXggNmQxZThiYi4uYWUwMGM3YyAxMDA2NDQKLS0tIGEv c3JjL3NldHRpbmdzL2dlbmVyYWwvYmVoYXZpb3JzZXR0aW5nc3BhZ2UuY3BwCisrKyBiL3NyYy9z ZXR0aW5ncy9nZW5lcmFsL2JlaGF2aW9yc2V0dGluZ3NwYWdlLmNwcApAQCAtNDEsNiArNDEsOCBA QCBCZWhhdmlvclNldHRpbmdzUGFnZTo6QmVoYXZpb3JTZXR0aW5nc1BhZ2UoY29uc3QgUVVybCYg dXJsLCBRV2lkZ2V0KiBwYXJlbnQpIDoKICAgICBtX25hdHVyYWxTb3J0aW5nKDApLAogICAgIG1f Y2FzZVNlbnNpdGl2ZVNvcnRpbmcoMCksCiAgICAgbV9jYXNlSW5zZW5zaXRpdmVTb3J0aW5nKDAp LAorICAgIG1fZm9sZGVyU2l6ZUl0ZW1zKDApLAorICAgIG1fZm9sZGVyU2l6ZVNwYWNlKDApLAog ICAgIG1fcmVuYW1lSW5saW5lKDApLAogICAgIG1fdXNlVGFiRm9yU3BsaXRWaWV3U3dpdGNoKDAp CiB7CkBAIC03MCw2ICs3MiwxNyBAQCBCZWhhdmlvclNldHRpbmdzUGFnZTo6QmVoYXZpb3JTZXR0 aW5nc1BhZ2UoY29uc3QgUVVybCYgdXJsLCBRV2lkZ2V0KiBwYXJlbnQpIDoKICAgICBzb3J0aW5n UHJvcHNMYXlvdXQtPmFkZFdpZGdldChtX2Nhc2VJbnNlbnNpdGl2ZVNvcnRpbmcpOwogICAgIHNv cnRpbmdQcm9wc0xheW91dC0+YWRkV2lkZ2V0KG1fY2FzZVNlbnNpdGl2ZVNvcnRpbmcpOwogCisg ICAgLy8gRm9sZGVyIHNpemUgcHJvcGVydGllcworICAgIFFHcm91cEJveCogZm9sZGVyU2l6ZVBy b3BzQm94ID0gbmV3IFFHcm91cEJveChpMThuYygiQHRpdGxlOmdyb3VwIiwgIkZvbGRlciBzaXpl IGRpc3BsYXkiKSwgdGhpcyk7CisgICAgZm9sZGVyU2l6ZVByb3BzQm94LT5zZXRTaXplUG9saWN5 KFFTaXplUG9saWN5OjpQcmVmZXJyZWQsIFFTaXplUG9saWN5OjpNYXhpbXVtKTsKKworICAgIG1f Zm9sZGVyU2l6ZUl0ZW1zID0gbmV3IFFSYWRpb0J1dHRvbihpMThuYygiQG9wdGlvbjpyYWRpbyIs ICJOdW1iZXIgb2YgaXRlbXMiKSwgZm9sZGVyU2l6ZVByb3BzQm94KTsKKyAgICBtX2ZvbGRlclNp emVTcGFjZSA9IG5ldyBRUmFkaW9CdXR0b24oaTE4bmMoIkBvcHRpb246cmFkaW8iLCAiU3BhY2Ug dXNlZCBvbiBkaXNrIiksIGZvbGRlclNpemVQcm9wc0JveCk7CisKKyAgICBRVkJveExheW91dCog Zm9sZGVyU2l6ZVByb3BzTGF5b3V0ID0gbmV3IFFWQm94TGF5b3V0KGZvbGRlclNpemVQcm9wc0Jv eCk7CisgICAgZm9sZGVyU2l6ZVByb3BzTGF5b3V0LT5hZGRXaWRnZXQobV9mb2xkZXJTaXplSXRl bXMpOworICAgIGZvbGRlclNpemVQcm9wc0xheW91dC0+YWRkV2lkZ2V0KG1fZm9sZGVyU2l6ZVNw YWNlKTsKKwogICAgIC8vICdTaG93IHRvb2x0aXBzJwogICAgIG1fc2hvd1Rvb2xUaXBzID0gbmV3 IFFDaGVja0JveChpMThuYygiQG9wdGlvbjpjaGVjayIsICJTaG93IHRvb2x0aXBzIiksIHRoaXMp OwogCkBAIC04NCw2ICs5Nyw3IEBAIEJlaGF2aW9yU2V0dGluZ3NQYWdlOjpCZWhhdmlvclNldHRp bmdzUGFnZShjb25zdCBRVXJsJiB1cmwsIFFXaWRnZXQqIHBhcmVudCkgOgogCiAgICAgdG9wTGF5 b3V0LT5hZGRXaWRnZXQodmlld1Byb3BzQm94KTsKICAgICB0b3BMYXlvdXQtPmFkZFdpZGdldChz b3J0aW5nUHJvcHNCb3gpOworICAgIHRvcExheW91dC0+YWRkV2lkZ2V0KGZvbGRlclNpemVQcm9w c0JveCk7CiAgICAgdG9wTGF5b3V0LT5hZGRXaWRnZXQobV9zaG93VG9vbFRpcHMpOwogICAgIHRv cExheW91dC0+YWRkV2lkZ2V0KG1fc2hvd1NlbGVjdGlvblRvZ2dsZSk7CiAgICAgdG9wTGF5b3V0 LT5hZGRXaWRnZXQobV9yZW5hbWVJbmxpbmUpOwpAQCAtOTksNiArMTEzLDggQEAgQmVoYXZpb3JT ZXR0aW5nc1BhZ2U6OkJlaGF2aW9yU2V0dGluZ3NQYWdlKGNvbnN0IFFVcmwmIHVybCwgUVdpZGdl dCogcGFyZW50KSA6CiAgICAgY29ubmVjdChtX25hdHVyYWxTb3J0aW5nLCAmUVJhZGlvQnV0dG9u Ojp0b2dnbGVkLCB0aGlzLCAmQmVoYXZpb3JTZXR0aW5nc1BhZ2U6OmNoYW5nZWQpOwogICAgIGNv bm5lY3QobV9jYXNlSW5zZW5zaXRpdmVTb3J0aW5nLCAmUVJhZGlvQnV0dG9uOjp0b2dnbGVkLCB0 aGlzLCAmQmVoYXZpb3JTZXR0aW5nc1BhZ2U6OmNoYW5nZWQpOwogICAgIGNvbm5lY3QobV9jYXNl U2Vuc2l0aXZlU29ydGluZywgJlFSYWRpb0J1dHRvbjo6dG9nZ2xlZCwgdGhpcywgJkJlaGF2aW9y U2V0dGluZ3NQYWdlOjpjaGFuZ2VkKTsKKyAgICBjb25uZWN0KG1fZm9sZGVyU2l6ZUl0ZW1zLCAm UVJhZGlvQnV0dG9uOjp0b2dnbGVkLCB0aGlzLCAmQmVoYXZpb3JTZXR0aW5nc1BhZ2U6OmNoYW5n ZWQpOworICAgIGNvbm5lY3QobV9mb2xkZXJTaXplU3BhY2UsICZRUmFkaW9CdXR0b246OnRvZ2ds ZWQsIHRoaXMsICZCZWhhdmlvclNldHRpbmdzUGFnZTo6Y2hhbmdlZCk7CiAgICAgY29ubmVjdCht X3JlbmFtZUlubGluZSwgJlFDaGVja0JveDo6dG9nZ2xlZCwgdGhpcywgJkJlaGF2aW9yU2V0dGlu Z3NQYWdlOjpjaGFuZ2VkKTsKICAgICBjb25uZWN0KG1fdXNlVGFiRm9yU3BsaXRWaWV3U3dpdGNo LCAmUUNoZWNrQm94Ojp0b2dnbGVkLCB0aGlzLCAmQmVoYXZpb3JTZXR0aW5nc1BhZ2U6OmNoYW5n ZWQpOwogfQpAQCAtMTE3LDYgKzEzMyw3IEBAIHZvaWQgQmVoYXZpb3JTZXR0aW5nc1BhZ2U6OmFw cGx5U2V0dGluZ3MoKQogICAgIHNldHRpbmdzLT5zZXRTaG93VG9vbFRpcHMobV9zaG93VG9vbFRp cHMtPmlzQ2hlY2tlZCgpKTsKICAgICBzZXR0aW5ncy0+c2V0U2hvd1NlbGVjdGlvblRvZ2dsZSht X3Nob3dTZWxlY3Rpb25Ub2dnbGUtPmlzQ2hlY2tlZCgpKTsKICAgICBzZXRTb3J0aW5nQ2hvaWNl VmFsdWUoc2V0dGluZ3MpOworICAgIHNldHRpbmdzLT5zZXRDYWxjdWxhdGVGb2xkZXJTaXplcyht X2ZvbGRlclNpemVTcGFjZS0+aXNDaGVja2VkKCkpOwogICAgIHNldHRpbmdzLT5zZXRSZW5hbWVJ bmxpbmUobV9yZW5hbWVJbmxpbmUtPmlzQ2hlY2tlZCgpKTsKICAgICBzZXR0aW5ncy0+c2V0VXNl VGFiRm9yU3dpdGNoaW5nU3BsaXRWaWV3KG1fdXNlVGFiRm9yU3BsaXRWaWV3U3dpdGNoLT5pc0No ZWNrZWQoKSk7CiAgICAgc2V0dGluZ3MtPnNhdmUoKTsKQEAgLTE0NSw2ICsxNjIsMTAgQEAgdm9p ZCBCZWhhdmlvclNldHRpbmdzUGFnZTo6bG9hZFNldHRpbmdzKCkKICAgICBtX2xvY2FsVmlld1By b3BzLT5zZXRDaGVja2VkKCF1c2VHbG9iYWxWaWV3UHJvcHMpOwogICAgIG1fZ2xvYmFsVmlld1By b3BzLT5zZXRDaGVja2VkKHVzZUdsb2JhbFZpZXdQcm9wcyk7CiAKKyAgICBjb25zdCBib29sIGNh bGN1bGF0ZUZvbGRlclNpemVzID0gR2VuZXJhbFNldHRpbmdzOjpjYWxjdWxhdGVGb2xkZXJTaXpl cygpOworICAgIG1fZm9sZGVyU2l6ZUl0ZW1zLT5zZXRDaGVja2VkKCFjYWxjdWxhdGVGb2xkZXJT aXplcyk7CisgICAgbV9mb2xkZXJTaXplU3BhY2UtPnNldENoZWNrZWQoY2FsY3VsYXRlRm9sZGVy U2l6ZXMpOworCiAgICAgbV9zaG93VG9vbFRpcHMtPnNldENoZWNrZWQoR2VuZXJhbFNldHRpbmdz OjpzaG93VG9vbFRpcHMoKSk7CiAgICAgbV9zaG93U2VsZWN0aW9uVG9nZ2xlLT5zZXRDaGVja2Vk KEdlbmVyYWxTZXR0aW5nczo6c2hvd1NlbGVjdGlvblRvZ2dsZSgpKTsKICAgICBtX3JlbmFtZUlu bGluZS0+c2V0Q2hlY2tlZChHZW5lcmFsU2V0dGluZ3M6OnJlbmFtZUlubGluZSgpKTsKZGlmZiAt LWdpdCBhL3NyYy9zZXR0aW5ncy9nZW5lcmFsL2JlaGF2aW9yc2V0dGluZ3NwYWdlLmggYi9zcmMv c2V0dGluZ3MvZ2VuZXJhbC9iZWhhdmlvcnNldHRpbmdzcGFnZS5oCmluZGV4IDk2ZWFmM2QuLjcy NDMwMmYgMTAwNjQ0Ci0tLSBhL3NyYy9zZXR0aW5ncy9nZW5lcmFsL2JlaGF2aW9yc2V0dGluZ3Nw YWdlLmgKKysrIGIvc3JjL3NldHRpbmdzL2dlbmVyYWwvYmVoYXZpb3JzZXR0aW5nc3BhZ2UuaApA QCAtNjQsNiArNjQsOSBAQCBwcml2YXRlOgogICAgIFFSYWRpb0J1dHRvbiogbV9jYXNlU2Vuc2l0 aXZlU29ydGluZzsKICAgICBRUmFkaW9CdXR0b24qIG1fY2FzZUluc2Vuc2l0aXZlU29ydGluZzsK IAorICAgIFFSYWRpb0J1dHRvbiogbV9mb2xkZXJTaXplSXRlbXM7CisgICAgUVJhZGlvQnV0dG9u KiBtX2ZvbGRlclNpemVTcGFjZTsKKwogICAgIFFDaGVja0JveCogbV9yZW5hbWVJbmxpbmU7CiAg ICAgUUNoZWNrQm94KiBtX3VzZVRhYkZvclNwbGl0Vmlld1N3aXRjaDsKIH07Cg== 108378 2017-10-16 13:25:04 +0000 2017-10-16 13:25:04 +0000 Crude baloo-widgets patch to be able to calculate directory sizes baloo-widgets patch.patch text/plain 4663 nate ZGlmZiAtLWdpdCBhL3NyYy9maWxlbWV0YWRhdGFwcm92aWRlci5jcHAgYi9zcmMvZmlsZW1ldGFk YXRhcHJvdmlkZXIuY3BwCmluZGV4IGQ3MGVlOTcuLmFlMWExODcgMTAwNjQ0Ci0tLSBhL3NyYy9m aWxlbWV0YWRhdGFwcm92aWRlci5jcHAKKysrIGIvc3JjL2ZpbGVtZXRhZGF0YXByb3ZpZGVyLmNw cApAQCAtMjEsNyArMjEsMTAgQEAKICNpbmNsdWRlICJmaWxlbWV0YWRhdGFwcm92aWRlci5oIgog I2luY2x1ZGUgImluZGV4ZWRkYXRhcmV0cmlldmVyLmgiCiAjaW5jbHVkZSAiZmlsZWZldGNoam9i LmgiCisjaW5jbHVkZSAia2lvL2RpcmVjdG9yeXNpemVqb2IuaCIKIAorI2luY2x1ZGUgPEtDb25m aWc+CisjaW5jbHVkZSA8S0NvbmZpZ0dyb3VwPgogI2luY2x1ZGUgPEtGaWxlTWV0YURhdGEvUHJv cGVydHlJbmZvPgogI2luY2x1ZGUgPEtMb2NhbGl6ZWRTdHJpbmc+CiAjaW5jbHVkZSA8S0Zvcm1h dD4KQEAgLTE5MSwyMSArMTk0LDQxIEBAIHZvaWQgRmlsZU1ldGFEYXRhUHJvdmlkZXI6OnNsb3RM b2FkaW5nRmluaXNoZWQoS0pvYiogam9iKQogdm9pZCBGaWxlTWV0YURhdGFQcm92aWRlcjo6aW5z ZXJ0QmFzaWNEYXRhKCkKIHsKICAgICBLRm9ybWF0IGZvcm1hdDsKKworICAgIC8vIElmIENhbGN1 bGF0ZURpcmVjdG9yeVNpemVzIChmcm9tIERvbHBoaW4ncyBzZXR0aW5ncykgaXMgdHJ1ZSwgY2Fs Y3VsYXRlIG9uLWRpc2sgc2l6ZXMgZm9yIGZvbGRlcnMgaW5zdGVhZCBvZiAibiBpdGVtcyIKKyAg ICBib29sIGNhbGN1bGF0ZUZvbGRlclNpemVzID0gZmFsc2U7CisgICAgS0NvbmZpZyBjb25maWco ImRvbHBoaW5yYyIsIEtDb25maWc6Ok5vR2xvYmFscyk7CisgICAgS0NvbmZpZ0dyb3VwIHNldHRp bmdzID0gY29uZmlnLmdyb3VwKCJHZW5lcmFsIik7CisgICAgY2FsY3VsYXRlRm9sZGVyU2l6ZXMg PSBzZXR0aW5ncy5yZWFkRW50cnkoUVN0cmluZygiQ2FsY3VsYXRlRm9sZGVyU2l6ZXMiKSwgZmFs c2UpOworCiAgICAgaWYgKG1fZmlsZUl0ZW1zLmNvdW50KCkgPT0gMSkgewogICAgICAgICAvLyBU T0RPOiBIYW5kbGUgY2FzZSBpZiByZW1vdGUgVVJMcyBhcmUgdXNlZCBwcm9wZXJseS4gaXNEaXIo KSBkb2VzCiAgICAgICAgIC8vIG5vdCB3b3JrLCB0aGUgbW9kaWZpY2F0aW9uIGRhdGUgbmVlZHMg YWxzbyB0byBiZSBhZGp1c3RlZC4uLgogICAgICAgICBjb25zdCBLRmlsZUl0ZW0mIGl0ZW0gPSBt X2ZpbGVJdGVtcy5maXJzdCgpOwogCi0gICAgICAgIGlmIChpdGVtLmlzRGlyKCkpIHsKLSAgICAg ICAgICAgIGNvbnN0IGludCBjb3VudCA9IHN1YkRpcmVjdG9yaWVzQ291bnQoaXRlbS51cmwoKS5w YXRoKCkpOwotICAgICAgICAgICAgaWYgKGNvdW50ID09IC0xKSB7Ci0gICAgICAgICAgICAgICAg bV9kYXRhLmluc2VydCgia2ZpbGVpdGVtI3NpemUiLCBpMThuYygidW5rbm93biBmaWxlIHNpemUi LCAiVW5rbm93biIpKTsKKyAgICAgICAgLy8gQWx3YXlzIHJlY29yZCBvbi1kaXNrIHNpemUgZm9y IGZpbGVzCisgICAgICAgIGlmICghaXRlbS5pc0RpcigpKSB7CisgICAgICAgICAgICBtX2RhdGEu aW5zZXJ0KCJrZmlsZWl0ZW0jc2l6ZSIsIGZvcm1hdC5mb3JtYXRCeXRlU2l6ZShpdGVtLnNpemUo KSkpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgLy8gRm9yIGRpcmVjdG9yaWVzLCBv bmx5IHJlY29yZCBvbi1kaXNrIHNpemUgaWYgdXNpbmcgQ2FsY3VsYXRlRm9sZGVyU2l6ZXMgbW9k ZQorICAgICAgICAgICAgLy8gVE9ETzogbWFrZSBpdCBhIGJhY2tncm91bmQgb3BlcmF0aW9uIHNv IHdlIGRvbid0IGV2ZXIgYmxvY2sgdGhlIFVJCisgICAgICAgICAgICAvLyBUT0RPOiBjYWNoZSBy ZXN1bHRzIGFuZCBzdG9yZSB3aXRoIGhhc2ggZ2VuZXJhdGVkIGZyb20gZm9sZGVyIGNvbnRlbnRz OyBvbmx5IHJlLWNhbGN1bGF0ZSB3aGVuIHN0b3JlZCBoYXNoIGRvZXNuJ3QgbWF0Y2ggbmV3bHkt Z2VuZXJhdGVkIG9uZSAod2hpY2ggd291bGQgc2lnbmlmeSB0aGF0IHRoZSBjb250ZW50cyBjaGFu Z2VkKS4gV2FpdCwgY2FuIHRoaXMgd29yaz8gV2UgY2FuJ3QgaGFzaCBjb250ZW50cywgc28gdGhp cyB3b3VsZCBtaXNzIGNhc2VzIHdoZXJlIGZpbGVzIGdvdCBiaWdnZXIgb3MgYW1sbGVyIGJ1dCBk aWRuJ3QgY2hhbmdlIHBhdGgKKyAgICAgICAgICAgIGlmIChjYWxjdWxhdGVGb2xkZXJTaXplcykg eworICAgICAgICAgICAgICAgIEtJTzo6RGlyZWN0b3J5U2l6ZUpvYiAqam9iID0gS0lPOjpkaXJl Y3RvcnlTaXplKGl0ZW0udXJsKCkpOworICAgICAgICAgICAgICAgIGJvb2wgb2sgPSBqb2ItPmV4 ZWMoKTsKKyAgICAgICAgICAgICAgICBpZiAob2spIHsKKyAgICAgICAgICAgICAgICAgICAgbV9k YXRhLmluc2VydCgia2ZpbGVpdGVtI3NpemUiLCBmb3JtYXQuZm9ybWF0Qnl0ZVNpemUoam9iLT50 b3RhbFNpemUoKSkpOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0gZWxzZSB7Ci0g ICAgICAgICAgICAgICAgY29uc3QgUVN0cmluZyBpdGVtQ291bnRTdHJpbmcgPSBpMThuY3AoIkBp dGVtOmludGFibGUiLCAiJTEgaXRlbSIsICIlMSBpdGVtcyIsIGNvdW50KTsKLSAgICAgICAgICAg ICAgICBtX2RhdGEuaW5zZXJ0KCJrZmlsZWl0ZW0jc2l6ZSIsIGl0ZW1Db3VudFN0cmluZyk7Cisg ICAgICAgICAgICAgICAgLy8gUmVjb3JkIG51bWJlciBvZiBpdGVtcywgbm90IG9uLWRpc2sgc2l6 ZQorICAgICAgICAgICAgICAgIGNvbnN0IGludCBjb3VudCA9IHN1YkRpcmVjdG9yaWVzQ291bnQo aXRlbS51cmwoKS5wYXRoKCkpOworICAgICAgICAgICAgICAgIGlmIChjb3VudCA9PSAtMSkgewor ICAgICAgICAgICAgICAgICAgICBtX2RhdGEuaW5zZXJ0KCJrZmlsZWl0ZW0jc2l6ZSIsIGkxOG5j KCJ1bmtub3duIGZpbGUgc2l6ZSIsICJVbmtub3duIikpOworICAgICAgICAgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICAgICAgICAgIGNvbnN0IFFTdHJpbmcgaXRlbUNvdW50U3RyaW5nID0g aTE4bmNwKCJAaXRlbTppbnRhYmxlIiwgIiUxIGl0ZW0iLCAiJTEgaXRlbXMiLCBjb3VudCk7Cisg ICAgICAgICAgICAgICAgICAgIG1fZGF0YS5pbnNlcnQoImtmaWxlaXRlbSNzaXplIiwgaXRlbUNv dW50U3RyaW5nKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9Ci0gICAgICAgIH0g ZWxzZSB7Ci0gICAgICAgICAgICBtX2RhdGEuaW5zZXJ0KCJrZmlsZWl0ZW0jc2l6ZSIsIGZvcm1h dC5mb3JtYXRCeXRlU2l6ZShpdGVtLnNpemUoKSkpOwogICAgICAgICB9CiAKICAgICAgICAgbV9k YXRhLmluc2VydCgia2ZpbGVpdGVtI3R5cGUiLCBpdGVtLm1pbWVDb21tZW50KCkpOwpAQCAtMjE0 LDYgKzIzNyw3IEBAIHZvaWQgRmlsZU1ldGFEYXRhUHJvdmlkZXI6Omluc2VydEJhc2ljRGF0YSgp CiAgICAgICAgIG1fZGF0YS5pbnNlcnQoImtmaWxlaXRlbSNwZXJtaXNzaW9ucyIsIGl0ZW0ucGVy bWlzc2lvbnNTdHJpbmcoKSk7CiAgICAgfQogICAgIGVsc2UgaWYgKG1fZmlsZUl0ZW1zLmNvdW50 KCkgPiAxKSB7CisgICAgICAgIHF1aW50NjQgdG90YWxTaXplID0gMDsKICAgICAgICAgLy8gSWYg YWxsIGRpcmVjdG9yaWVzCiAgICAgICAgIGJvb2wgYWxsRGlyZWN0b3JpZXMgPSB0cnVlOwogICAg ICAgICBmb3IgKGNvbnN0IEtGaWxlSXRlbSYgaXRlbSA6IG1fZmlsZUl0ZW1zKSB7CkBAIC0yMjMs NyArMjQ3LDE1IEBAIHZvaWQgRmlsZU1ldGFEYXRhUHJvdmlkZXI6Omluc2VydEJhc2ljRGF0YSgp CiAgICAgICAgIGlmIChhbGxEaXJlY3RvcmllcykgewogICAgICAgICAgICAgaW50IGNvdW50ID0g MDsKICAgICAgICAgICAgIGZvciAoY29uc3QgS0ZpbGVJdGVtJiBpdGVtIDogbV9maWxlSXRlbXMp IHsKLSAgICAgICAgICAgICAgICBjb3VudCArPSBzdWJEaXJlY3Rvcmllc0NvdW50KGl0ZW0udXJs KCkucGF0aCgpKTsKKyAgICAgICAgICAgICAgICBpZiAoY2FsY3VsYXRlRm9sZGVyU2l6ZXMpIHsK KyAgICAgICAgICAgICAgICAgICAgS0lPOjpEaXJlY3RvcnlTaXplSm9iICpqb2IgPSBLSU86OmRp cmVjdG9yeVNpemUoaXRlbS51cmwoKSk7CisgICAgICAgICAgICAgICAgICAgIGJvb2wgb2sgPSBq b2ItPmV4ZWMoKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKG9rKSB7CisgICAgICAgICAgICAg ICAgICAgICAgICB0b3RhbFNpemUgKz0gam9iLT50b3RhbFNpemUoKTsKKyAgICAgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgICAgIGNv dW50ICs9IHN1YkRpcmVjdG9yaWVzQ291bnQoaXRlbS51cmwoKS5wYXRoKCkpOworICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKGNvdW50KSB7CkBAIC0y MzMsNyArMjY1LDYgQEAgdm9pZCBGaWxlTWV0YURhdGFQcm92aWRlcjo6aW5zZXJ0QmFzaWNEYXRh KCkKICAgICAgICAgfQogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIC8vIENhbGN1bGF0ZSB0 aGUgc2l6ZSBvZiBhbGwgaXRlbXMKLSAgICAgICAgICAgIHF1aW50NjQgdG90YWxTaXplID0gMDsK ICAgICAgICAgICAgIGZvciAoY29uc3QgS0ZpbGVJdGVtJiBpdGVtIDogbV9maWxlSXRlbXMpIHsK ICAgICAgICAgICAgICAgICBpZiAoIWl0ZW0uaXNEaXIoKSAmJiAhaXRlbS5pc0xpbmsoKSkgewog ICAgICAgICAgICAgICAgICAgICB0b3RhbFNpemUgKz0gaXRlbS5zaXplKCk7Cg==