use sorted list of .txt files in slides

jclulow · Dec 21, 2013 · d3cfae7 · d3cfae7
1 parent 1f5f296
commit d3cfae7
Show file tree

Hide file tree

Showing 26 changed files with 104 additions and 26 deletions.
diff --git a/slides/0 b/slides/0
diff --git a/slides/index.txt → slides/00_index.txt b/slides/index.txt → slides/00_index.txt
diff --git a/slides/vasync.txt → slides/01_vasync.txt b/slides/vasync.txt → slides/01_vasync.txt
diff --git a/slides/kang.txt → slides/02_kang.txt b/slides/kang.txt → slides/02_kang.txt
diff --git a/slides/postmortem.txt → slides/03_postmortem.txt b/slides/postmortem.txt → slides/03_postmortem.txt
diff --git a/slides/postnode.txt → slides/04_postnode.txt b/slides/postnode.txt → slides/04_postnode.txt
diff --git a/slides/mdb.txt → slides/05_mdb.txt b/slides/mdb.txt → slides/05_mdb.txt
diff --git a/slides/dtrace.txt → slides/06_dtrace.txt b/slides/dtrace.txt → slides/06_dtrace.txt
diff --git a/slides/bunyan.txt → slides/07_bunyan.txt b/slides/bunyan.txt → slides/07_bunyan.txt
diff --git a/slides/restify.txt → slides/08_restify.txt b/slides/restify.txt → slides/08_restify.txt
diff --git a/slides/flamegraph.txt → slides/09_flamegraph.txt b/slides/flamegraph.txt → slides/09_flamegraph.txt
diff --git a/slides/1 b/slides/1
diff --git a/slides/10 b/slides/10
diff --git a/slides/general.txt → slides/10_general.txt b/slides/general.txt → slides/10_general.txt
diff --git a/slides/11 b/slides/11
diff --git a/slides/fin.txt → slides/11_fin.txt b/slides/fin.txt → slides/11_fin.txt
diff --git a/slides/2 b/slides/2
diff --git a/slides/3 b/slides/3
diff --git a/slides/4 b/slides/4
diff --git a/slides/5 b/slides/5
diff --git a/slides/6 b/slides/6
diff --git a/slides/7 b/slides/7
diff --git a/slides/8 b/slides/8
diff --git a/slides/9 b/slides/9
diff --git a/slides/deck.json b/slides/deck.json
@@ -0,0 +1,12 @@
+{
+  "header": {
+    "centre": "Node.js In Production At Joyent"
+  },
+  "footer": {
+    "left": "Joshua M. Clulow",
+    "right": "\u2295 Joyent"
+  },
+  "fade": {
+    "delay": 15
+  }
+}
diff --git a/termpres.js b/termpres.js
@@ -26,6 +26,77 @@ var IMIN = 232;
 var BLUE_RAMP = [ 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 27, 32, 33,
     38, 39, 44, 45, 45, 81, 81, 51, 51, 123, 123 ];
 
+
+
+var CURFILE;
+
+function
+list_files()
+{
+	var dir = mod_path.join(__dirname, 'slides'); /* XXX */
+	var ents = mod_fs.readdirSync(dir);
+	var out = [];
+
+	for (var i = 0; i < ents.length; i++) {
+		var ent = ents[i];
+
+		if (ent.match(/\.txt$/))
+			out.push(ent);
+	}
+
+	out.sort();
+
+	return (out);
+}
+
+function
+prev_file()
+{
+	var files = list_files();
+
+	if (!files || files.length < 1)
+		return (null);
+
+	if (!CURFILE)
+		return (files[0]);
+
+	var idx = files.indexOf(CURFILE);
+	if (idx === -1) {
+		return (files[0]);
+	}
+
+	/*
+	 * If we're already on the last slide, don't advance.
+	 * Also do not advance _past_ zero.
+	 */
+	if (idx === 0 || idx - 1 < 0)
+		return (null);
+
+	return (files[idx - 1]);
+}
+
+function
+next_file()
+{
+	var files = list_files();
+
+	if (!files || files.length < 1)
+		return (null);
+
+	if (!CURFILE)
+		return (files[0]);
+
+	var idx = files.indexOf(CURFILE);
+	if (idx === -1)
+		return (files[0]);
+
+	if (idx === files.length - 1 || idx + 1 > files.length)
+		return (null);
+
+	return (files[idx + 1]);
+}
+
+
 function
 blue_ramp(ival)
 {
@@ -132,17 +203,23 @@ max_line_width(text)
 }
 
 function
-switch_slide(idx, callback)
+switch_slide(name, callback)
 {
 	var new_slide;
 
+	if (!name) {
+		if (callback)
+			setImmediate(callback);
+		return;
+	}
+
 	if (!callback)
 		callback = function () {};
 
 	try {
 		var new_slide = {
 			text: mod_fs.readFileSync(mod_path.join(__dirname,
-			    'slides', String(idx)), 'utf8'),
+			    'slides', name), 'utf8'),
 			maxwidth: 0,
 			props: {}
 		};
@@ -158,7 +235,7 @@ switch_slide(idx, callback)
 	}
 	fade(SLIDE, true, function () {
 		SLIDE = new_slide;
-		IDX = idx;
+		CURFILE = name;
 
 		TERM.clear();
 		draw_surrounds();
@@ -190,21 +267,18 @@ TERM.on('keypress', function (key) {
 	};
 
 	var end = function () {
-		printstuff('IDX ' + IDX + ' @ ' + new Date().toISOString());
+		printstuff('FILE ' + CURFILE + ' @ ' + new Date().toISOString());
 		WORKING = false;
 	};
 
 	if (key === 'j'.charCodeAt(0)) {
-		switch_slide(IDX + 1, end);
+		switch_slide(next_file(), end);
 	} else if (key === 'k'.charCodeAt(0)) {
-		if (IDX > 0)
-			switch_slide(IDX - 1, end);
-		else
-			end();
+		switch_slide(prev_file(), end);
 	} else if (key === 'r'.charCodeAt(0)) {
-		switch_slide(IDX, end);
+		switch_slide(CURFILE, end);
 	} else {
-		end();
+		setImmediate(end);
 		printstuff('fallthrough ' + key);
 	}
 });
@@ -253,7 +327,13 @@ check_size(size)
 		TERM.colour256(196);
 		TERM.write(msg);
 	} else {
-		switch_slide(IDX, function (err) {
+		/*
+		 * Pick an initial slide if we have not yet done so:
+		 */
+		if (!CURFILE)
+			CURFILE = next_file();
+
+		switch_slide(CURFILE, function (err) {
 			if (err) {
 				TERM.clear();
 				TERM.write(err.stack);
@@ -266,6 +346,4 @@ check_size(size)
 
 TERM.on('resize', check_size);
 
-var IDX = 0;
-
 check_size(TERM.size());