Sort _scans entries first by date and then by filename

Author: yarikoptic

bin/heudiconv

@@ -1024,11 +1024,13 @@ def add_rows_to_scans_keys_file(fn, newrows):
 
     header = ['filename', 'acq_time', 'operator', 'randstr']
     # save
+    # prepare all the data rows
+    data_rows = [[k] + v for k, v in fnames2info.items()]
+    # sort by the date/filename
+    data_rows_sorted = sorted(data_rows, key=lambda x: (x[1], x[0]))
     with open(fn, 'a') as csvfile:
         writer = csv.writer(csvfile, delimiter='\t')
-        writer.writerow(header)
-        for key in sorted(fnames2info.keys()):
-            writer.writerow([key] + fnames2info[key])
+        writer.writerows([header] + data_rows_sorted)
 
 
 def _find_subj_ses(f_name):

tests/test_main.py

@@ -175,6 +175,9 @@ def _check_rows(fn, rows):
                 assert(row_ == ['filename', 'acq_time', 'operator', 'randstr'])
             else:
                 assert(rows[row_[0]] == row_[1:])
+        # dates, filename should be sorted (date "first", filename "second")
+        dates = [(r[1], r[0]) for r in rows_loaded[1:]]
+        assert dates == sorted(dates)
 
     _check_rows(fn, rows)
     # add a new one