kleiner Fortschritt

2 files changed, 118 insertions, 13 deletions

diff --git a/gpggraph.lpr b/gpggraph.lpr
index 7c8ce3f..e2a0ba7 100644
--- a/gpggraph.lpr
+++ b/gpggraph.lpr
@@ -6,12 +6,37 @@ uses
   mystringlistunit;
 
 var
-  sl: tMyStringList;
+  lKeys,kKeys: tMyStringList;
 
 begin
-  sl:=tMyStringList.create;
-  sl.loadFromPipe('gpg --homedir /var/cache/kernelKeys/.gnupg --list-sigs --no-auto-check-trustdb --fast-list-mode --fixed-list-mode');
-  writeln(sl.count);
-  sl.free;
+  lKeys:=tMyStringList.create;
+  kKeys:=tMyStringList.create;
+
+  lKeys.loadFromPipe('gpg --list-keys --no-auto-check-trustdb --fast-list-mode --fixed-list-mode');
+  lKeys.grep('^pub');
+  lKeys.replace('^\S+\s+[^ /]+/([0-9A-F]{8}) .*$','$1');
+  kKeys.loadFromPipe('gpg --homedir /var/cache/kernelKeys/.gnupg --list-keys --no-auto-check-trustdb --fast-list-mode --fixed-list-mode');
+  kKeys.grep('^pub');
+  kKeys.replace('^\S+\s+[^ /]+/([0-9A-F]{8}) .*$','$1');
+
+//  kSigs.loadFromPipe('gpg --homedir /var/cache/kernelKeys/.gnupg --list-sigs --no-auto-check-trustdb --fast-list-mode --fixed-list-mode');
+//  kSigs.grep('^(pub|sig)');
+
+  lKeys.sort;
+  kKeys.sort;
+  lKeys.uniq('-');
+  kKeys.uniq('-');
+
+  writeln(lKeys.count,' ',length(lKeys.text));
+  writeln(kKeys.count,' ',length(kKeys.text));
+
+  kKeys.append(lKeys);
+  kKeys.sort;
+  kKeys.uniq('d');
+
+  write(kKeys.text);
+
+  lKeys.free;
+  kKeys.free;
 end.
 
diff --git a/gpggraph.lps b/gpggraph.lps
index b154eba..01bb158 100644
--- a/gpggraph.lps
+++ b/gpggraph.lps
@@ -3,21 +3,22 @@
   <ProjectSession>
     <Version Value="9"/>
     <BuildModes Active="Default"/>
-    <Units Count="3">
+    <Units Count="4">
       <Unit0>
         <Filename Value="gpggraph.lpr"/>
         <IsPartOfProject Value="True"/>
         <IsVisibleTab Value="True"/>
-        <CursorPos X="16" Y="14"/>
-        <UsageCount Value="20"/>
+        <TopLine Value="2"/>
+        <CursorPos X="8" Y="37"/>
+        <UsageCount Value="21"/>
         <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="../units/mystringlistunit.pas"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="108"/>
-        <CursorPos X="25" Y="113"/>
-        <UsageCount Value="10"/>
+        <TopLine Value="222"/>
+        <CursorPos X="16" Y="262"/>
+        <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit1>
       <Unit2>
@@ -25,11 +26,18 @@
         <EditorIndex Value="2"/>
         <TopLine Value="154"/>
         <CursorPos X="28" Y="172"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit2>
+      <Unit3>
+        <Filename Value="/usr/lib/fpc/src/rtl/objpas/classes/classesh.inc"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="751"/>
+        <CursorPos X="15" Y="770"/>
+        <UsageCount Value="10"/>
+      </Unit3>
     </Units>
-    <JumpHistory Count="11" HistoryIndex="10">
+    <JumpHistory Count="29" HistoryIndex="28">
       <Position1>
         <Filename Value="gpggraph.lpr"/>
         <Caret Line="14" Column="19"/>
@@ -74,6 +82,78 @@
         <Filename Value="../units/mystringlistunit.pas"/>
         <Caret Line="23" Column="15" TopLine="3"/>
       </Position11>
+      <Position12>
+        <Filename Value="gpggraph.lpr"/>
+        <Caret Line="15" Column="19"/>
+      </Position12>
+      <Position13>
+        <Filename Value="../units/mystringlistunit.pas"/>
+        <Caret Line="28" Column="19" TopLine="8"/>
+      </Position13>
+      <Position14>
+        <Filename Value="../units/mystringlistunit.pas"/>
+        <Caret Line="30" Column="66" TopLine="8"/>
+      </Position14>
+      <Position15>
+        <Filename Value="gpggraph.lpr"/>
+        <Caret Line="20" Column="16"/>
+      </Position15>
+      <Position16>
+        <Filename Value="gpggraph.lpr"/>
+        <Caret Line="16" Column="9"/>
+      </Position16>
+      <Position17>
+        <Filename Value="../units/mystringlistunit.pas"/>
+        <Caret Line="29" Column="23" TopLine="8"/>
+      </Position17>
+      <Position18>
+        <Filename Value="../units/mystringlistunit.pas"/>
+        <Caret Line="225" Column="37" TopLine="191"/>
+      </Position18>
+      <Position19>
+        <Filename Value="../units/mystringlistunit.pas"/>
+        <Caret Line="223" Column="21" TopLine="203"/>
+      </Position19>
+      <Position20>
+        <Filename Value="gpggraph.lpr"/>
+        <Caret Line="30" Column="40"/>
+      </Position20>
+      <Position21>
+        <Filename Value="../units/mystringlistunit.pas"/>
+        <Caret Line="30" Column="22" TopLine="10"/>
+      </Position21>
+      <Position22>
+        <Filename Value="../units/mystringlistunit.pas"/>
+        <Caret Line="249" Column="39" TopLine="230"/>
+      </Position22>
+      <Position23>
+        <Filename Value="../units/mystringlistunit.pas"/>
+        <Caret Line="229" Column="38" TopLine="209"/>
+      </Position23>
+      <Position24>
+        <Filename Value="../units/mystringlistunit.pas"/>
+        <Caret Line="31" Column="28" TopLine="21"/>
+      </Position24>
+      <Position25>
+        <Filename Value="gpggraph.lpr"/>
+        <Caret Line="35"/>
+      </Position25>
+      <Position26>
+        <Filename Value="../units/mystringlistunit.pas"/>
+        <Caret Line="239" TopLine="221"/>
+      </Position26>
+      <Position27>
+        <Filename Value="gpggraph.lpr"/>
+        <Caret Line="33" Column="21" TopLine="2"/>
+      </Position27>
+      <Position28>
+        <Filename Value="../units/mystringlistunit.pas"/>
+        <Caret Line="235" Column="8" TopLine="219"/>
+      </Position28>
+      <Position29>
+        <Filename Value="../units/mystringlistunit.pas"/>
+        <Caret Line="31" Column="19" TopLine="7"/>
+      </Position29>
     </JumpHistory>
   </ProjectSession>
 </CONFIG>