Minor improvements

This commit is contained in:
Chris Stuurman 2025-01-07 17:42:11 +02:00
parent 6729c67853
commit 36c7a31846
2 changed files with 16 additions and 21 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
log4.txt log4.txt
log5.txt

View File

@ -55,37 +55,31 @@ $Main =
$value=$arr[1].Trim() $value=$arr[1].Trim()
$exiflist[$key] = $value $exiflist[$key] = $value
} }
# Write-Output $exiflist # Write-Output "`n------ xfoutput ---------" $mediafile.Name $xfoutput
# Write-Output "`n------ exiflist ---------" $mediafile.Name $exiflist
$CreateDate = cv2datetime $exiflist['CreateDate'] $CreateDate = cv2datetime $exiflist['CreateDate']
$Date_TimeOriginal = cv2datetime $exiflist['Date_TimeOriginal'] $Date_TimeOriginal = cv2datetime $exiflist['Date_TimeOriginal']
$FileCreationDate_Time = cv2datetime $exiflist['FileCreationDate_Time'] $FileCreationDate_Time = cv2datetime $exiflist['FileCreationDate_Time']
$FileModificationDate_Time = cv2datetime $exiflist['FileModificationDate_Time'] $FileModificationDate_Time = cv2datetime $exiflist['FileModificationDate_Time']
$FileAccessDate_Time = cv2datetime $exiflist['FileAccessDate_Time'] $FileAccessDate_Time = cv2datetime $exiflist['FileAccessDate_Time']
$skip = $false $filenamedate = validatedate $mediafile.Name
if ($null -eq $CreateDate) { $datestr = $null
if ($null -eq $Date_TimeOriginal) { $datetaken = getearliest $CreateDate $Date_TimeOriginal
$filenamedate = validatedate $mediafile.Name if (-not($null -eq $datetaken)) {
if ($null -eq $filenamedate) { $datestr = $datetaken.ToString('yyyyMMdd')
$earliest = getearliest $FileCreationDate_Time $FileModificationDate_Time $FileAccessDate_Time }
$hint_time = $earliest.ToString('yyyy-MM-dd HH:mm:ss') elseif (-not($null -eq $filenamedate)) {
Write-Output "Skipped ""$sourcefilefullname"" : File has no usable ExifData! Earliest file time is $hint_time" | Tee-Object -FilePath $LogPath -Append | Write-Host -ForegroundColor DarkRed Write-Output """$sourcefilefullname"" : File has no usable ExifData. Using date in filename." | Tee-Object -FilePath $LogPath -Append | Write-Host -ForegroundColor Yellow
$skip = $true $datestr = $filenamedate.ToString('yyyyMMdd')
}
else {
Write-Output """$sourcefilefullname"" : File has no usable ExifData. Using date in filename." | Tee-Object -FilePath $LogPath -Append | Write-Host -ForegroundColor Yellow
$datestr = $filenamedate.ToString('yyyyMMdd')
}
}
else {
$datestr = $Date_TimeOriginal.ToString('yyyyMMdd')
}
} }
else { else {
$datestr = $CreateDate.ToString('yyyyMMdd') $earliest = getearliest $FileCreationDate_Time $FileModificationDate_Time $FileAccessDate_Time
$file_time = $earliest.ToString('yyyy-MM-dd HH:mm:ss')
Write-Output "Skipped ""$sourcefilefullname"" : File has no usable ExifData! Earliest file time is $file_time" | Tee-Object -FilePath $LogPath -Append | Write-Host -ForegroundColor DarkRed
} }
$sourcefiledir = "$($mediafile.Directory)" $sourcefiledir = "$($mediafile.Directory)"
#Write-Output $time_arr #Write-Output $time_arr
if (-not($skip)) { if (-not($null -eq $datestr)) {
#Write-Output "$($mediafile.Name) $datestr" #Write-Output "$($mediafile.Name) $datestr"
movetosubfolder "$($mediafile.Name)" "$datestr" "$sourcefiledir" "$DestFolder" "$FolderForDuplicates" movetosubfolder "$($mediafile.Name)" "$datestr" "$sourcefiledir" "$DestFolder" "$FolderForDuplicates"
remove-emptyfolder "$sourcefiledir" remove-emptyfolder "$sourcefiledir"