Message-ID: <1485684052.7612.7.camel@hellion.org.uk>
From: Ian Campbell <ijc@hellion.org.uk>
To: SanskritFritz <sanskritfritz@gmail.com>
Date: Sun, 29 Jan 2017 10:00:52 +0000
In-Reply-To: <CAExbbMzqn4jF3ZWpUL_-0GcoTRMmKtsNtUAa83w+oRjuN5VNfw@mail.gmail.com>
References: <CAExbbMyj78W70YReRW28mLU+ckPPH+D=Qu0PyLwd86W4BNjBpQ@mail.gmail.com>
 <1485518787.6091.12.camel@hellion.org.uk>
 <CAExbbMzigpV3FreXakFEALqGC_gqR0+AbvffhgOJ2LRqJyuJZw@mail.gmail.com>
 <CAExbbMyBX+1xfft-b8+ExnzucYzOKkaMaf4YqKwc=cvs5v+R9w@mail.gmail.com>
 <CAExbbMzqn4jF3ZWpUL_-0GcoTRMmKtsNtUAa83w+oRjuN5VNfw@mail.gmail.com>
Content-Type: multipart/mixed; boundary="=-FGeSMXE0e0Ik+Xte4ct+"
Mime-Version: 1.0
Cc: Obnam development <obnam-dev@obnam.org>
Subject: Re: Kdirstat merged to Qdirstat
Precedence: list
Sender: obnam-dev-bounces@obnam.org
Errors-To: obnam-dev-bounces@obnam.org


--=-FGeSMXE0e0Ik+Xte4ct+
Content-Type: text/plain; charset="ISO-8859-1"
Content-Transfer-Encoding: 8bit

On Sat, 2017-01-28 at 01:10 +0100, SanskritFritz wrote:
> On Fri, Jan 27, 2017 at 8:58 PM, SanskritFritz <sanskritfritz@gmail.c
> om> wrote:
> > I hope to fix this some day and present a patch too, but my python-
> fu
> > is quite weak yet.
> 
> OK, I think I found the cause and hereby present patch to you. I have
> tested this with qdirstat and the result is good.
> 
> diff --git a/obnamlib/plugins/show_plugin.py
> b/obnamlib/plugins/show_plugin.py
> index 995a958c..79ccde10 100644
> --- a/obnamlib/plugins/show_plugin.py
> +++ b/obnamlib/plugins/show_plugin.py
> @@ -314,9 +314,6 @@ class ShowPlugin(obnamlib.ObnamPlugin):
>          enc_filename = enc_filename.replace(" ", "%20")
>          enc_filename = enc_filename.replace("\t", "%09")
> 
> -        if filename == "/":
> -            return
> -
>          self.app.output.write(
>              "%s%s\t%d\t%#x\n" %
>              (mode_str, enc_filename, size, mtime_sec))


I monkey patched this into my local install (i.e. I directly edited
/usr/lib/python2.7/dist-packages/obnamlib/plugins/show_plugin.py, which
 is very naughty of me) and for a non-/ root backup the diff in the
kdirstat is:

$ diff -u before after 
--- before	2017-01-29 09:46:23.546378982 +0000
+++ after	2017-01-29 09:45:44.378570390 +0000
@@ -5,6 +5,7 @@
 #
 # Type  path            size    mtime           <optional fields>
 
+D /	4096	0x587c8af7
 D /local	4096	0x50559ae2
 D /local/scratch	4096	0x50559afe
 D /local/scratch/ijc	4096	0x50559b18

