Address PR review feedback: fix file handle leak, duplicate filters, scope consistency, SMTP parsing, ConvertDateTime return type, and doc wording

Author: Shanefe

Calendar/CalLogHelpers/CalLogCSVFunctions.ps1

@@ -51,7 +51,7 @@ function MapSharedFolder {
     if ($ExternalMasterID -eq "NotFound") {
         return "Not Shared"
     } else {
-        $SharedFolders[$ExternalMasterID]
+        $script:SharedFolders[$ExternalMasterID]
     }
 }
 
@@ -98,31 +98,31 @@ function CreateExternalMasterIDMap {
 
         if ($AllFolderNames.Count -eq 0) {
             $unknownCount++
-            $SharedFolders[$ExternalID] = "UnknownSharedCalendarCopy$unknownCount"
+            $script:SharedFolders[$ExternalID] = "UnknownSharedCalendarCopy$unknownCount"
             Write-Host -ForegroundColor red "Found Zero folder names to map to for ExternalID [$ExternalID]."
         } elseif ($AllFolderNames.Count -eq 1) {
-            $SharedFolders[$ExternalID] = $AllFolderNames[0]
+            $script:SharedFolders[$ExternalID] = $AllFolderNames[0]
             Write-Verbose "Found map: [$($AllFolderNames[0])] is for $ExternalID"
         } else {
             # we still have multiple possible Folder Names, need to chose one or combine
             Write-Host -ForegroundColor Red "Unable to Get Exact Folder for $ExternalID"
             Write-Host -ForegroundColor Red "Found $($AllFolderNames.count) possible folders: $($AllFolderNames -join ', ')"
 
             if ($AllFolderNames.Count -eq 2) {
-                $SharedFolders[$ExternalID] = $AllFolderNames[0] + " + " + $AllFolderNames[1]
+                $script:SharedFolders[$ExternalID] = $AllFolderNames[0] + " + " + $AllFolderNames[1]
             } else {
                 $unknownCount++
-                $SharedFolders[$ExternalID] = "UnknownSharedCalendarCopy$unknownCount"
+                $script:SharedFolders[$ExternalID] = "UnknownSharedCalendarCopy$unknownCount"
             }
         }
     }
 
     Write-Host -ForegroundColor Green "Created the following Shared Calendar Mapping:"
-    foreach ($Key in $SharedFolders.Keys) {
-        Write-Host -ForegroundColor Green "$Key : $($SharedFolders[$Key])"
+    foreach ($Key in $script:SharedFolders.Keys) {
+        Write-Host -ForegroundColor Green "$Key : $($script:SharedFolders[$Key])"
     }
     Write-Verbose "Created the following Mapping :"
-    Write-Verbose $SharedFolders
+    Write-Verbose $script:SharedFolders
 }
 
 <#
@@ -254,9 +254,9 @@ function ConvertDateTime {
         return $Parsed
     }
 
-    # Priority 5: Return original string rather than losing data
+    # Priority 5: Return MinValue so sorting is not broken by mixed types
     Write-Warning "Unable to parse date: [$DateTime]"
-    return $DateTime
+    return [DateTime]::MinValue
 }
 
 function GetAttendeeCount {

Calendar/CalLogHelpers/ExportToExcelFunctions.ps1

@@ -55,11 +55,11 @@ function LogScriptInfo {
                             $script:RunNumber = [int]$Matches[1]
                         }
                     }
-                } else {
-                    if ($null -ne $pkg) { $pkg.Dispose() }
                 }
             } catch {
                 Write-Verbose "Unable to read existing run count from Excel: $_"
+            } finally {
+                if ($null -ne $pkg) { $pkg.Dispose() }
             }
         }
         $script:RunNumber++
