Move filename generation code

Move code that generates the filename (without the extension) to a
separate function so that we can get it in the header of the main page.

2 files changed, 20 insertions, 28 deletions

diff --git a/chrome-get-urls-from-tabs-in-windows.js b/chrome-get-urls-from-tabs-in-windows.js
index fc27d1f..c46fbf5 100644
--- a/chrome-get-urls-from-tabs-in-windows.js
+++ b/chrome-get-urls-from-tabs-in-windows.js
@@ -1,6 +1,7 @@
 var textarea = document.getElementById('copy-area');
 var generate_backup_text;
 var create_download_link;
+var generate_file_string;
 var generate_filename;
 
 
@@ -106,23 +107,27 @@ create_download_link = function(text, callback) {
 };
 
 
+generate_file_string = function() {
+	var d = new Date();
+	var date_string = 
+		d.getFullYear() 
+		+ '' 
+		+ ('0' + (d.getMonth() + 1)).slice(-2) 
+		+ '' 
+		+ ('0' + d.getDate()).slice(-2) 
+		+ '-' 
+		+ ('0' + d.getHours()).slice(-2) 
+		+ 'h' 
+		+ ('0' + d.getMinutes()).slice(-2);
+	
+	return 'chrome-tabs-' + date_string;
+};
+
+
 generate_filename = function(callback) {
 	chrome.storage.sync.get(function(items) {
 		var format = items.file_format;
 		
-		var d = new Date();
-		var date_string = 
-			d.getFullYear() 
-			+ '' 
-			+ ('0' + (d.getMonth() + 1)).slice(-2) 
-			+ '' 
-			+ ('0' + d.getDate()).slice(-2) 
-			+ '-' 
-			+ ('0' + d.getHours()).slice(-2) 
-			+ 'h' 
-			+ ('0' + d.getMinutes()).slice(-2);
-		
-		
 		var file_extension = '';
 		if (format === 'yaml') {
 			file_extension = 'yml';
@@ -134,6 +139,6 @@ generate_filename = function(callback) {
 			file_extension = 'txt';
 		}
 		
-		callback('chrome-tabs-' + date_string + '.' + file_extension);
+		callback(generate_file_string() + '.' + file_extension);
 	});
 };
\ No newline at end of file
diff --git a/page.js b/page.js
index 2c9b630..fa2f0b0 100644
--- a/page.js
+++ b/page.js
@@ -1,16 +1,3 @@
 (function() {
-	var d = new Date();
-	var date_string = 
-		d.getFullYear() 
-		+ '' 
-		+ ('0' + (d.getMonth() + 1)).slice(-2) 
-		+ '' 
-		+ ('0' + d.getDate()).slice(-2) 
-		+ '-' 
-		+ ('0' + d.getHours()).slice(-2) 
-		+ 'h' 
-		+ ('0' + d.getMinutes()).slice(-2);
-	
-	var header_text = 'chrome-tabs-' + date_string;
-	document.getElementById('header').innerHTML = header_text;
+	document.getElementById('header').innerHTML = generate_file_string();
 })();
\ No newline at end of file