projects/mde: mde/file/paths.d comparison

comparison mde/file/paths.d @ 135:bc697a218716

Somewhat unified path lookup between linux and windows and added font paths.

author	Diggory Hardy <diggory.hardy@gmail.com>
date	Fri, 30 Jan 2009 15:51:42 +0000
parents	7ababdf97748
children	4084f07f2c7a

comparison

equal deleted inserted replaced

-:7ababdf97748
+:bc697a218716
 Cout ("Data paths found:");
 dataDir.coutPaths;
 Cout ("\nConf paths found:");
 confDir.coutPaths;
 Cout ("\nLog file directory:\n\t")(logDir);
-	version (Windows) {
+Cout ("\nFont directories:");
-	    Cout ("\nFont directory:\n\t")(fontDir).newline;
+foreach (path; fontPaths)
-	} else version (linux) {
+Cout ("\n\t")(path.toString);
-	    Cout ("\nFont files found:");
+Cout.newline;
-	    foreach (f,p; fontFiles)
-		Cout ("\n\t")(f)("\t")(p[0..$-1]);
-	    Cout.newline;
-	}
 }
 private:
 FilePath[] getFiles (char[] filename, PRIORITY readOrder)
 {
 // Lowest priority paths are first.
 char[][MAX_PATHS] paths;
 ubyte pathsLen = 0;
 }
+/** Get the actual path of a font file, or throw NoFileException if not found.
+*
+* Returns a C string (null terminated). */
+char[] getFontPath (char[] file) {
+foreach (path; fontPaths) {
+	FilePath font = path.dup.append (file);
+	if (font.exists && font.isFile)
+return font.cString;
+}
+throw new NoFileException ("Unable to find font file: "~file);
+}
 /** These are the actual instances, one for each of the data and conf "directories". */
 mdeDirectory dataDir, confDir;
 char[] logDir;		/// Directory for log files
+FilePath[] fontPaths;	/// All directories for fonts
 //BEGIN Path resolution
+/// For command line args: these paths are added if non-null, with highest priority.
+char[] extraDataPath, extraConfPath;
+/** Add an extra font directory. May be called multiple times. */
+void addFontPath (char[] path) {
+FilePath fp = FilePath (path);
+if (fp.exists && fp.isFolder)
+fontPaths ~= fp;
+}
 /** Find at least one path for each required directory. */
 debug (mdeUnitTest) {
 /** In unittest mode, add paths unittest/data and unittest/conf before init runs. */
 static this () {
 	dataDir.tryPath ("unittest/data");
 	if (!(dataDir.pathsLen && confDir.pathsLen))
 	    throw new mdeException ("Fatal: unittest/data and unittest/conf don't both exist");
 	// Don't bother with real paths or logDir or font dir(s) for unittest.
 }
 }
