From fa4be63e483a0a692f26103b45ad6abe73879f37 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 18 Oct 2020 20:26:09 +0200 Subject: Forgot an import, as well as made BlockDevice() have less verbose output on json.dumps. --- archinstall/lib/disk.py | 10 ++++++++++ examples/guided.py | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py index 7cd8dd0f..b11f2318 100644 --- a/archinstall/lib/disk.py +++ b/archinstall/lib/disk.py @@ -25,6 +25,16 @@ class BlockDevice(): raise KeyError(f'{self} does not contain information: "{key}"') return self.info[key] + def json(self): + """ + json() has precedence over __dump__, so this is a way + to give less/partial information for user readability. + """ + return { + 'path' : self.path, + 'size' : self.info['size'] if 'size' in self.info else '' + } + def __dump__(self): return { 'path' : self.path, diff --git a/examples/guided.py b/examples/guided.py index 00d2565c..958b1e5f 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -1,4 +1,5 @@ -import archinstall, getpass, time, json +import archinstall +import getpass, time, json, sys def perform_installation(device, boot_partition, language, mirrors): """ -- cgit v1.2.3-54-g00ecf