unredact.py behaves if there's a .git inside darkive

also sorts messages (latest at bottom)

output.txt

@@ -1,16 +1,8 @@
 ### Players
 
-# Zabadee O'Mally (zayo, @zayo):
-   A defrocked ███████████ priest turned confession analysis contractor
-  (CAC).
-
 # Daan II (daanii, @black_puppydog):
   ██ ███ ███████ of ██████.
 
-# Trantor Alexis (talex, @talex):
-  A confirmed human resident of █████████ ███████████ and ChurchApproved
-  DepescheProzessor since 2048.
-
 # Rabbi Yoav (broyo, @thedod):
   Confession sensor technician (CST) and ChurchApproved Rabbi (CAR)
   [technically, a priest] in the Geneva parish. Born 2061 in Kibbutz
@@ -19,41 +11,49 @@
   (mainly due to family and origin). 77% heterosexual. No other known
   dominant deviations.
 
+# Trantor Alexis (talex, @talex):
+  A confirmed human resident of █████████ ███████████ and ChurchApproved
+  DepescheProzessor since 2048.
+
 # Forth Inc. (forth, @forth):
   Registered ████████.
 
+# Zabadee O'Mally (zayo, @zayo):
+   A defrocked ███████████ priest turned confession analysis contractor
+  (CAC).
+
 # Sandy Claws (sandyclaws, @sandyclaws):
   From the Magic Tuna Show (ask your kids).
 
 
 ### Redacting "fake redaction" to 2 trustees
-{"__public__": {"recipients": ["bob", "carol"], "cipher":
-[["W7MZY1y1", "mnb7", "TQY=", "sT6ZUgYlTlkIaog69AbAFgYCydQ/Na335paz"],
-["mCs=", "KalY", "7uvPaTg=", "D4Nc", "jaiB"]], "sender": "alice",
-"subject": "Is this thing on?", "trustees": ["forth", "zayo"],
-"msgid": "DA14348757490111"}, "forth": {"recipients": ["bob",
-"carol"], "pads": {"forth": [[null, "9BmP", null,
-"U6gRsJCtrM+AiB6yFpBI9JCKK0K31zt/BAA7"], ["+Vg=", "UMYt", "moOmB1M=",
-"duwp", null]]}, "sender": "alice", "subject": "Is this thing on?",
-"trustees": ["forth", "zayo"], "msgid": "DA14348757490111"}, "zayo":
-{"recipients": ["bob", "carol"], "pads": {"zayo": [["AtxsRC7Q", null,
-"LHU=", null], [null, null, null, null, "7Nrk"]]}, "sender": "alice",
-"subject": "Is this thing on?", "trustees": ["forth", "zayo"],
-"msgid": "DA14348757490111"}, "__to__": {"recipients": ["bob",
-"carol"], "pads": {"forth": [[null, "9BmP", null,
-"U6gRsJCtrM+AiB6yFpBI9JCKK0K31zt/BAA7"], ["+Vg=", "UMYt", "moOmB1M=",
-"duwp", null]], "zayo": [["AtxsRC7Q", null, "LHU=", null], [null,
-null, null, null, "7Nrk"]]}, "sender": "alice", "subject": "Is this
-thing on?", "trustees": ["forth", "zayo"], "msgid":
-"DA14348757490111"}}
-
-# >>> Unredaction for trustee: forth
-██████ not ██ █████████
-as you think you ███
-
-# >>> Unredaction for trustee: zayo
-You're ███ as ███████████████████████████
-██ ███ █████ ███ are
+{"talex": {"sender": "alice", "trustees": ["talex", "daanii"],
+"recipients": ["bob", "carol"], "msgid": "DA14349033735293",
+"subject": "Is this thing on?", "pads": {"talex": [["nilCLhxW",
+"vxVC", null, null], ["ssw=", null, null, "aLgo", "kz41"]]}},
+"__to__": {"sender": "alice", "trustees": ["talex", "daanii"],
+"recipients": ["bob", "carol"], "msgid": "DA14349033735293",
+"subject": "Is this thing on?", "pads": {"talex": [["nilCLhxW",
+"vxVC", null, null], ["ssw=", null, null, "aLgo", "kz41"]], "daanii":
+[[null, null, "UIQ=", "IaWUU4WdLyGRmD3h4tXXzLDfB9Qogp9CAzps"], [null,
+"1RK6", "wvfhz+4=", null, null]]}}, "__public__": {"sender": "alice",
+"cipher": [["x0Y3CW4z", "0Xo2", "Mfc=",
+"wzMcsRMVzbcZeqtpAENfLiZX5UKgYAnK4azk"], ["078=", "rH3P", "tp+IoYU=",
+"Eddd", "8kxQ"]], "trustees": ["talex", "daanii"], "recipients":
+["bob", "carol"], "msgid": "DA14349033735293", "subject": "Is this
+thing on?"}, "daanii": {"sender": "alice", "trustees": ["talex",
+"daanii"], "recipients": ["bob", "carol"], "msgid":
+"DA14349033735293", "subject": "Is this thing on?", "pads": {"daanii":
+[[null, null, "UIQ=", "IaWUU4WdLyGRmD3h4tXXzLDfB9Qogp9CAzps"], [null,
+"1RK6", "wvfhz+4=", null, null]]}}}
+
+# >>> Unredaction for trustee: talex
+You're not ██ ███████████████████████████
+as ███ █████ you are
+
+# >>> Unredaction for trustee: daanii
+██████ ███ as █████████
+██ you think ███ ███
 
 (one of them has utf-8 bloat)
 

unredact.py

@@ -54,8 +54,10 @@ if __name__=='__main__':
         if not os.path.isdir('darkive'):
             print('No "darkive" folder. You should run daget.py first')
             sys.exit(1)
-        msgs = [m for m in os.listdir('darkive')
-            if m!='corrupt' and os.path.isdir(os.path.join('darkive',m))]
+        msgs = [m for m in sorted(os.listdir('darkive'))  # Latest at bottom
+            if m!='corrupt' and 
+                not m.startswith('.') and  # Leave .git alone ;)
+                os.path.isdir(os.path.join('darkive',m))]
         if not msgs:
             print('No messages in "darkive" folder. You should run daget.py first')
             sys.exit(0)