Minor improvements
This commit is contained in:
parent
6729c67853
commit
36c7a31846
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
log4.txt
|
log4.txt
|
||||||
|
log5.txt
|
||||||
|
|||||||
@ -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
|
|
||||||
if ($null -eq $CreateDate) {
|
|
||||||
if ($null -eq $Date_TimeOriginal) {
|
|
||||||
$filenamedate = validatedate $mediafile.Name
|
$filenamedate = validatedate $mediafile.Name
|
||||||
if ($null -eq $filenamedate) {
|
$datestr = $null
|
||||||
$earliest = getearliest $FileCreationDate_Time $FileModificationDate_Time $FileAccessDate_Time
|
$datetaken = getearliest $CreateDate $Date_TimeOriginal
|
||||||
$hint_time = $earliest.ToString('yyyy-MM-dd HH:mm:ss')
|
if (-not($null -eq $datetaken)) {
|
||||||
Write-Output "Skipped ""$sourcefilefullname"" : File has no usable ExifData! Earliest file time is $hint_time" | Tee-Object -FilePath $LogPath -Append | Write-Host -ForegroundColor DarkRed
|
$datestr = $datetaken.ToString('yyyyMMdd')
|
||||||
$skip = $true
|
|
||||||
}
|
}
|
||||||
else {
|
elseif (-not($null -eq $filenamedate)) {
|
||||||
Write-Output """$sourcefilefullname"" : File has no usable ExifData. Using date in filename." | Tee-Object -FilePath $LogPath -Append | Write-Host -ForegroundColor Yellow
|
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')
|
$datestr = $filenamedate.ToString('yyyyMMdd')
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else {
|
else {
|
||||||
$datestr = $Date_TimeOriginal.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
|
||||||
else {
|
|
||||||
$datestr = $CreateDate.ToString('yyyyMMdd')
|
|
||||||
}
|
}
|
||||||
$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"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user