-version (linux) {
+void resolvePaths (char[] base = ".") {
-SortedMap!(char[],char[]) fontFiles;	// key is file name, value is CString path
+size_t iFP = fontPaths.length;
-/** Get the actual path of a font file, or throw NoFileException if not found.
+fontPaths.length = fontPaths.length + 4;
-*
-* Returns a C string (null terminated). */
+version (linux) {
-char[] getFontPath (char[] file) {
-	char[] ret;
-	if (fontFiles.get (file, ret))
-	    return ret;
-	throw new NoFileException ("Unable to find font file: "~file);
-}
-// base-path not used on posix
-void resolvePaths (char[] base = "data") {
 // Home directory:
 char[] HOME = Environment.get("HOME", ".");
-// Base paths:
+// Installation base (should contain "data" and "conf"):
-// Static data (must exist):
+FilePath staticPath = findPath (false,
-FilePath staticPath =
+"/usr/share/games/mde",
-findPath (false, "/usr/share/games/mde", "/usr/local/share/games/mde", base);
+"/usr/local/share/games/mde",
-// Config (can just use defaults if necessary, so long as we can save afterwards):
+base~"/data");
+// Path for user-adjusted files:
 FilePath userPath = findPath (true, HOME~"/.config/mde", HOME~"/.mde");
-// Static data paths:
+dataDir.addPath (staticPath.toString);
-dataDir.addPath (staticPath.toString);      // we know this is valid anyway
-dataDir.tryPath (userPath.toString ~ "/data");
-if (extraDataPath) dataDir.tryPath (extraDataPath);
-if (!dataDir.pathsLen) throw new mdeException ("Fatal: no data path found!");
-// Configuration paths:
 confDir.tryPath (staticPath.toString ~ "/conf");
 confDir.tryPath ("/etc/mde");
-confDir.tryPath (userPath.toString ~ "/conf", true);
-if (extraConfPath) confDir.tryPath (extraConfPath);
-if (!confDir.pathsLen) throw new mdeException ("Fatal: no conf path found!");
-// Logging path:
-logDir = userPath.toString;
 	// Font paths:
-	auto fs = new FileScan;
+auto fontP1 = FilePath("/usr/share/fonts").toList;
-	// Scan for directories containing truetype and type1 fonts:
+foreach (fp1; fontP1)
-fs.sweep ("/usr/share/fonts", delegate bool(FilePath fp, bool isDir)
+if (fp1.isFolder)
-	    {	return isDir || fp.suffix == ".ttf" || fp.suffix == ".pfb";	},
+foreach (fp2; fp1.toList)
-		   true);
+if (fp2.isFolder) {
-	fontFiles = new SortedMap!(char[],char[]);
+if (iFP >= fontPaths.length)
-	foreach (fp; fs.files)
+fontPaths.length = fontPaths.length * 2;
-	    fontFiles.add (fp.file, fp.cString);	// both strings should be slices of same memory
+fontPaths[iFP++] = fp2;
 }
 } else version (Windows) {
-char[] fontDir;
-/** Get the actual path of a font file, or throw NoFileException if not found.
-*
-* Returns a C string (null terminated). */
-char[] getFontPath (char[] file) {
-	FilePath path = new FilePath (fontDir~file);
-	if (path.exists && !path.isFolder)
-	    return path.cString;
-	throw new NoFileException ("Unable to find font file: "~file);
-}
-void resolvePaths (char[] base = "./") {
 //FIXME: Get base path from registry
-// Base paths:
+FilePath staticPath = findPath (false, base~"/data");
-FilePath installPath = findPath (false, base);
-FilePath staticPath = findPath (false, installPath.toString);
 	FilePath userPath = findPath (true, getSpecialPath(CSIDL_LOCAL_APPDATA) ~ "/mde");
-// Static data paths:
+dataDir.addPath (staticPath.toString);
-dataDir.addPath (staticPath.toString);   // we know this is valid anyway
-	dataDir.tryPath (userPath.toString ~ "/data");
-if (extraDataPath) dataDir.tryPath (extraDataPath);
-if (!dataDir.pathsLen) throw new mdeException ("Fatal: no data path found!");
-// Configuration paths:
 confDir.tryPath (staticPath.toString ~ "/conf");
-confDir.tryPath (installPath.append("user").toString);
-confDir.tryPath (userPath.toString ~ "/conf", true);
-if (extraConfPath) confDir.tryPath (extraConfPath);
-if (!confDir.pathsLen) throw new mdeException ("Fatal: no conf path found!");
-// Logging path:
-logDir = userPath.toString;
 	// Font path:
-	fontDir = getSpecialPath (CSIDL_FONTS) ~ "/";	// append separator
+	fontPaths ~= FilePath(getSpecialPath (CSIDL_FONTS));
-}
+} else {
-} else {
+	static assert (false, "Platform is not linux or Windows: no support for paths on this platform yet!");
-static assert (false, "Platform is not linux or Windows: no support for paths on this platform yet!");
+}
-}
+// Static data paths:
-/// For command line args: these paths are added if non-null, with highest priority.
+dataDir.tryPath (userPath.toString ~ "/data");
-char[] extraDataPath, extraConfPath;
+if (extraDataPath) dataDir.tryPath (extraDataPath);
+// Configuration paths:
+confDir.tryPath (userPath.toString ~ "/conf", true);
+if (extraConfPath) confDir.tryPath (extraConfPath);
+if (!dataDir.pathsLen) throw new mdeException ("Fatal: no data path found!");
+if (!confDir.pathsLen) throw new mdeException ("Fatal: no conf path found!");
+for (int i = dataDir.pathsLen - 1; i >= 0; --i) {
+FilePath font = FilePath (dataDir.paths[i] ~ "fonts");
+Cout ("considering: ")(font.toString).newline;
+if (font.exists && font.isFolder)
+fontPaths[iFP++] = font;
+}
+fontPaths.length = iFP;
+// Logging path:
+logDir = userPath.toString;
+}
 private {
 class PathException : mdeException {
 this(char[] msg) {
 super (msg);

Mercurial > projects > mde

comparison mde/file/paths.d @ 135:bc697a218716