Unfortunately loading the "after" version into k4dirstat produces a UI
which shows only / itself and none of its children :-( Loading the
"before" version works. (this backup contains nothing of interest, so
I've attach both files)

I don't have any / rooted backups to try with unfortunately.

Perhaps what is needed instead of the `file == "/"` check is a check
something like "is the filename under the backup root prefix" (i.e.
`not filename.startswith(backuproot)`, but I don't know where to get
the backuproot from).

I think the issues likely correspond to this bit of
https://github.com/shundhammer/qdirstat/blob/master/doc/cache-file-format.txt

    Path or Name
    ------------
            
    Either an absolute path (starting with "/") or only a base name
    relative to the last preceding full path in the file.

and confusion as to what it means to be the basename of "/". Obnam
always outputs absolute paths though so should be ok. Maybe this is
something where shundhammer could advise? Given that obnam follows the
file format spec (I believe) perhaps it is even a *dirstat bug.

Ian.
--=-FGeSMXE0e0Ik+Xte4ct+
Content-Disposition: attachment; filename="after"
Content-Type: text/plain; name="after"; charset="ISO-8859-1"
Content-Transfer-Encoding: base64

W2tkaXJzdGF0IDQuMCBjYWNoZSBmaWxlXQojIEdlbmVyYXRlZCBieSBvYm5hbSBHZW5lcmF0aW9u
IDkyICgyMDE3LTAxLTI5IDA0OjIyOjM0ICswMDAwIC0gMjAxNy0wMS0yOSAwNDoyMjozNSArMDAw
MCkKCiMgRG8gbm90IGVkaXQhCiMKIyBUeXBlICBwYXRoICAgICAgICAgICAgc2l6ZSAgICBtdGlt
ZSAgICAgICAgICAgPG9wdGlvbmFsIGZpZWxkcz4KCkQgLwk0MDk2CTB4NTg3YzhhZjcKRCAvbG9j
YWwJNDA5NgkweDUwNTU5YWUyCkQgL2xvY2FsL3NjcmF0Y2gJNDA5NgkweDUwNTU5YWZlCkQgL2xv
Y2FsL3NjcmF0Y2gvaWpjCTQwOTYJMHg1MDU1OWIxOApEIC9sb2NhbC9zY3JhdGNoL2lqYy9EZXNr
dG9wCTQwOTYJMHg1MDU1OWIxOApEIC9sb2NhbC9zY3JhdGNoL2lqYy9EZXNrdG9wL0Rvd25sb2Fk
cwk0MDk2CTB4NTA1NTliMTgKRCAvbG9jYWwvc2NyYXRjaC9pamMvZGV2ZWxvcG1lbnQJNDA5Ngkw
eDUwNTU5YjM2CkQgL2xvY2FsL3NjcmF0Y2gvaWpjL2RldmVsb3BtZW50L2RlYmlhbgk0MDk2CTB4
NTQ0M2JmYjEKRCAvbG9jYWwvc2NyYXRjaC9pamMvdG1wCTQwOTYJMHg1NDg3ZmIwYwo=


--=-FGeSMXE0e0Ik+Xte4ct+
Content-Disposition: attachment; filename="before"
Content-Type: text/plain; name="before"; charset="ISO-8859-1"
Content-Transfer-Encoding: base64

W2tkaXJzdGF0IDQuMCBjYWNoZSBmaWxlXQojIEdlbmVyYXRlZCBieSBvYm5hbSBHZW5lcmF0aW9u
IDkyICgyMDE3LTAxLTI5IDA0OjIyOjM0ICswMDAwIC0gMjAxNy0wMS0yOSAwNDoyMjozNSArMDAw
MCkKCiMgRG8gbm90IGVkaXQhCiMKIyBUeXBlICBwYXRoICAgICAgICAgICAgc2l6ZSAgICBtdGlt
ZSAgICAgICAgICAgPG9wdGlvbmFsIGZpZWxkcz4KCkQgL2xvY2FsCTQwOTYJMHg1MDU1OWFlMgpE
IC9sb2NhbC9zY3JhdGNoCTQwOTYJMHg1MDU1OWFmZQpEIC9sb2NhbC9zY3JhdGNoL2lqYwk0MDk2
CTB4NTA1NTliMTgKRCAvbG9jYWwvc2NyYXRjaC9pamMvRGVza3RvcAk0MDk2CTB4NTA1NTliMTgK
RCAvbG9jYWwvc2NyYXRjaC9pamMvRGVza3RvcC9Eb3dubG9hZHMJNDA5NgkweDUwNTU5YjE4CkQg
L2xvY2FsL3NjcmF0Y2gvaWpjL2RldmVsb3BtZW50CTQwOTYJMHg1MDU1OWIzNgpEIC9sb2NhbC9z
Y3JhdGNoL2lqYy9kZXZlbG9wbWVudC9kZWJpYW4JNDA5NgkweDU0NDNiZmIxCkQgL2xvY2FsL3Nj
cmF0Y2gvaWpjL3RtcAk0MDk2CTB4NTQ4N2ZiMGMK


--=-FGeSMXE0e0Ik+Xte4ct+
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
obnam-dev mailing list
obnam-dev@obnam.org
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org

--=-FGeSMXE0e0Ik+Xte4ct+--