Commit: 5053fb1067fb33547ce6830bb455489485fe1eb1 - medialist-cli (git)

CLI interface to medialist (fossil mirror)

Commit MetaInfo

• Revision: 5053fb1067fb33547ce6830bb455489485fe1eb1 (tree)
• Zeit: 2021-09-20 18:27:06
• Autor: mio <stigma@disr...>
• Commiter: mio

Log Message

Reformat util.d and add expandEnvironmentVariables function.

FossilOrigin-Name: 86bdf587332c456bf313f00ee843aa300ac2ebecb7bbc53e8348d77fe7c6ad93

Ändern Zusammenfassung

• modified: src/util.d

Diff

--- a/src/util.d
+++ b/src/util.d
@@ -37,23 +37,78 @@ enum NUMBER_OF_ML_HEADERS = 6;
  */
 enum MLHeaders
 {
-  title = "title",
-  status = "status",
-  progress = "progress",
-  startDate = "start_date",
-  endDate = "end_date",
-  lastUpdated = "last_updated"
+	title = "title",
+	status = "status",
+	progress = "progress",
+	startDate = "start_date",
+	endDate = "end_date",
+	lastUpdated = "last_updated"
 }
 
 @trusted @nogc public void
 _log(string msg, bool err = false)
 {
-  import core.stdc.stdio : fprintf, stderr;
+	import core.stdc.stdio : fprintf, stderr;
 
-  if (true == err)
-    fprintf(stderr, "*** error: %s ***\n", msg.ptr);
-  else
-    fprintf(stderr, "** warning: %s **\n", msg.ptr);
+	if (true == err)
+		fprintf(stderr, "*** error: %s ***\n", msg.ptr);
+	else
+		fprintf(stderr, "** warning: %s **\n", msg.ptr);
+}
+
+/**
+ * Expand a string which can contain POSIX-style environment variables.
+ * 
+ * This function does $(B NOT) expand tildes.
+ */
+@safe public string
+expandEnvironmentVariables(string str)
+{
+	import std.array : appender;
+	import std.process : environment;
+	import std.string : indexOf, indexOfAny;
+	
+	ptrdiff_t startPos = 0;
+	ptrdiff_t endPos = 0;
+	
+	auto result = appender!string;
+	
+	startPos = indexOf(str, '$', endPos);
+	if (-1 == startPos)
+	{
+		return str;
+	}
+	
+	do
+	{
+		result ~= str[endPos..startPos];
+
+		endPos = indexOfAny(str, "/ ", startPos);
+		
+		/* Env. var ends the string */
+		/* startPos+1 to remove the $ */
+		if (endPos == -1)
+		{
+			result ~= environment.get(str[startPos+1..$], "");
+			break;
+		}
+		else
+		{
+			result ~= environment.get(str[startPos+1..endPos], "");
+		}
+		
+		startPos = indexOf(str, '$', endPos);
+		
+		if (startPos == -1)
+		{
+			result ~= str[endPos..$];
+			break;
+		}
+		
+		
+	} while (true);
+	
+	return result.data;
 }
 
 /**
@@ -68,30 +123,30 @@ _log(string msg, bool err = false)
 @trusted public Tuple!(size_t, string)[NUMBER_OF_ML_HEADERS]
 parseMLHeader(string[] headerSections)
 {
-  import std.string : toLower;
+	import std.string : toLower;
 
-  Tuple!(size_t, string)[NUMBER_OF_ML_HEADERS] sections;
-  size_t validHeaderCounter = 0;
+	Tuple!(size_t, string)[NUMBER_OF_ML_HEADERS] sections;
+	size_t validHeaderCounter = 0;
 
-  foreach (tabIndent, headerSection; headerSections)
-  {
-    string lowercaseHeader = headerSection.toLower;
-    switch (lowercaseHeader)
-    {
-      case MLHeaders.title:
-      case MLHeaders.status:
-      case MLHeaders.progress:
-      case MLHeaders.startDate:
-      case MLHeaders.endDate:
-      case MLHeaders.lastUpdated:
-        sections[validHeaderCounter++] = tuple(tabIndent, lowercaseHeader);
-        break;
-      default:
-        break;
-    }
-    if (validHeaderCounter >= NUMBER_OF_ML_HEADERS)
-      break;
-  }
+	foreach (tabIndent, headerSection; headerSections)
+	{
+		string lowercaseHeader = headerSection.toLower;
+		switch (lowercaseHeader)
+		{
+			case MLHeaders.title:
+			case MLHeaders.status:
+			case MLHeaders.progress:
+			case MLHeaders.startDate:
+			case MLHeaders.endDate:
+			case MLHeaders.lastUpdated:
+				sections[validHeaderCounter++] = tuple(tabIndent, lowercaseHeader);
+				break;
+			default:
+				break;
+		}
+		if (validHeaderCounter >= NUMBER_OF_ML_HEADERS)
+			break;
+	}
 
-  return sections;
+	return sections;
 }