GitHub/Notarize
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reading history from all pages

Browse Source
This commit is contained in:
macmade
2021-10-08 17:02:01 +02:00
parent 18debc3ed3
commit 8a0489103a
2 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Notarize/Classes/ALTool.swift
+2 -2
View File
@@ -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 )
}
Notarize/Classes/HistoryViewController.swift
+43 -25
View File
@@ -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