projects/mde: mde/setup/paths.d annotate

annotate mde/setup/paths.d @ 107:20f7d813bb0f

Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. New unittest for Translation; I realised the old one wasn't run anymore. Changed unittest data and conf dirs.

author	Diggory Hardy <diggory.hardy@gmail.com>
date	Sun, 30 Nov 2008 17:17:56 +0000
parents	7f7b40fed72b
children	1b1e2297e2fc

rev	line source
17 5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	1 /* LICENSE BLOCK
5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	2 Part of mde: a Modular D game-oriented Engine
5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	3 Copyright © 2007-2008 Diggory Hardy
5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	4
26 611f7b9063c6 Changed the licensing and removed a few dead files. Diggory Hardy <diggory.hardy@gmail.com> parents: 24 diff changeset	5 This program is free software: you can redistribute it and/or modify it under the terms
611f7b9063c6 Changed the licensing and removed a few dead files. Diggory Hardy <diggory.hardy@gmail.com> parents: 24 diff changeset	6 of the GNU General Public License as published by the Free Software Foundation, either
611f7b9063c6 Changed the licensing and removed a few dead files. Diggory Hardy <diggory.hardy@gmail.com> parents: 24 diff changeset	7 version 2 of the License, or (at your option) any later version.
17 5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	8
5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	9 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	10 without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	11 See the GNU General Public License for more details.
5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	12
26 611f7b9063c6 Changed the licensing and removed a few dead files. Diggory Hardy <diggory.hardy@gmail.com> parents: 24 diff changeset	13 You should have received a copy of the GNU General Public License
611f7b9063c6 Changed the licensing and removed a few dead files. Diggory Hardy <diggory.hardy@gmail.com> parents: 24 diff changeset	14 along with this program. If not, see <http://www.gnu.org/licenses/>. */
17 5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	15
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	16 /** Resource paths module.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	17 *
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	18 * Internally to mde code other than code dealing directly with files and this module, paths are
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	19 * relative to the mde directory. This module transforms those paths to absolute paths.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	20 *
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	21 * Additionally, the intention is to look for all files in two directories: the installation (i.e.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	22 * main data) directory and a user directory (for user-specific configuration). Besides exposing
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	23 * both paths and checking in which valid files exist, this module provides some extra mergetag
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	24 * functionality to simplify correct reading and writing.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	25 *
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	26 * Currently the paths are found as follows: (see codeDoc/paths.txt)
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	27 */
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	28 /* Implementation note:
67 108d123238c0 Changes to work with tango r3700 (post 0.99.6). Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	29 * All paths are stored internally as strings, rather than as an instance of FilePath/FilePath once
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	30 * the FilePath has served its immediate purpose, since it's more convenient and creating new
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	31 * FilePaths for adjusted paths should be no slower than mutating existing ones. */
63 66d555da083e Moved many modules/packages to better reflect usage. Diggory Hardy <diggory.hardy@gmail.com> parents: 53 diff changeset	32 module mde.setup.paths;
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	33
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	34 import mde.exception;
81 d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 78 diff changeset	35 import mde.file.mergetag.Reader;
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 78 diff changeset	36 import mde.file.mergetag.Writer;
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 78 diff changeset	37 import mde.file.mergetag.DataSet;
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 78 diff changeset	38 import mde.file.mergetag.exception;
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	39
28 b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	40 import tango.io.Console;
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	41 import tango.io.FilePath;
101 71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	42 version (linux) {
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	43 import tango.io.FileScan;
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	44 import tango.util.container.SortedMap;
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	45 import tango.sys.Environment;
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	46 } else version (Windows)
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	47 import tango.sys.win32.SpecialPath;
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	48
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	49 debug {
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	50 import tango.util.log.Log : Log, Logger;
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	51 private Logger logger;
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	52 static this() {
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	53 logger = Log.getLogger ("mde.setup.paths");
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	54 }
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	55 }
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	56
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	57 /** Order to read files in.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	58 *
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	59 * Values: HIGH_LOW, LOW_HIGH, HIGH_ONLY. */
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	60 enum PRIORITY : byte { HIGH_LOW, LOW_HIGH, HIGH_ONLY }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	61
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	62 /** This struct has one instance for each "directory".
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	63 *
24 32eff0e01c05 Only locally-changed options are stored in user-config now. Log levels revised. Diggory Hardy <diggory.hardy@gmail.com> parents: 18 diff changeset	64 * It is the only item within this module that you should need to interact with.
32eff0e01c05 Only locally-changed options are stored in user-config now. Log levels revised. Diggory Hardy <diggory.hardy@gmail.com> parents: 18 diff changeset	65 *
32eff0e01c05 Only locally-changed options are stored in user-config now. Log levels revised. Diggory Hardy <diggory.hardy@gmail.com> parents: 18 diff changeset	66 * In the case of confDir, the user path is guaranteed to exist (as highest priority path). */
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	67 struct mdeDirectory
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	68 {
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	69 /** Creates an MT reader for each file.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	70 *
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	71 * Params:
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	72 * file = The file path and name relative to the mdeDirectory, without a suffix
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	73 * (e.g. "options")
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	74 * readOrder = Read the highest priority or lowest priority files first? For correct merging,
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	75 * this should be LOW_HIGH when newly-read items override old ones (as is the case
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	76 * with DefaultData) and HIGH_LOW when the first-read items survive. Thus override
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	77 * order needs to be the same for each section, except the header which is always
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	78 * read with LOW_HIGH order.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	79 * Alternately, for files which shouldn't be
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	80 * merged where only the highest priority file should be read, pass HIGH_ONLY.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	81 * ds = The dataset, as for mergetag. Note: all actual readers share one dataset.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	82 * rdHeader = Read the headers for each file and merge if rdHeader == true.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	83 */
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	84 IReader makeMTReader (char[] file, PRIORITY readOrder, DataSet ds = null, bool rdHeader = false)
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	85 {
67 108d123238c0 Changes to work with tango r3700 (post 0.99.6). Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	86 FilePath[] files = getFiles (file, readOrder);
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	87 if (files is null)
75 25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 68 diff changeset	88 throw new NoFileException ("Unable to find the file: "~file~"[.mtt\|mtb]");
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	89
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	90 return new mdeReader (files, ds, rdHeader);
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	91 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	92
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	93 /** Creates an MT writer for file deciding on the best path to use.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	94 *
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	95 * Params:
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	96 * file = The file path and name relative to the mdeDirectory, without a suffix
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	97 * (e.g. "options")
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	98 * ds = The dataset, as for mergetag.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	99 */
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	100 IWriter makeMTWriter (char[] file, DataSet ds = null)
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	101 {
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	102 // FIXME: use highest priority writable path
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	103 return makeWriter (paths[pathsLen-1] ~ file, ds, WriterMethod.Text);
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	104 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	105
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	106 /** Returns a string listing the file name or names (if readOrder is not HIGH_ONLY and multiple
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	107 * matches are found), or "no file found". Intended for user output only. */
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	108 char[] getFileName (char[] file, PRIORITY readOrder)
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	109 {
67 108d123238c0 Changes to work with tango r3700 (post 0.99.6). Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	110 FilePath[] files = getFiles (file, readOrder);
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	111 if (files is null)
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	112 return "no file found";
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	113
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	114 char[] ret = files[0].toString;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	115 foreach (f; files[1..$])
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	116 ret ~= ", " ~ f.toString;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	117 return ret;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	118 }
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	119
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	120 /// Print all paths found.
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	121 static void printPaths () {
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	122 Cout ("Data paths found:");
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	123 dataDir.coutPaths;
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	124 Cout ("\nConf paths found:");
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	125 confDir.coutPaths;
101 71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	126 Cout ("\nLog file directory:\n\t")(logDir);
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	127 version (Windows) {
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	128 Cout ("\nFont directory:\n\t")(fontDir).newline;
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	129 } else version (linux) {
106 7f7b40fed72b Fix & workaround for tango r4134. Diggory Hardy <diggory.hardy@gmail.com> parents: 103 diff changeset	130 Cout ("\nFont files found:");
101 71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	131 foreach (f,p; fontFiles)
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	132 Cout ("\n\t")(f)("\t")(p[0..$-1]);
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	133 Cout.newline;
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	134 }
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	135 }
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	136
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	137 private:
67 108d123238c0 Changes to work with tango r3700 (post 0.99.6). Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	138 FilePath[] getFiles (char[] filename, PRIORITY readOrder)
75 25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 68 diff changeset	139 {
67 108d123238c0 Changes to work with tango r3700 (post 0.99.6). Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	140 FilePath[] ret;
68 3a737e06dc50 Unittests: fixes and changes. Plus some doc changes. Diggory Hardy <diggory.hardy@gmail.com> parents: 67 diff changeset	141
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	142 if (readOrder == PRIORITY.LOW_HIGH) {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	143 for (size_t i = 0; i < pathsLen; ++i) {
67 108d123238c0 Changes to work with tango r3700 (post 0.99.6). Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	144 FilePath file = findFile (paths[i]~filename);
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	145 if (file !is null)
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	146 ret ~= file;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	147 }
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	148 } else {
75 25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 68 diff changeset	149 assert (readOrder == PRIORITY.HIGH_LOW \|\|
25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 68 diff changeset	150 readOrder == PRIORITY.HIGH_ONLY );
25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 68 diff changeset	151
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	152 for (int i = pathsLen - 1; i >= 0; --i) {
67 108d123238c0 Changes to work with tango r3700 (post 0.99.6). Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	153 FilePath file = findFile (paths[i]~filename);
78 79a1809421aa Widget data saving reimplemented for the new data system. (Now grid layout widgets remember their row & column sizes.) Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	154 if (file !is null)
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	155 ret ~= file;
78 79a1809421aa Widget data saving reimplemented for the new data system. (Now grid layout widgets remember their row & column sizes.) Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	156 if (readOrder == PRIORITY.HIGH_ONLY) break;
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	157 }
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	158 }
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	159 return ret;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	160 }
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	161
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	162 // Unconditionally add a path
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	163 void addPath (char[] path) {
107 20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	164 assert (pathsLen < MAX_PATHS);
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	165 paths[pathsLen++] = path~'/';
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	166 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	167
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	168 // Test a path and add if is a folder.
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	169 bool tryPath (char[] path, bool create = false) {
107 20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	170 assert (pathsLen < MAX_PATHS);
20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	171 FilePath fp = FilePath (path);
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	172 if (fp.exists && fp.isFolder) {
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	173 paths[pathsLen++] = path~'/';
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	174 return true;
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	175 } else if (create) {
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	176 try {
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	177 fp.create;
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	178 paths[pathsLen++] = fp.toString~'/';
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	179 return true;
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	180 } catch (Exception e) {
28 b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	181 // No logging avaiable yet: Use Stdout/Cout
b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	182 Cout ("Creating path "~path~" failed:" ~ e.msg).newline;
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	183 }
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	184 }
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	185 return false;
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	186 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	187
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	188 void coutPaths () {
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	189 if (pathsLen) {
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	190 for (size_t i = 0; i < pathsLen; ++i)
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	191 Cout ("\n\t" ~ paths[i]);
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	192 } else
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	193 Cout ("[none]");
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	194 }
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	195
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	196 // Use a static array to store all possible paths with separate length counters.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	197 // Lowest priority paths are first.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	198 char[][MAX_PATHS] paths;
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	199 ubyte pathsLen = 0;
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	200 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	201
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	202 /** These are the actual instances, one for each of the data and conf "directories". */
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	203 mdeDirectory dataDir, confDir;
101 71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	204 char[] logDir; /// Directory for log files
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	205
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	206 //BEGIN Path resolution
107 20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	207 /** Find at least one path for each required directory. */
20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	208 debug (mdeUnitTest) {
20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	209 /** In unittest mode, add paths unittest/data and unittest/conf before init runs. */
20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	210 static this () {
20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	211 dataDir.tryPath ("unittest/data");
20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	212 confDir.tryPath ("unittest/conf");
20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	213 if (!(dataDir.pathsLen && confDir.pathsLen))
20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	214 throw new mdeException ("Fatal: unittest/data and unittest/conf don't both exist");
20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	215 // Don't bother with real paths or logDir or font dir(s) for unittest.
20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	216 }
20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	217 }
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	218 version (linux) {
101 71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	219 SortedMap!(char[],char[]) fontFiles; // key is file name, value is CString path
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	220 /** Get the actual path of a font file, or throw NoFileException if not found.
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	221 *
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	222 * Returns a C string (null terminated). */
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	223 char[] getFontPath (char[] file) {
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	224 char[] ret;
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	225 if (fontFiles.get (file, ret))
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	226 return ret;
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	227 throw new NoFileException ("Unable to find font file: "~file);
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	228 }
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	229
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	230 // base-path not used on posix
101 71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	231 void resolvePaths (char[] base = "data") {
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	232 // Home directory:
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	233 char[] HOME = Environment.get("HOME", ".");
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	234
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	235 // Base paths:
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	236 // Static data (must exist):
67 108d123238c0 Changes to work with tango r3700 (post 0.99.6). Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	237 FilePath staticPath =
101 71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	238 findPath (false, "/usr/share/games/mde", "/usr/local/share/games/mde", base);
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	239 // Config (can just use defaults if necessary, so long as we can save afterwards):
67 108d123238c0 Changes to work with tango r3700 (post 0.99.6). Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	240 FilePath userPath = findPath (true, HOME~"/.config/mde", HOME~"/.mde");
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	241
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	242 // Static data paths:
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	243 dataDir.addPath (staticPath.toString); // we know this is valid anyway
107 20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	244 dataDir.tryPath (userPath.toString ~ "/data");
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	245 if (extraDataPath) dataDir.tryPath (extraDataPath);
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	246 if (!dataDir.pathsLen) throw new mdeException ("Fatal: no data path found!");
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	247
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	248 // Configuration paths:
107 20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	249 confDir.tryPath (staticPath.toString ~ "/conf");
24 32eff0e01c05 Only locally-changed options are stored in user-config now. Log levels revised. Diggory Hardy <diggory.hardy@gmail.com> parents: 18 diff changeset	250 confDir.tryPath ("/etc/mde");
107 20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	251 confDir.tryPath (userPath.toString ~ "/conf", true);
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	252 if (extraConfPath) confDir.tryPath (extraConfPath);
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	253 if (!confDir.pathsLen) throw new mdeException ("Fatal: no conf path found!");
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	254
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	255 // Logging path:
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	256 logDir = userPath.toString;
101 71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	257
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	258 // Font paths:
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	259 auto fs = new FileScan;
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	260 // Scan for directories containing truetype and type1 fonts:
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	261 fs.sweep ("/usr/share/fonts", (FilePath fp, bool isDir)
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	262 { return isDir \|\| fp.suffix == ".ttf" \|\| fp.suffix == ".pfb"; },
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	263 true);
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	264 fontFiles = new SortedMap!(char[],char[]);
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	265 foreach (fp; fs.files)
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	266 fontFiles.add (fp.file, fp.cString); // both strings should be slices of same memory
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	267 logger.trace ("found {} font files, {} dirs", fs.files.length, fs.folders.length);
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	268 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	269 } else version (Windows) {
101 71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	270 char[] fontDir;
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	271 /** Get the actual path of a font file, or throw NoFileException if not found.
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	272 *
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	273 * Returns a C string (null terminated). */
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	274 char[] getFontPath (char[] file) {
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	275 FilePath path = new FilePath (fontDir~file);
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	276 if (path.exists && !path.isFolder)
102 ba035eba07b4 Compilation fixes for windows and unittest code. Cyborg16@cyborg64-win.lan parents: 101 diff changeset	277 return path.cString;
101 71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	278 throw new NoFileException ("Unable to find font file: "~file);
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	279 }
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	280
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	281 void resolvePaths (char[] base = "./") {
101 71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	282 //FIXME: Get base path from registry
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	283
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	284 // Base paths:
67 108d123238c0 Changes to work with tango r3700 (post 0.99.6). Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	285 FilePath installPath = findPath (false, base);
101 71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	286 FilePath staticPath = findPath (false, installPath.toString);
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	287 FilePath userPath = findPath (true, getSpecialPath(CSIDL_LOCAL_APPDATA) ~ "/mde");
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	288
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	289 // Static data paths:
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	290 dataDir.addPath (staticPath.toString); // we know this is valid anyway
107 20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	291 dataDir.tryPath (userPath.toString ~ "/data");
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	292 if (extraDataPath) dataDir.tryPath (extraDataPath);
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	293 if (!dataDir.pathsLen) throw new mdeException ("Fatal: no data path found!");
28 b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	294
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	295 // Configuration paths:
107 20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	296 confDir.tryPath (staticPath.toString ~ "/conf");
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	297 confDir.tryPath (installPath.append("user").toString);
107 20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	298 confDir.tryPath (userPath.toString ~ "/conf", true);
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	299 if (extraConfPath) confDir.tryPath (extraConfPath);
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	300 if (!confDir.pathsLen) throw new mdeException ("Fatal: no conf path found!");
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	301
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	302 // Logging path:
28 b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	303 logDir = userPath.toString;
101 71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	304
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	305 // Font path:
71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 91 diff changeset	306 fontDir = getSpecialPath (CSIDL_FONTS) ~ "/"; // append separator
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	307 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	308 } else {
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	309 static assert (false, "Platform is not linux or Windows: no support for paths on this platform yet!");
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	310 }
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	311
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	312 /// For command line args: these paths are added if non-null, with highest priority.
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	313 char[] extraDataPath, extraConfPath;
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	314
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	315 private {
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	316 class PathException : mdeException {
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	317 this(char[] msg) {
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	318 super (msg);
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	319 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	320 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	321
107 20f7d813bb0f Translation: now has a file for each locale, instead of a file for each section. Items updated; all strings translated. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	322 // The maximum number of paths for any one "directory".
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	323 const MAX_PATHS = 4;
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	324
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	325 /* Try each path in succession, returning the first to exist and be a folder.
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	326 * If none are valid and create is true, will try creating each in turn.
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	327 * If still none are valid, throws. */
67 108d123238c0 Changes to work with tango r3700 (post 0.99.6). Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	328 FilePath findPath (bool create, char[][] paths ...) {
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	329 FilePath[] fps;
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	330 fps.length = paths.length;
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	331 foreach (i,path; paths) {
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	332 FilePath pv = new FilePath (path);
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	333 if (pv.exists && pv.isFolder) return pv; // got a valid path
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	334 fps[i] = pv;
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	335 }
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	336 if (create) { // try to create a folder, using each path in turn until succesful
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	337 foreach (fp; fps) {
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	338 try {
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	339 return fp.create;
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	340 }
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	341 catch (Exception e) {}
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	342 }
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	343 }
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	344 // no valid path...
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	345 char[] msg = "Unable to find"~(create ? " or create" : "")~" a required path! The following were tried:";
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	346 foreach (path; paths) msg ~= " \"" ~ path ~ '\"';
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	347 throw new PathException (msg);
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	348 }
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	349 //END Path resolution
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	350
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	351 /** A special adapter for reading from multiple mergetag files with the same relative path to an
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	352 * mdeDirectory simultaneously.
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	353 */
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	354 class mdeReader : IReader
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	355 {
67 108d123238c0 Changes to work with tango r3700 (post 0.99.6). Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	356 private this (FilePath[] files, DataSet ds, bool rdHeader)
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	357 in {
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	358 assert (files !is null, "mdeReader.this: files is null");
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	359 } body {
63 66d555da083e Moved many modules/packages to better reflect usage. Diggory Hardy <diggory.hardy@gmail.com> parents: 53 diff changeset	360 // Don't let sub-readers create their own, separate, datasets:
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	361 if (ds is null) ds = new DataSet;
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	362
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	363 Exception exc;
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	364 foreach (file; files) {
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	365 try { // try reading header of each file
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	366 IReader r = makeReader (file, ds, rdHeader);
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	367 readers[readersLen++] = r;
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	368 } catch (Exception e) {
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	369 exc = e;
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	370 }
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	371 }
91 4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	372 if (readersLen == 0) // no files have valid headers
4d5d53e4f881 Shared alignment for dynamic content lists - finally implemented! Lots of smaller changes too. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	373 throw exc; // fail: re-throw last exception
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	374 }
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	375
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	376 DataSet dataset () { /// Get the DataSet
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	377 return readers[0].dataset; // all readers share the same dataset
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	378 }
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	379 void dataset (DataSet ds) { /// Set the DataSet
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	380 for (uint i = 0; i < readersLen; ++i) readers[i].dataset (ds);
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	381 }
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	382
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	383 void dataSecCreator (IDataSection delegate (ID) dsC) { /// Set the dataSecCreator
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	384 for (uint i = 0; i < readersLen; ++i) readers[i].dataSecCreator = dsC;
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	385 }
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	386
85 56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	387 /** Get identifiers for all sections.
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	388 *
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	389 * Note: the identifiers from all sections in all files are just strung together, starting with
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	390 * the highest-priority file. */
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	391 ID[] getSectionNames () {
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	392 ID[] names;
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	393 for (int i = readersLen-1; i >= 0; --i) names ~= readers[i].getSectionNames;
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	394 return names;
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	395 }
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	396 void read () { /// Commence reading
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	397 for (uint i = 0; i < readersLen; ++i) readers[i].read();
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	398 }
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	399 void read (ID[] secSet) { /// ditto
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	400 for (uint i = 0; i < readersLen; ++i) readers[i].read(secSet);
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	401 }
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	402 void read (IContainer !(ID) secSet) { /// ditto
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	403 for (uint i = 0; i < readersLen; ++i) readers[i].read(secSet);
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	404 }
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	405
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	406 private:
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	407 IReader[MAX_PATHS] readers;
f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	408 ubyte readersLen = 0;
85 56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	409
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	410 PRIORITY rdOrder;
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	411 }
75 25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 68 diff changeset	412 }
25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 68 diff changeset	413
25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 68 diff changeset	414 /// Thrown when makeMTReader couldn't find a file.
25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 68 diff changeset	415 class NoFileException : MTFileIOException {
25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 68 diff changeset	416 this (char[] msg) {
25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 68 diff changeset	417 super(msg);
25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 68 diff changeset	418 }
53 f000d6cd0f74 Changes to paths, command line arguments and font LCD rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	419 }

Mercurial > projects > mde

annotate mde/setup/paths.d @ 107:20f7d813bb0f