From 747a7dd15fdf9aec3b01e55b1ce0dd9243aef3e4 Mon Sep 17 00:00:00 2001
From: the1311 <to.he.13@gmx.de>
Date: Tue, 16 Nov 2021 23:27:09 +0100
Subject: [PATCH 1/6] add renaming jpg-files with <Date>_<Time> as option

---
 recovery.py | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/recovery.py b/recovery.py
index 459e663..5e4dbd5 100755
--- a/recovery.py
+++ b/recovery.py
@@ -5,6 +5,8 @@ from time import localtime, strftime
 import shutil
 import jpgSorter
 import numberOfFilesPerFolderLimiter
+import exifread
+from time import localtime, strftime, strptime, mktime
 
 
 def getNumberOfFilesInFolderRecursively(start_path = '.'):
@@ -57,6 +59,7 @@ def get_args():
     parser.add_argument('-m', '--split-months', action='store_true', required=False, help='split JPEG files not only by year but by month as well')
     parser.add_argument('-k', '--keep_filename', action='store_true', required=False, help='keeps the original filenames when copying')
     parser.add_argument('-d', '--min-event-delta', type=int, default=4, required=False, help='minimum delta in days between two days')
+    parser.add_argument('-j', '--date_time_filename', action='store_true', required=False, help='sets the filename to the exif date and time if possible - otherwise set filename depending on -k')    
 
     return parser.parse_args()
 
@@ -67,7 +70,7 @@ splitMonths = False
 source = None
 destination = None
 keepFilename = False
-
+date_time_filename = False
 
 args = get_args()
 source = args.source
@@ -75,12 +78,15 @@ destination = args.destination
 maxNumberOfFilesPerFolder = args.max_per_dir
 splitMonths = args.split_months
 keepFilename = args.keep_filename
+date_time_filename = args.date_time_filename
 minEventDeltaDays = args.min_event_delta
 
 print("Reading from source '%s', writing to destination '%s' (max %i files per directory, splitting by year %s)." %
     (source, destination, maxNumberOfFilesPerFolder, splitMonths and "and month" or "only"))
 if keepFilename:
     print("I will keep you filenames as they are")
+elif date_time_filename:
+    print("If possible I will rename your files like <Date>_<Time>.jpg - otherwise keep you filenames as they are")
 else:
     print("I will rename your files like '1.jpg'")
 
@@ -106,8 +112,26 @@ for root, dirs, files in os.walk(source, topdown=False):
 
         if not os.path.exists(destinationDirectory):
             os.mkdir(destinationDirectory)
+        
         if keepFilename:
             fileName = file
+        
+        elif date_time_filename:
+            index = 0
+            image = open(sourcePath, 'rb')
+            exifTags = exifread.process_file(image, details=False)
+            image.close()
+            creationTime = jpgSorter.getMinimumCreationTime(exifTags)
+            try:
+                creationTime = strptime(str(creationTime), "%Y:%m:%d %H:%M:%S")
+                creationTime = strftime("%Y%m%d_%H%M%S", creationTime)
+                fileName = str(creationTime) + "." + extension.lower()
+                while os.path.exists(os.path.join(destinationDirectory, fileName)):
+                    index += 1
+                    fileName = str(creationTime) + "(" + str(index) + ")" + "." + extension.lower()
+            except:
+                fileName = file
+
         else:
             fileName = str(fileCounter) + "." + extension.lower()
 

From 6c22af1b796e9d733afe60115fe60b9e70dcb83f Mon Sep 17 00:00:00 2001
From: the1311 <to.he.13@gmx.de>
Date: Tue, 16 Nov 2021 23:47:43 +0100
Subject: [PATCH 2/6] changed messages in recovery.py and update readme.md

---
 readme.md   | 21 +++++++++++++++++++++
 recovery.py |  4 ++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index 871728a..48643f4 100644
--- a/readme.md
+++ b/readme.md
@@ -76,3 +76,24 @@ Use the -k parameter to keep the original filenames:
 
 For the case you want to reduce or increase the timespan between events, simply use the parameter -d. The default is 4:
 ```python recovery.py <path to files recovered by Photorec> <destination> -d10```
+
+
+#### Rename jpg-files with <Date>_<Time> from EXIF data if possible
+
+If the original jpg image files were named by <Date>_<Time> it might be useful to rename the recovered files in the same way. This can be done by adding the parameter -j.
+```python recovery.py <path to files recovered by Photorec> <destination> -j```
+
+If no EXIF data can be retrieved the original filename is kept.
+
+In case there are two or more files with the same EXIF data the filename is extended by an index to avoid overwritng files.
+
+The result will look like:
+```
+20210121_134407.jpg
+20210122_145205.jpg
+20210122_145205(1).jpg
+20210122_145205(2).jpg
+20210122_145813.jpg
+20210122_153155.jpg
+```
+
diff --git a/recovery.py b/recovery.py
index 5e4dbd5..365fb68 100755
--- a/recovery.py
+++ b/recovery.py
@@ -59,7 +59,7 @@ def get_args():
     parser.add_argument('-m', '--split-months', action='store_true', required=False, help='split JPEG files not only by year but by month as well')
     parser.add_argument('-k', '--keep_filename', action='store_true', required=False, help='keeps the original filenames when copying')
     parser.add_argument('-d', '--min-event-delta', type=int, default=4, required=False, help='minimum delta in days between two days')
