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

annotate mde/resource/paths.d @ 47:e0839643ff52

New mtcp utility and changes to paths. Changed some of mde.resource.paths and mde.mergetag.Reader's handling of resolving mergetag files, and allowed getting a list of files. Created a simple mergetag-file copy utility. Fixed mergetag's MTTReader getting array out of bounds exceptions (now throws a mergetag exception). committer: Diggory Hardy <diggory.hardy@gmail.com>

author	Diggory Hardy <diggory.hardy@gmail.com>
date	Fri, 23 May 2008 13:13:08 +0100
parents	07bd1a09e161
children	f000d6cd0f74

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:
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	29 * All paths are stored internally as strings, rather than as an instance of FilePath/PathView once
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. */
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	32 module mde.resource.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	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;
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	35 import mde.mergetag.Reader;
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	36 import mde.mergetag.Writer;
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	37 import mde.mergetag.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	38 import mde.mergetag.exception;
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;
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	42 import tango.stdc.stdlib;
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	43 import tango.stdc.stringz;
28 b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	44 //import tango.scrapple.sys.win32.Registry; // Trouble getting this to work
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	45
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	46 /** 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	47 *
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	48 * 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	49 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	50
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	51 /** 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	52 *
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	53 * 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	54 *
32eff0e01c05 Only locally-changed options are stored in user-config now. Log levels revised. Diggory Hardy <diggory.hardy@gmail.com> parents: 18 diff changeset	55 * 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	56 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	57 {
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 /** 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	59 *
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 * 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	61 * 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	62 * (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	63 * 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	64 * 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	65 * 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	66 * 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	67 * 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	68 * 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	69 * 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	70 * 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	71 * 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	72 */
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 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	74 {
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	75 PathView[] files = getFiles (file, readOrder);
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	76 if (files is null)
27 0aa621b3e070 Some GUI work, plus a small fix in the paths module. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	77 throw new MTFileIOException ("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	78
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	79 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	80 }
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
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 /** 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	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 * 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	85 * 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	86 * (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	87 * 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	88 */
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	89 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	90 {
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 // 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	92 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	93 }
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
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	95 /** 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	96 * 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	97 char[] getFileName (char[] file, PRIORITY readOrder)
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	98 {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	99 PathView[] files = getFiles (file, readOrder);
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	100 if (files is null)
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	101 return "no file found";
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	102
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	103 char[] ret = files[0].toString;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	104 foreach (f; files[1..$])
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	105 ret ~= ", " ~ f.toString;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	106 return ret;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	107 }
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	108
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	109 /** Check whether the given file exists under any path with either .mtt or .mtb 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	110 bool exists (char[] 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	111 for (uint i = 0; i < pathsLen; ++i) {
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	112 if (FilePath (paths[i]~file~".mtt").exists) return 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	113 if (FilePath (paths[i]~file~".mtb").exists) return 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	114 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	115 return 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	116 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	117
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	118 private:
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	119 PathView[] getFiles (char[] filename, PRIORITY readOrder)
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	120 in {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	121 assert (readOrder == PRIORITY.LOW_HIGH \|\|
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	122 readOrder == PRIORITY.HIGH_LOW \|\|
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	123 readOrder == PRIORITY.HIGH_ONLY );
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	124 } body {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	125 PathView[] ret;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	126 if (readOrder == PRIORITY.LOW_HIGH) {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	127 for (size_t i = 0; i < pathsLen; ++i) {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	128 PathView file = findFile (paths[i]~filename);
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	129 if (file !is null)
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	130 ret ~= file;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	131 }
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	132 } else {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	133 for (int i = pathsLen - 1; i >= 0; --i) {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	134 PathView file = findFile (paths[i]~filename);
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	135 if (file !is null) {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	136 ret ~= file;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	137 if (readOrder == PRIORITY.HIGH_ONLY) break;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	138 }
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	139 }
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	140 }
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	141 return ret;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	142 }
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	143
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	144 // 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	145 void addPath (char[] 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	146 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	147 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	148
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	149 // 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	150 bool tryPath (char[] path, bool create = false) {
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	151 FilePath fp = FilePath (path);
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	152 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	153 paths[pathsLen++] = path~'/';
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	154 return true;
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	155 } else if (create) {
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	156 try {
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	157 fp.create;
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	158 paths[pathsLen++] = fp.toString~'/';
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	159 return true;
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	160 } catch (Exception e) {
28 b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	161 // 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	162 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	163 }
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	164 }
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	165 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	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
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	168 // 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	169 // 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	170 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	171 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	172 }
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
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	174 /** 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	175 mdeDirectory dataDir, confDir;
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	176 char[] logDir;
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	177
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	178 //BEGIN Path resolution
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	179 // These are used several times:
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	180 const DATA = "/data";
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	181 const CONF = "/conf";
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	182
28 b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	183 /** Find at least one path for each required directory.
b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	184 *
b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	185 * Note: the logger cannot be used yet, so only output is exception messages. */
44 07bd1a09e161 Started implementing text rendering. Diggory Hardy <diggory.hardy@gmail.com> parents: 28 diff changeset	186 // FIXME: use tango/sys/Environment.d
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	187 version (linux) {
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	188 void resolvePaths () {
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	189 // Home 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	190 char[] HOME = fromStringz (getenv (toStringz ("HOME")));
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	191
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	192 // Base paths:
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	193 // Static data (must exist):
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	194 PathView staticPath = findPath (false, "/usr/share/games/mde", "/usr/local/share/games/mde", "data");
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	195 // Config (can just use defaults if necessary, so long as we can save afterwards):
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	196 PathView 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	197
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 // Static data paths:
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	199 dataDir.addPath (staticPath.toString); // we know this is valid anyway
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	200 dataDir.tryPath (userPath.toString ~ DATA);
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	201 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	202
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 // Configuration paths:
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	204 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	205 confDir.tryPath ("/etc/mde");
32eff0e01c05 Only locally-changed options are stored in user-config now. Log levels revised. Diggory Hardy <diggory.hardy@gmail.com> parents: 18 diff changeset	206 confDir.tryPath (userPath.toString ~ CONF, true);
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	207 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	208
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	209 // Logging path:
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	210 logDir = userPath.toString;
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	211 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	212 } else version (Windows) {
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	213 void resolvePaths () {
28 b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	214 //FIXME: Get path from registry
b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	215 //FIXME: Get user path (Docs&Settings/USER/Local Settings/Application data/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	216
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	217 // Base paths:
28 b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	218 PathView installPath = findPath (false, "");;
b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	219 PathView userPath = findPath (true, "user"); // FIXME: see above
b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	220 PathView staticPath = findPath (false, "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	221
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	222 // Static data paths:
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	223 dataDir.addPath (staticPath.toString); // we know this is valid anyway
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	224 dataDir.tryPath (userPath.toString ~ DATA);
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	225 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	226
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	227 // Configuration 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	228 confDir.tryPath (staticPath.toString ~ CONF);
28 b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	229 confDir.tryPath ("conf");
b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	230 confDir.tryPath (userPath.toString ~ CONF, true);
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	231 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	232
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	233 // Logging path:
28 b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	234 logDir = userPath.toString;
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	235 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	236 } 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	237 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	238 }
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	239
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	240 private:
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	241 // The maximum number of paths for any one "directory".
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	242 // There are NO CHECKS that this is not exceeded.
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	243 const MAX_PATHS = 3;
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	244
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	245 /* Try each path in succession, returning the first to exist and be a folder.
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	246 * If none are valid and create is true, will try creating each in turn.
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	247 * If still none are valid, throws. */
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	248 PathView findPath (bool create, char[][] paths ...) {
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	249 foreach (path; paths) {
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	250 PathView pv = new FilePath (path);
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	251 if (pv.exists && pv.isFolder) return pv; // got a valid path
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	252 }
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	253 if (create) { // try to create a folder, using each path in turn until succesful
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	254 foreach (path; paths) {
28 b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	255 FilePath fp = new FilePath (path);
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	256 try {
28 b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	257 return fp.create;
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	258 }
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	259 catch (Exception e) {}
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	260 }
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	261 }
56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	262 // no valid path...
28 b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	263 char[] msg = "Unable to find"~(create ? " or create" : "")~" a required path! The following were tried:";
b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	264 foreach (path; paths) msg ~= " \"" ~ path ~ '\"';
b5fadd8d930b Small addition to GUI, paths work-around for Windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 27 diff changeset	265 throw new mdeException (msg);
18 56a42ec95024 Changes to Init and logging. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	266 }
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	267 //END Path resolution
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 /** A special adapter for reading from multiple mergetag files with the same relative path to an
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	270 * mdeDirectory simultaneously.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	271 */
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	272 class mdeReader : IReader
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	273 {
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	274 private this (PathView[] files, DataSet ds, bool rdHeader)
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	275 in {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	276 assert (files !is null, "mdeReader.this: files is null");
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	277 } body {
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	278 if (ds is null) ds = new 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	279
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	280 foreach (file; files) {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	281 IReader r = makeReader (file, ds, rdHeader);
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	282
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 44 diff changeset	283 readers[readersLen++] = r;
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	284 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	285 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	286
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	287 DataSet dataset () { /// Get the 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	288 return readers[0].dataset; // all readers share the same 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	289 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	290 void dataset (DataSet ds) { /// Set the 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	291 for (uint i = 0; i < readersLen; ++i) readers[i].dataset (ds);
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	292 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	293
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	294 void dataSecCreator (IDataSection delegate (ID) dsC) { /// Set the dataSecCreator
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 for (uint i = 0; i < readersLen; ++i) readers[i].dataSecCreator = dsC;
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	296 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	297
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	298 /** Get identifiers for all sections.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	299 *
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	300 * Note: the identifiers from all sections in all files are just strung together, starting with
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	301 * the highest-priority 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	302 ID[] getSectionNames () {
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	303 ID[] names;
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	304 for (int i = readersLen-1; i >= 0; --i) names ~= readers[i].getSectionNames;
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	305 return names;
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	306 }
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 void read () { /// Commence reading
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 for (uint i = 0; i < readersLen; ++i) readers[i].read();
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 }
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 void read (ID[] secSet) { /// ditto
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	311 for (uint i = 0; i < readersLen; ++i) readers[i].read(secSet);
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	312 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	313 void read (View!(ID) secSet) { /// ditto
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	314 for (uint i = 0; i < readersLen; ++i) readers[i].read(secSet);
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	315 }
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	316
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	317 private:
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	318 IReader[MAX_PATHS] readers;
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 ubyte readersLen = 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	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 PRIORITY rdOrder;
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	322 }

Mercurial > projects > mde

annotate mde/resource/paths.d @ 47:e0839643ff52