Commit: d3ba7203f744eef499ca853ef45d0010b5f88059 - medialist-cli (git)

CLI interface to medialist (fossil mirror)

Commit MetaInfo

• Revision: d3ba7203f744eef499ca853ef45d0010b5f88059 (tree)
• Time: 2021-09-23 18:21:19
• Author: mio <stigma@disr...>
• Commiter: mio

Log Message

Reformat add.d

FossilOrigin-Name: 8aebd101bd198417cc803e6bec754c85bc035907cc104c223d12d9af271c0288

Change Summary

• modified: add.d

Incremental Difference

--- a/add.d
+++ b/add.d
@@ -116,86 +116,85 @@ private string[] retrieveListHeaders(File* listFile)
 
 private void addMissingHeaders(ref string[] fileHeaders, File* listFile)
 {
-  import std.algorithm.searching : canFind;
-
-  if (false == canFind(fileHeaders, "start_date"))
-  {
-    addHeader(listFile, "start_date");
-    fileHeaders ~= "start_date";
-  }
-
-  if (false == canFind(fileHeaders, "end_date"))
-  {
-    addHeader(listFile, "end_date");
-    fileHeaders ~= "end_date";
-  }
-
-  if (false == canFind(fileHeaders, "last_updated"))
-  {
-    addHeader(listFile, "last_updated");
-    fileHeaders ~= "last_updated";
-  }
+	import std.algorithm.searching : canFind;
+
+	if (false == canFind(fileHeaders, "start_date"))
+	{
+		addHeader(listFile, "start_date");
+		fileHeaders ~= "start_date";
+	}
+
+	if (false == canFind(fileHeaders, "end_date"))
+	{
+		addHeader(listFile, "end_date");
+		fileHeaders ~= "end_date";
+	}
+
+	if (false == canFind(fileHeaders, "last_updated"))
+	{
+		addHeader(listFile, "last_updated");
+		fileHeaders ~= "last_updated";
+	}
 }
 
 private
 void addHeader(File* f, string newHeader) @trusted
 in
 {
-  assert(f.isOpen == true);
-  assert(newHeader !is null);
+	assert(f.isOpen == true);
+	assert(newHeader !is null);
 }
 out
 {
-  assert(f.isOpen == true);
+	assert(f.isOpen == true);
 }
 do
 {
-  import std.file : rename, remove, tempDir;
-  import std.path : buildPath, baseName;
+	import std.file : rename, remove, tempDir;
+	import std.path : buildPath, baseName;
 
-  immutable origPath = f.name;
-  immutable tempPath = buildPath(tempDir(), baseName(origPath));
+	immutable origPath = f.name;
+	immutable tempPath = buildPath(tempDir(), baseName(origPath));
 
-  File tempFile = File(tempPath, "w+");
+	File tempFile = File(tempPath, "w+");
 
-  string line = "";
-  bool pastHeader = false;
+	string line = "";
+	bool pastHeader = false;
   
-  f.rewind();
+	f.rewind();
 
-  while ((line = f.readln()) !is null)
-  {
-    if (false == pastHeader && '#' != line[0])
-    {
-      pastHeader = true;
-      tempFile.writefln("%s\t%s", line.strip, newHeader);
-    }
-    else
-    {
-      /* line may not have a newline character */
-      tempFile.writeln(line.strip);
-    }
-  }
-
-  f.close();
+	while ((line = f.readln()) !is null)
+	{
+		if (false == pastHeader && '#' != line[0])
+		{
+			pastHeader = true;
+			tempFile.writefln("%s\t%s", line.strip, newHeader);
+		}
+		else
+		{
+			/* line may not have a newline character */
+			tempFile.writeln(line.strip);
+		}
+	}
 
-  /* for whatever fucking reason, both "copy" and "rename" don't work. */
+	f.close();
 
-  remove(origPath);
+	remove(origPath);
 
-  f.open(origPath, "a+");
-  tempFile.rewind();
+	/* some operating systems don't like to copy from the tempdir? */
+	f.open(origPath, "a+");
+	tempFile.rewind();
 
-  while ((line = tempFile.readln()) !is null)
-  {
-    f.write(line);
-  }
+	while ((line = tempFile.readln()) !is null)
+	{
+		f.write(line);
+	}
 
-  /* rewind because we need to re-read the headers */
-  f.rewind();
+	/* rewind because we need to re-read the headers */
+	f.rewind();
 
-  tempFile.close();
-  remove(tempPath);
+	tempFile.close();
+	remove(tempPath);
 }
 
 private void writeNewItem(File* listFile, HeaderPairType[NUMBER_OF_ML_HEADERS] headersAndPositions,
@@ -258,15 +257,25 @@ private void replicateIndent(File* listFile, HeaderPairType headerPair, size_t*
     *previousIndent = headerPair[0];
 }
 
-@trusted private void display_usage(string program_name)
+@trusted @nogc private void display_usage(string programName)
 {
-  stderr.writefln("usage: %s add <list_name> <title> [options]
+	import core.stdc.stdio : fprintf;
+	import core.stdc.stdio : cstderr = stderr;
+	import core.stdc.stdlib : malloc, free;
+	
+	// Can't add NULL byte to D string, so allocate a temp string and free it.
+	char* progname = cast(char*)malloc(char.sizeof * programName.length);
+	scope(exit) free(progname);
+
+	progname[0..programName.length] = programName[];
+	progname[programName.length] = '\0';
+
+	fprintf(cstderr, "usage: %s add <list_name> <title> [options]
 
 list_name = the list name to add the new item to
 title = the title of the new item
 
 options:
-  -p, --progress  the initial progress of the new item (default: ??/??)
-  -s, --status    the initial status of the new item (default: UNKNOWN)",
-      program_name);
+-p, --progress  the initial progress of the new item (default: ??/??)
+-s, --status    the initial status of the new item (default: UNKNOWN)\n", progname);
 }