Commit: 636dc1125de04f272e07fd88db3a94907b8639c4 - medialist-cli (git)

CLI interface to medialist (fossil mirror)

Commit MetaInfo

• Révision: 636dc1125de04f272e07fd88db3a94907b8639c4 (tree)
• l'heure: 2022-01-25 09:31:41
• Auteur: mio <stigma@disr...>
• Commiter: mio

Message de Log

remove unused util.d functions

FossilOrigin-Name: ed3e9654e3d7d5cd797836f3b0eaa6908fac9f474bdcdedd6cfc496c70e5fa58

Change Summary

• modified: util.d

Modification

--- a/util.d
+++ b/util.d
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 dawning.
+ * Copyright (C) 2021, 2022 mio <[e-mail]>
  *
  * This file is part of medialist-cli.
  *
@@ -18,47 +18,6 @@
  */
 module util;
 
-import std.stdio : File;
-import std.typecons : Tuple, tuple;
-
-alias HeaderPairType = Tuple!(size_t, string);
-
-/**
- * The number of headers supported by MediaList (CLI).
- *
- * - `title`
- * - `status`
- * - `progress`
- * - `start_date`
- * - `end_date`
- * - `last_updated`
- */
-enum NUMBER_OF_ML_HEADERS = 6;
-
-/**
- * All the supported headers as lowercase strings for comparison.
- */
-enum MLHeaders
-{
-	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;
-
-	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.
  *
@@ -144,158 +103,3 @@ expandEnvironmentVariables(string str)
 	environment["HOME"] = prevHome;
 	environment["XDG_CONFIG_HOME"] = prevConf;
 }
-
-/**
- * Parse the headers to an array of tuples containing the number of
- * tabs required to match the header, and the header itself.
- *
- * Params:
- *  headerSections = The header line split by horizontal tabs.
- *
- * Returns: An array of Tuple(tabIndent (size_t), header (string)).
- */
-@trusted public HeaderPairType[NUMBER_OF_ML_HEADERS]
-parseMLHeader(string[] headerSections)
-{
-	import std.string : toLower;
-
-	HeaderPairType[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;
-	}
-
-	return sections;
-}
-
-public string[]
-retrieveListHeaders (File* listFile)
-{
-	import std.string : strip, split;
-
-	string line = null;
-	string[] fileHeaders;
-
-	listFile.rewind ();
-
-	while ((line = listFile.readln()) !is null)
-	{
-		if ('#' != line[0])
-		{
-			fileHeaders = line.strip().split('\t');
-			break;
-		}
-	}
-
-	return fileHeaders;
-}
-
-public void
-addMissingHeaders(ref string[] fileHeaders, File* listFile)
-{
-	import core.stdc.stdio : SEEK_END;
-	import std.algorithm.searching : canFind;
-
-	/* Version 0.2 */
-	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";
-	}
-
-	listFile.seek(0, SEEK_END);
-}
-
-@trusted private void
-addHeader(File* f, string newHeader)
-in
-{
-	assert (f.isOpen == true, "f.isOpen == true (in)");
-	assert (newHeader !is null, "newHeader !is null");
-}
-out
-{
-	assert (f.isOpen == true, "f.isOpen == true (out)");
-}
-do
-{
-	import std.file : remove, tempDir;
-	import std.path : buildPath, baseName;
-	import std.string : strip;
-
-	immutable originalPath = f.name;
-	immutable tempPath = buildPath(tempDir, baseName(originalPath));
-
-	File tempFile = File(tempPath, "w+");
-
-	string line = "";
-	bool pastHeader = false;
-
-	/* Make sure we're at the start of the file. */
-	f.rewind ();
-
-	while ((line = f.readln()) !is null)
-	{
-		if (false == pastHeader && '#' != line[0])
-		{
-			pastHeader = true;
-			tempFile.writefln ("%s\t%s", strip (line), newHeader);
-		}
-		else
-		{
-			/* strip + writeln since the previous one may not have had the newline */
-			tempFile.writeln (strip (line));
-		}
-	}
-
-	f.close ();
-
-	/*
-	 * Since the temporary directory *could* be mounted differently (e.g. remotely)
-	 * some systems don't like to copy from the temporary directory.
-	 */
-	remove (originalPath);
-
-	f.open (originalPath, "w+");
-	tempFile.rewind ();
-
-	while ((line = tempFile.readln()) !is null)
-	{
-		f.write (line);
-	}
-
-	/* Rewind since we need to re-parse the headers */
-	f.rewind ();
-
-	tempFile.close();
-	remove (tempPath);
-}