-    parser.add_argument('-j', '--date_time_filename', action='store_true', required=False, help='sets the filename to the exif date and time if possible - otherwise set filename depending on -k')    
+    parser.add_argument('-j', '--date_time_filename', action='store_true', required=False, help='sets the filename to the exif date and time if possible - otherwise keep the original filename')    
 
     return parser.parse_args()
 
@@ -86,7 +86,7 @@ print("Reading from source '%s', writing to destination '%s' (max %i files per d
 if keepFilename:
     print("I will keep you filenames as they are")
 elif date_time_filename:
-    print("If possible I will rename your files like <Date>_<Time>.jpg - otherwise keep you filenames as they are")
+    print("If possible I will rename your files like <Date>_<Time>.jpg - otherwise keep the filenames as they are")
 else:
     print("I will rename your files like '1.jpg'")
 

From f616cc3d8cc221bb7d914bc86ea39a45aefd0943 Mon Sep 17 00:00:00 2001
From: the1311 <to.he.13@gmx.de>
Date: Tue, 16 Nov 2021 23:49:45 +0100
Subject: [PATCH 3/6] Update readme.md

---
 readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/readme.md b/readme.md
index 48643f4..e055e1c 100644
--- a/readme.md
+++ b/readme.md
@@ -81,6 +81,7 @@ For the case you want to reduce or increase the timespan between events, simply
 #### Rename jpg-files with <Date>_<Time> from EXIF data if possible
 
 If the original jpg image files were named by <Date>_<Time> it might be useful to rename the recovered files in the same way. This can be done by adding the parameter -j.
+
 ```python recovery.py <path to files recovered by Photorec> <destination> -j```
 
 If no EXIF data can be retrieved the original filename is kept.

From f7e4543f77abd410c5f1d610890c305bdd31d763 Mon Sep 17 00:00:00 2001
From: the1311 <to.he.13@gmx.de>
Date: Tue, 16 Nov 2021 23:51:15 +0100
Subject: [PATCH 4/6] Update readme.md

---
 readme.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index e055e1c..7f2af34 100644
--- a/readme.md
+++ b/readme.md
@@ -78,7 +78,8 @@ For the case you want to reduce or increase the timespan between events, simply
 ```python recovery.py <path to files recovered by Photorec> <destination> -d10```
 
 
-#### Rename jpg-files with <Date>_<Time> from EXIF data if possible
+
+#### Rename jpg-files with "<Date>_<Time>" from EXIF data if possible
 
 If the original jpg image files were named by <Date>_<Time> it might be useful to rename the recovered files in the same way. This can be done by adding the parameter -j.
 

From 20b3655240b0133700a75bf7a6db9dada935eec7 Mon Sep 17 00:00:00 2001
From: the1311 <to.he.13@gmx.de>
Date: Tue, 16 Nov 2021 23:52:00 +0100
Subject: [PATCH 5/6] Update readme.md

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 7f2af34..9c90ecb 100644
--- a/readme.md
+++ b/readme.md
@@ -79,7 +79,7 @@ For the case you want to reduce or increase the timespan between events, simply
 
 
 
-#### Rename jpg-files with "<Date>_<Time>" from EXIF data if possible
+#### Rename jpg-files with "/<Date>_<Time>" from EXIF data if possible
 
 If the original jpg image files were named by <Date>_<Time> it might be useful to rename the recovered files in the same way. This can be done by adding the parameter -j.
 

From aa7cf6b125931c4e1e3374c588f206fd438e1a59 Mon Sep 17 00:00:00 2001
From: the1311 <to.he.13@gmx.de>
Date: Tue, 16 Nov 2021 23:53:31 +0100
Subject: [PATCH 6/6] Update readme.md

---
 readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index 9c90ecb..b9a9e4b 100644
--- a/readme.md
+++ b/readme.md
@@ -79,9 +79,9 @@ For the case you want to reduce or increase the timespan between events, simply
 
 
 
-#### Rename jpg-files with "/<Date>_<Time>" from EXIF data if possible
+#### Rename jpg-files with ```<Date>_<Time>``` from EXIF data if possible
 
-If the original jpg image files were named by <Date>_<Time> it might be useful to rename the recovered files in the same way. This can be done by adding the parameter -j.
+If the original jpg image files were named by ```<Date>_<Time>``` it might be useful to rename the recovered files in the same way. This can be done by adding the parameter -j.
 
 ```python recovery.py <path to files recovered by Photorec> <destination> -j```