X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroFile.java;h=9e50aa8de65f285253ff64d70f1dee1c55e2ad56;hp=0ef021a1de38f415d09b49d36af3a364e9a61143;hb=HEAD;hpb=21d176f161b90f18f236ef887cef9676d712eee3

diff --git a/micropeak/MicroFile.java b/micropeak/MicroFile.java
index 0ef021a1..f75cd1c3 100644
--- a/micropeak/MicroFile.java
+++ b/micropeak/MicroFile.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,27 +20,34 @@ package org.altusmetrum.micropeak;
 
 import java.io.*;
 import java.util.*;
-import org.altusmetrum.altoslib_10.*;
-import org.altusmetrum.altosuilib_10.*;
+import org.altusmetrum.altoslib_14.*;
+import org.altusmetrum.altosuilib_14.*;
 
 public class MicroFile {
 
-	public static File make(File directory, int year, int month, int day) {
+	public static File make(MicroData data, File directory, int year, int month, int day) {
+		String unique = "";
+		if (data != null && data.unique_id != null)
+			unique = String.format("-%s", data.unique_id);
 		for (int sequence = 1;; sequence++) {
-			String s = String.format("%04d-%02d-%02d-flight-%03d.mpd",
-						 year, month, day, sequence);
+			String s = String.format("%04d-%02d-%02d%s-flight-%03d.mpd",
+						 year, month, day, unique, sequence);
 			File file = new File(directory, s);
 			if (!file.exists())
 				return file;
 		}
 	}
 
-	public static File make(File directory) {
+	public static File make(MicroData data, File directory) {
 		Calendar	cal = Calendar.getInstance();
-		return make(directory, cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH));
+		return make(data, directory, cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH));
+	}
+
+	public static File make(MicroData data) {
+		return make(data, AltosUIPreferences.logdir());
 	}
 
 	public static File make() {
-		return make(AltosUIPreferences.logdir());
+		return make(null);
 	}
-}
\ No newline at end of file
+}