- Fixed Issue 185

- Moved some files from /icons to /html - Added /datum/getrev which should get the server revision info from local svn files. Settings in /config/svndir.txt. Added new OOC verb "Show Server Revision" git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2405 316c924e-a436-60f5-8080-3fe189b3f50e
KasparoVy · Oct 21, 2011 · 468a882 · 468a882
1 parent f6713d3
commit 468a882
Show file tree

Hide file tree

Showing 19 changed files with 101 additions and 2 deletions.
diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm
@@ -0,0 +1,88 @@
+/*
+ * This datum gets revision info from local svn 'entries' file
+ * Path to the directory containing it should be in 'config/svndir.txt' file
+ *
+ */
+
+var/global/datum/getrev/revdata = new("config/svndir.txt")
+
+//Oh yeah, I'm an OOP fag, lalala
+/datum/getrev
+	var/revision
+	var/commiter
+	var/svndirpath
+	var/revhref
+
+	proc/abort()
+		spawn()
+			del src
+
+	New(filename)
+		..()
+		if(!fexists(filename))
+			return abort()
+
+		var/text = file2text(file(filename))
+		if(!text)
+			diary << "Unable to get [filename] contents, aborting"
+			return abort()
+
+		var/list/CL = dd_text2list(text, "\n")
+		for (var/t in CL)
+			if (!t)
+				continue
+			t = trim(t)
+			if (length(t) == 0)
+				continue
+			else if (copytext(t, 1, 2) == "#")
+				continue
+			var/pos = findtext(t, " ")
+			var/name = null
+			var/value = null
+			if (pos)
+				name = lowertext(copytext(t, 1, pos))
+				value = copytext(t, pos + 1)
+			else
+				name = lowertext(t)
+			if(!name)
+				continue
+			switch(name)
+				if("svndir")
+					svndirpath = value
+				if("revhref")
+					revhref = value
+
+		if(svndirpath && fexists(svndirpath) && fexists("[svndirpath]/entries") && isfile(file("[svndirpath]/entries")))
+			var/list/filelist = dd_file2list("[svndirpath]/entries",null)
+			revision = filelist[4]
+			commiter = filelist[12]
+			diary << "Revision info loaded succesfully"
+			return
+		return abort()
+
+	proc/getRevisionText()
+		var/output
+		if(revhref)
+			output = {"<a href="[revhref][revision]">[revision]</a>"}
+		else
+			output = revision
+		return output
+
+	proc/showInfo()
+		return {"<html>
+					<head>
+					</head>
+					<body>
+					<p><b>Server Revision:</b> [getRevisionText()]<br/>
+					<b>Author:</b> [commiter]</p>
+					</body>
+					<html>"}
+
+client/verb/showrevinfo()
+	set category = "OOC"
+	set name = "Show Server Revision"
+	var/output =  "Sorry, the revision info is unavailable."
+	if(revdata)
+		output = revdata.showInfo()
+	usr << browse(output,"window=revdata");
+	return
diff --git a/code/datums/helper_datums/topic_input.dm b/code/datums/helper_datums/topic_input.dm
@@ -53,4 +53,8 @@
 		var/t = get(i)
 		if(t)
 			t = text2path(t)
-		return ispath(t) ? t : null
+		return ispath(t) ? t : null
+
+	proc/getList(i)
+		var/t = getAndLocate(i)
+		return islist(t) ? t : null
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
@@ -1018,7 +1018,7 @@ datum
 			build_type = PROTOLATHE
 			materials = list("$metal" = 5000, "$glass" = 1000, "$uranium" = 500)
 			reliability_base = 76
-			build_path = "/obj/item/weapon/gun/energy/nuclear"
+			build_path = "/obj/item/weapon/gun/energy/gun/nuclear"
 			locked = 1
 
 		stunrevolver

diff --git a/config/svndir.txt b/config/svndir.txt
@@ -0,0 +1,5 @@
+#Path to the .svn directory. Used to get server revision info.
+SVNDIR .svn
+
+#Link to revision details.
+REVHREF http://code.google.com/p/tgstation13/source/detail?r=
diff --git a/icons/80x15.png → html/80x15.png b/icons/80x15.png → html/80x15.png
diff --git a/icons/88x31.png → html/88x31.png b/icons/88x31.png → html/88x31.png
diff --git a/icons/admin_pm.html → html/admin_pm.html b/icons/admin_pm.html → html/admin_pm.html
diff --git a/icons/changelog.html → html/changelog.html b/icons/changelog.html → html/changelog.html
diff --git a/icons/create_object.html → html/create_object.html b/icons/create_object.html → html/create_object.html
diff --git a/icons/dice.png → html/dice.png b/icons/dice.png → html/dice.png
diff --git a/icons/dice20.png → html/dice20.png b/icons/dice20.png → html/dice20.png
diff --git a/icons/help.html → html/help.html b/icons/help.html → html/help.html
diff --git a/icons/map.png → html/map.png b/icons/map.png → html/map.png
diff --git a/icons/paigrid.png → html/paigrid.png b/icons/paigrid.png → html/paigrid.png
diff --git a/icons/postcardsmall.jpg → html/postcardsmall.jpg b/icons/postcardsmall.jpg → html/postcardsmall.jpg
diff --git a/icons/somerights20.png → html/somerights20.png b/icons/somerights20.png → html/somerights20.png
diff --git a/icons/ss13_32.png → html/ss13_32.png b/icons/ss13_32.png → html/ss13_32.png
diff --git a/icons/ss13_64.png → html/ss13_64.png b/icons/ss13_64.png → html/ss13_64.png
diff --git a/tgstation.dme b/tgstation.dme
@@ -139,6 +139,7 @@
 #define FILE_DIR "code/WorkInProgress/recycling"
 #define FILE_DIR "code/WorkInProgress/virus2"
 #define FILE_DIR "code/WorkInProgress/virus2/Disease2"
+#define FILE_DIR "html"
 #define FILE_DIR "icons"
 #define FILE_DIR "icons/effects"
 #define FILE_DIR "icons/misc"
@@ -236,6 +237,7 @@
 #include "code\datums\diseases\wizarditis.dm"
 #include "code\datums\diseases\xeno_transformation.dm"
 #include "code\datums\helper_datums\construction_datum.dm"
+#include "code\datums\helper_datums\getrev.dm"
 #include "code\datums\helper_datums\global_iterator.dm"
 #include "code\datums\helper_datums\tension.dm"
 #include "code\datums\helper_datums\topic_input.dm"