From 8a0489103a958d90ad19fca54a047bd033017645 Mon Sep 17 00:00:00 2001
From: macmade <macmade@xs-labs.com>
Date: Fri, 8 Oct 2021 17:02:01 +0200
Subject: [PATCH] Reading history from all pages

---
 Notarize/Classes/ALTool.swift                |  4 +-
 Notarize/Classes/HistoryViewController.swift | 68 +++++++++++++-------
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/Notarize/Classes/ALTool.swift b/Notarize/Classes/ALTool.swift
index f128df4..891b7ab 100644
--- a/Notarize/Classes/ALTool.swift
+++ b/Notarize/Classes/ALTool.swift
@@ -50,9 +50,9 @@ class ALTool
         let _ = try ALTool.run( arguments: [ "--notarization-history", "0", "-u", self.username, "-p", self.password, "--output-format", "xml" ] )
     }
     
-    func notarizationHistory() throws -> String?
+    func notarizationHistory( page: Int64 ) throws -> String?
     {
-        let out = try ALTool.run( arguments: [ "--notarization-history", "0", "-u", self.username, "-p", self.password, "--output-format", "xml" ] )
+        let out = try ALTool.run( arguments: [ "--notarization-history", "\( page )", "-u", self.username, "-p", self.password, "--output-format", "xml" ] )
         
         return out.stdout.trimmingCharacters( in: NSCharacterSet.whitespacesAndNewlines )
     }
diff --git a/Notarize/Classes/HistoryViewController.swift b/Notarize/Classes/HistoryViewController.swift
index 827fdb1..0fcd69d 100644
--- a/Notarize/Classes/HistoryViewController.swift
+++ b/Notarize/Classes/HistoryViewController.swift
@@ -134,35 +134,22 @@ class HistoryViewController: NSViewController, NSTableViewDelegate, NSTableViewD
             
             DispatchQueue.global( qos: .userInitiated ).async
             {
-                let altool = ALTool( username: account.username, password: password )
-                
                 do
                 {
-                    let xml = try altool.notarizationHistory()
-                        
-                    if let xmlData = xml?.data( using: .utf8 )
-                    {
-                        if let history = try? PropertyListSerialization.propertyList( from: xmlData, options: [], format: nil ) as? NSDictionary
-                        {
-                            let items = HistoryItem.ItemsFromDictionary( dict: history )
-                            
-                            DispatchQueue.main.async
-                            {
-                                items.forEach
-                                {
-                                    o in
-                                    
-                                    if self.items.contains( o ) == false
-                                    {
-                                        self.items.insert( o )
-                                    }
-                                }
-                            }
-                        }
-                    }
-                        
+                    let items = try self.loadHistory( username: account.username, password: password )
+                    
                     DispatchQueue.main.async
                     {
+                        items.forEach
+                        {
+                            o in
+                            
+                            if self.items.contains( o ) == false
+                            {
+                                self.items.insert( o )
+                            }
+                        }
+                        
                         self.loading    = false
                         self.refreshing = false
                     }
@@ -197,6 +184,37 @@ class HistoryViewController: NSViewController, NSTableViewDelegate, NSTableViewD
         }
     }
     
+    private func loadHistory( username: String, password: String ) throws -> [ HistoryItem ]
+    {
+        var items  = [ HistoryItem ]()
+        let altool = ALTool( username: username, password: password )
+        var page   = Int64( 0 )
+        
+        repeat
+        {
+            let xml = try altool.notarizationHistory( page: page )
+            page    = -1
+            
+            if let xmlData = xml?.data( using: .utf8 )
+            {
+                if let history = try? PropertyListSerialization.propertyList( from: xmlData, options: [], format: nil ) as? NSDictionary
+                {
+                    let current = HistoryItem.ItemsFromDictionary( dict: history )
+                    
+                    items.append( contentsOf: current )
+                    
+                    if current.count > 0, let history = history.object( forKey: "notarization-history" ) as? NSDictionary, let next = history.object( forKey: "next-page" ) as? Int64
+                    {
+                        page = next
+                    }
+                }
+            }
+        }
+        while page >= 0
+        
+        return items
+    }
+    
     private func getInfo()
     {
         DispatchQueue.main.async