@@ -172,13 +172,33 @@ function LogScriptInfo {
     # Update snapshot so next identity only captures new errors
     $script:PreRunErrorCount = $Error.Count
 
-    # Append to the existing Script Info tab
+    # Append to the existing Script Info tab (skip -Append on first write when the tab doesn't exist yet)
     $savedEAP = $ErrorActionPreference
     $ErrorActionPreference = 'SilentlyContinue'
-    $infoExcel = $RunInfo | Export-Excel -Path $FileName -WorksheetName "Script Info" -Append -PassThru 3>$null
+    $appendToSheet = $false
+    if (Test-Path $FileName) {
+        try {
+            $testPkg = Open-ExcelPackage -Path $FileName -ErrorAction SilentlyContinue
+            if ($null -ne $testPkg -and $null -ne $testPkg.Workbook.Worksheets["Script Info"]) {
+                $appendToSheet = $true
+            }
+            if ($null -ne $testPkg) { $testPkg.Dispose() }
+        } catch {
+            Write-Verbose "Unable to check for existing Script Info tab: $_"
+        }
+    }
+
+    if ($appendToSheet) {
+        $infoExcel = $RunInfo | Export-Excel -Path $FileName -WorksheetName "Script Info" -Append -PassThru 3>$null
+    } else {
+        $infoExcel = $RunInfo | Export-Excel -Path $FileName -WorksheetName "Script Info" -PassThru 3>$null
+    }
     $ErrorActionPreference = $savedEAP
-    $infoExcel.Workbook.Worksheets["Script Info"].TabColor = [System.Drawing.Color]::Gray
-    Export-Excel -ExcelPackage $infoExcel -WorksheetName "Script Info"
+
+    if ($null -ne $infoExcel) {
+        $infoExcel.Workbook.Worksheets["Script Info"].TabColor = [System.Drawing.Color]::Gray
+        Export-Excel -ExcelPackage $infoExcel -WorksheetName "Script Info"
+    }
 }
 
 function Export-TimelineExcel {
@@ -440,6 +460,12 @@ function SetLogRowTypeFilter {
     $tableStartCol = $tbl.Address.Start.Column
     $filterColId = $logRowCol - $tableStartCol
 
+    # Remove any existing filterColumn for this colId to avoid duplicates on reruns
+    $existingFilterCol = $autoFilter.SelectSingleNode("t:filterColumn[@colId='$filterColId']", $nsm)
+    if ($null -ne $existingFilterCol) {
+        $null = $autoFilter.RemoveChild($existingFilterCol)
+    }
+
     $filterCol = $tbl.TableXml.CreateElement("filterColumn", $ns)
     $filterCol.SetAttribute("colId", $filterColId.ToString())
     $filters = $tbl.TableXml.CreateElement("filters", $ns)

Calendar/CalLogHelpers/Invoke-GetMailbox.ps1

@@ -253,7 +253,12 @@ function GetSMTPAddress {
     } elseif ($PassedCN -like "*<*@*>") {
         # This is a new format that we are seeing in the Calendar Logs.
         # Example: '"Jon Doe" <Jon.Doe@Contoso.com>'
-        $result = $($PassedCN -split ("<")[-1] -split (">")[0])[1].Trim()
+        $smtpMatch = [regex]::Match($PassedCN, '<([^>]+)>')
+        if ($smtpMatch.Success) {
+            $result = $smtpMatch.Groups[1].Value.Trim()
+        } else {
+            $result = $PassedCN
+        }
         Write-Verbose "GetSMTPAddress: Using <SMTPAddress> format of [$PassedCN] as [$result]"
     } elseif ($PassedCN -match '</O=') {
         #Matching "Users Name" </O=...>

docs/Calendar/Get-CalendarDiagnosticObjectsSummary.md

@@ -124,7 +124,7 @@ Get-CalendarDiagnosticObjectsSummary.ps1 -Identity $Users -MeetingID $MeetingID
 
 Before analyzing, verify:
 
-- [ ] All four worksheets exist (Enhanced, Script Info, Raw, Timeline) for each participant
+- [ ] Participant worksheets exist for each participant (Enhanced, Raw, Timeline), and the shared Script Info worksheet is present
 - [ ] All key participants are included (organizer, affected attendees, delegates, room mailboxes)
 - [ ] LogTimestamp range covers the incident timeframe
 - [ ] Response rows exist (if investigating response issues — collected by default, use `-NoTrackingLogs` to skip)