Merge pull request #3490 from ZyX-I/fix-3472

Fix local marks saving/restoring with ShaDa

1 files changed, 23 insertions, 0 deletions

diff --git a/scripts/shadacat.py b/scripts/shadacat.py
index 4ff493bfbc..2f2cf19f9d 100755
--- a/scripts/shadacat.py
+++ b/scripts/shadacat.py
@@ -60,9 +60,22 @@ def mnormalize(o):
 
 
 fname = sys.argv[1]
+try:
+  filt = sys.argv[2]
+except IndexError:
+  filt = lambda entry: True
+else:
+  _filt = filt
+  filt = lambda entry: eval(_filt, globals(), {'entry': entry})
+
 poswidth = len(str(os.stat(fname).st_size or 1000))
 
 
+class FullEntry(dict):
+  def __init__(self, val):
+    self.__dict__.update(val)
+
+
 with open(fname, 'rb') as fp:
   unpacker = msgpack.Unpacker(file_like=fp, read_size=1)
   max_type = max(typ.value for typ in EntryTypes)
@@ -82,5 +95,15 @@ with open(fname, 'rb') as fp:
       else:
         entry = unpacker.unpack()
         typ = EntryTypes(typ)
+      full_entry = FullEntry({
+        'value': entry,
+        'timestamp': timestamp,
+        'time': time,
+        'length': length,
+        'pos': pos,
+        'type': typ,
+      })
+      if not filt(full_entry):
+        continue
       print('%*u %13s %s %5u %r' % (
         poswidth, pos, typ.name, time.isoformat(), length, mnormalize(entry)))