Now uses .Json metadata file if it finds one to get

original creation date. Useful in case of data from
google

ArrangePictures.ps1

@@ -1,4 +1,16 @@
-function Get-APImageVideoExtensions {
+##################################
+######     CONSTANTS     #########
+##################################
+
+$global:FileTypePropIndex = 11
+$global:ImageCreationDatePropIndex = 12
+$global:VideoCreationDatePropIndex = 208
+
+##################################
+######     FUNCTIONS     #########
+##################################
+
+function Get-APImageVideoExtensions {
     param (
         [string] $sourceUrl = "https://cdn.jsdelivr.net/gh/jshttp/mime-db@v1.52.0/db.json"
     )
@@ -15,7 +27,7 @@
     return $extensions
 }
 
-function Get-FileMetaData {
+function Get-APFileMetaData {
     param (
         [string] $filePath,
         [int] $propertyIndex
@@ -24,7 +36,7 @@ function Get-FileMetaData {
     $folder = (New-Object -ComObject Shell.Application).NameSpace((Split-Path -Parent $filePath))
     $folderItem = $folder.ParseName((Split-Path -Leaf $filePath))
 
-    $property = $Folder.GetDetailsOf(
+    $property = $folder.GetDetailsOf(
         $folderItem,
         $propertyIndex
     )
@@ -32,37 +44,50 @@ function Get-FileMetaData {
     return $property
 }
 
-function Get-APFileDateTaken {
+function Get-APTemporaryDirectory {
+    do {
+        $tempDir = Join-Path -Path $env:TEMP -ChildPath ([System.IO.Path]::GetRandomFileName())
+    } while (Test-Path $tempDir)
+    return $tempDir
+}
+
+function Get-APDateFromJson {
     param (
-        [string] $FilePath
+        [string] $filePath
     )
-    #$PropIndex = 208  # Image Date Taken Property Index ; 208 = vidéo ; 11 = File type
-    $CharWhiteList = '[^: \w\/]'
-    $type = (Get-FileMetaData -FilePath $FilePath -PropertyIndex 11)
-    if ($type -ieq "vidéo") { $PropIndex = 208 }
-    if ($type -ieq "image") { $PropIndex = 12 }
 
-    $DateTaken = (Get-FileMetaData -FilePath $FilePath -PropertyIndex $PropIndex) -replace $CharWhiteList
+    $jsonFilePath = $filePath + ".json"
+    if (-not (Test-Path $jsonFilePath)) {
+        return $null
+    }
 
-    $culture = Get-Culture
-    $DateTaken = try { [DateTime]::Parse($DateTaken, $culture) } catch { $null }
-    return $DateTaken
+    $jsonContent = Get-Content -Path $jsonFilePath -Raw | ConvertFrom-Json
+    $timestamp = [int64] $jsonContent.photoTakenTime.timestamp
+    return [System.DateTimeOffset]::FromUnixTimeSeconds($timestamp).DateTime
 }
 
-function Get-APTemporaryDirectory {
-    do {
-        $TempDir = Join-Path -Path $env:TEMP -ChildPath ([System.IO.Path]::GetRandomFileName())
-    } while (Test-Path $TempDir)
-    return $TempDir
+function Get-APFileCreationDate {
+    param (
+        [string] $filePath,
+        [string] $fileType
+    )
+    if ($fileType -ieq "vidéo") { $propIndex = $VideoCreationDatePropIndex }
+    if ($fileType -ieq "image") { $propIndex = $ImageCreationDatePropIndex }
+    $charWhiteList = '[^: \w\/]'
+
+    $dateTaken = (Get-APFileMetaData -FilePath $filePath -PropertyIndex $propIndex) -replace $charWhiteList
+
+    $culture = Get-Culture
+    $dateTaken = try { [DateTime]::Parse($dateTaken, $culture) } catch { $null }
+    return $dateTaken
 }
 
-function Get-APCreationDateSubDirectory {
+function _subDirectoryFromDate {
     param (
-        [string] $filePath
+        [string] $filePath,
+        [Nullable[datetime]] $originalDate
     )
 
-    $originalDate = Get-APFileDateTaken -FilePath $filePath
-
     if ($originalDate) {
         $year = $originalDate.Year
         $month = $originalDate.Month.ToString("D2")
@@ -74,50 +99,54 @@ function Get-APCreationDateSubDirectory {
     }
 }
 
-
 ###########################################
 ####              MAIN                #####
 ###########################################
 
-if (-not $args[0] -or -not $args[1]) {
-    $SourceDir = Read-Host "Veuillez entrer le chemin du dossier source (ou une archive .zip)"
-    $DestinationDir = Read-Host "Veuillez entrer le chemin du dossier destination"
+if ($args[0] -and $args[1]) {
+    $sourceDir = $args[0]
+    $destinationDir = $args[1]
 } else {
-    $SourceDir = $args[0]
-    $DestinationDir = $args[1]
+    $sourceDir = Read-Host "Veuillez entrer le chemin du dossier source (ou une archive .zip)"
+    $destinationDir = Read-Host "Veuillez entrer le chemin du dossier destination"
 }
 
-if ($SourceDir -imatch "\.zip$") {
-    $TempDir = Get-APTemporaryDirectory
+if ($sourceDir -imatch "\.zip$") {
+    $tempDir = Get-APTemporaryDirectory
 
     try {
-        Expand-Archive -Path $SourceDir -DestinationPath $TempDir
-        $SourceDir = $TempDir
+        Expand-Archive -LiteralPath $sourceDir -DestinationPath $tempDir
+        $sourceDir = $tempDir
     }catch{
         Write-Host "L'archive n'a pas pu être décompressée."
         return
     }
 }
 
-$ValidExtensions = Get-APImageVideoExtensions
-Get-ChildItem -Path $SourceDir -Recurse -File | ForEach-Object {
-    $File = $_
-    $FileExtension = $File.Extension.ToLower().TrimStart('.')
+Get-ChildItem -Path $sourceDir -Recurse -File | ForEach-Object {
+    $filePath = $_.FullName
+    $fileType = (Get-APFileMetaData -File $filePath -PropertyIndex $FileTypePropIndex)
 
-    if ($ValidExtensions -contains $FileExtension) {
-        $subFolder = Get-APCreationDateSubDirectory -filePath $File.FullName
-        $targetDir = Join-Path -Path $DestinationDir -ChildPath $subFolder
-
-        if (-not (Test-Path $targetDir)) {
-            New-Item -Path $targetDir -ItemType Directory | Out-Null
-        }
+    if (-not($fileType -match "vidéo|image")) {
+        Write-Host "Fichier ignoré: $($filePath)"
+        return
+    }
 
-        Copy-Item -Path $file.FullName -Destination $targetDir
+    $creationDate = if ($value = Get-APDateFromJson -filePath $filePath) {
+        $value
     } else {
-        Write-Host "Fichier ignoré: $($file.FullName)"
+        Get-APFileCreationDate -filePath $filePath -fileType $fileType
     }
+    $subFolder = _subDirectoryFromDate -filePath $filePath -originalDate $creationDate
+    $targetDir = Join-Path -Path $DestinationDir -ChildPath $subFolder
+
+    if (-not (Test-Path $targetDir)) {
+        New-Item -Path $targetDir -ItemType Directory | Out-Null
+    }
+
+    Copy-Item -Path $filePath -Destination $targetDir
 }
 
-if ($SourceDir -like "$env:TEMP\*") {
-    Remove-Item -Path $SourceDir -Recurse -Force
+if ($sourceDir -like "$env:TEMP\*") {
+    Remove-Item -Path $sourceDir -Recurse -Force
 }