Merge lp:~ken-vandine/ubuntu-system-settings/lp1524424 into lp:ubuntu-system-settings

[Ken VanDine]

Subtract amount used by apps when computing otherSize

Subtract amount used by apps when computing otherSize

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1577
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2551/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5715
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/326
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/735
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4439
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5728
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5728/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25956

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2551/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

thanks, that's similar to the change I tried yesterday and it seems to do the job

review: Approve

[Iain Lane (laney)]

Are you sure that these calculations are right now?

https://bazaar.launchpad.net/~ken-vandine/ubuntu-system-settings/lp1524424/view/head:/plugins/about/Storage.qml#L67

otherSize subtracts things which are already in usedByUbuntu, so you are counting them twice.

(I guess you also double count movies / pictures / audio if they are in home too.)

review: Needs Information

[Sebastien Bacher (seb128)]

@Laney, I don't think you count twice

ubu = ds - fs - hs -cs

so the change does

os = ds - fs - (ds - fs - hs - cs) - cs - ms - ps - as

so the ds/fs/cs compensate each others and are not duplicated

[Iain Lane (laney)]

On Fri, Dec 11, 2015 at 12:42:13PM -0000, Sebastien Bacher wrote:
> @Laney, I don't think you count twice
>
> ubu = ds - fs - hs -cs
>
> so the change does
>
> os = ds - fs - (ds - fs - hs - cs) - cs - ms - ps - as
>
> so the ds/fs/cs compensate each others and are not duplicated

If you want "other" to be "homesize - movies - pictures - audio" then
IMO it would be better to say that in the code and not rely on
cancelling out of things which are counted elsewhere.

I think it probably wants to be "homesize - movies - pictures - audio -
totalClickSize" though, right? Because the clicks are counted as "Used
by apps" in their own right, and currently (with this branch) because
totalClickSize is included in the calculation for both "Used by Ubuntu"
and "Other files" it is classed as consumed space in both "Other files"
and "Used by apps".

BTW don't we need to add the sizes of all of the click packages' data
directories to "Used by apps" too (and subtract it from "Other files)?
Or does 'installed-size' count that? I thought it was just the size of
the data in the click itself.

Cheers,

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Sebastien Bacher (seb128)]

> I think it probably wants to be "homesize - movies - pictures - audio - totalClickSize" though, right?

Unsure, I though that click were stored out of the userdir, so it would be wrong to remove them from that one?

> BTW don't we need to add the sizes of all of the click packages' data
> directories to "Used by apps" too (and subtract it from "Other files)?

no, it's a known bug/not-done-yet to count datas, I'm unsure how to do that with the xdg dirs, count .config|local|cache/<clickid>? what about logs, etc? but that's getting out of topic for this specific change

[Iain Lane (laney)]

On Mon, Dec 14, 2015 at 12:23:13PM -0000, Sebastien Bacher wrote:
> > I think it probably wants to be "homesize - movies - pictures - audio - totalClickSize" though, right?
>
> Unsure, I though that click were stored out of the userdir, so it would be wrong to remove them from that one?

I thought they were in there. But if they are not (/opt/click.ubuntu.com
rings a bell), then this change is probably actually okay as long as you
count user clicks only (otherwise you count system stuff again).

In any event I think it would be better to be more explicit about the
calculations instead of cancelling out parts of "Used by Ubuntu".

> > BTW don't we need to add the sizes of all of the click packages' data
> > directories to "Used by apps" too (and subtract it from "Other files)?
>
> no, it's a known bug/not-done-yet to count datas, I'm unsure how to do that with the xdg dirs, count .config|local|cache/<clickid>? what about logs, etc? but that's getting out of topic for this specific change

How do applications know where to save data to? They write to a well
known directory under XDG_{CACHE,CONFIG,DATA}_HOME, so use that. Count
the logs and other stuff (if that actually does happen) as in use by the
system if it's too hard to do it any other way.

From https://wiki.ubuntu.com/SecurityTeam/Specifications/ApplicationConfinement:

  Applications will always have read access to their install directory
  and have write access to directories they own as determined by the XDG
  base directory specification. Specifically:
  XDG_CACHE_HOME/<APP_PKGNAME>, XDG_RUNTIME_DIR/<APP_PKGNAME>,
  XDG_RUNTIME_DIR/confined/<APP_PKGNAME> (for TMPDIR),
  XDG_DATA_HOME/<APP_PKGNAME> and XDG_CONFIG_HOME/<APP_PKGNAME>. Apps
  can discover these paths using standard APIs and appending the package
  name as defined by the 'name' field of the manifest.

Yes it is out of scope, that's why it was "BTW". I'm just suggesting
things to make the software better.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

=== modified file 'plugins/about/Storage.qml'
--- plugins/about/Storage.qml	2015-08-10 13:31:45 +0000
+++ plugins/about/Storage.qml	2015-12-10 21:05:17 +0000
@@ -71,6 +71,7 @@
     property real otherSize: diskSpace -
                              freediskSpace -
                              usedByUbuntu -
+                             backendInfo.totalClickSize -
                              backendInfo.moviesSize -
                              backendInfo.picturesSize -
                              backendInfo.audioSize