projects/mde: mde/file/mergetag/Reader.d annotate

annotate mde/file/mergetag/Reader.d @ 85:56c0ddd90193

Intermediate commit (not stable). Changes to init system.

author	Diggory Hardy <diggory.hardy@gmail.com>
date	Thu, 11 Sep 2008 11:33:51 +0100
parents	ac1e3fd07275
children	2212285f714c

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
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	16 /**************************************************************************************************
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	17 * This module contains all reading functions, for both binary and text MergeTag files.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	18 *************************************************************************************************/
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: 80 diff changeset	19 module mde.file.mergetag.Reader;
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	20
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	21 // package imports
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: 80 diff changeset	22 public import mde.file.mergetag.iface.IReader;
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: 80 diff changeset	23 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: 80 diff changeset	24 import mde.file.mergetag.DefaultData;
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: 80 diff changeset	25 import mde.file.mergetag.exception;
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: 80 diff changeset	26 import mde.file.mergetag.internal;
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	27
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	28 import tango.core.Exception;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	29
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	30 // tango imports
67 108d123238c0 Changes to work with tango r3700 (post 0.99.6). Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	31 import tango.io.FilePath;
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	32 import tango.io.UnicodeFile;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	33 import Util = tango.text.Util;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	34 import ConvInt = tango.text.convert.Integer;
85 56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	35 import tango.util.container.HashSet;
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	36 import tango.util.log.Log : Log, Logger;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	37
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	38 private Logger logger;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	39 static this() {
82 ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	40 logger = Log.getLogger ("mde.file.mergetag.Reader");
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	41 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	42
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	43 // TODO: allow compressing with zlib for both binary and text? (.mtz, .mtt, .mtb extensions)
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	44
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	45 /** Make an IReader class.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	46 *
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	47 * Create an appropriate reader: MTTReader or MTBReader.
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	48 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	49 * Throws:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	50 * $(TABLE
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	51 * $(TR $(TH Exception) $(TH Thrown when))
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	52 * $(TR $(TD MTFileIOException) $(TD When extension given is neither mtt nor mtb))
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	53 * )
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	54 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	55 */
67 108d123238c0 Changes to work with tango r3700 (post 0.99.6). Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	56 IReader makeReader (FilePath path, DataSet ds = null, bool rdHeader = false) {
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	57 if (path.ext == "mtb") return new MTBReader (path, ds, rdHeader);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	58 else if (path.ext == "mtt") return new MTTReader (path, ds, rdHeader);
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	59 else throw new MTFileIOException ("Invalid mergetag extension");
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	60 }
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	61
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	62 /** Resolve a file path.
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	63 *
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	64 * Tries adding both ".mtt" and ".mtb" extensions, returning whichever exists (the most recently
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	65 * modified if both exist), or returns null if neither exist. */
67 108d123238c0 Changes to work with tango r3700 (post 0.99.6). Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	66 FilePath findFile (char[] path) {
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	67 if (path is null) return null;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	68
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	69 FilePath tPath = new FilePath (path ~ ".mtt");
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	70 FilePath bPath = new FilePath (path ~ ".mtb");
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	71
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	72 bool bPathExists = bPath.exists;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	73
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	74 if (tPath.exists) {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	75 if (bPathExists) {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	76 // take the latest version (roughly speaking...)
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	77 return (tPath.modified > bPath.modified ? tPath : bPath);
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	78 } else return tPath;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	79 } else {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	80 if (bPathExists) return bPath;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	81 else return null;
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	82 }
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	83 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	84
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	85 /**
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: 14 diff changeset	86 * Class for reading a mergetag text file.
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	87 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	88 * Use as:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	89 * -----------------------
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	90 * IReader foo;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	91 * try {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	92 * foo = new MTTReader("foo.mtt");
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	93 * foo.read();
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	94 * }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	95 * catch (MTException) {}
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	96 * // get your data from foo.dataset.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	97 * -----------------------
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	98 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	99 * Throws:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	100 * $(TABLE
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	101 * $(TR $(TH Exception) $(TH Thrown when))
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	102 * $(TR $(TD MTFileIOException) $(TD An error occurs while opening the file))
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	103 * $(TR $(TD MTFileFormatException) $(TD The file doesn't start with a recognised header/version))
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	104 * $(TR $(TD MTSyntaxException) $(TD A file syntax error occurs))
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	105 * $(TR $(TD MTException) $(TD An unexpected error occurs))
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	106 * )
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	107 * Note that all exceptions extend MTException and when any exception is thrown the class is
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	108 * rendered unusable: any subsequent calls to read will be ignored.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	109 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	110 * Threading: Separate instances of Reader should be thread-safe provided access to the same
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	111 * dataset is synchronized; i.e. no two readers refering to the same dataset should run
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	112 * simultaneously. (The Reader class could be made thread-safe w.r.t. datasets, but
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	113 * performance-wise I doubt it would be worth it.)
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	114 * Do not run a single instance of Reader in multiple threads simultaneously.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	115 */
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	116 class MTTReader : IReader
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	117 {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	118 //BEGIN DATA
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	119 /** Get or set the DataSet
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	120 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	121 * A container for all read data.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	122 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	123 * This may be accessed from here; however it may be preferable to use an external reference
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	124 * (passed to the class on initialisation).
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	125 */
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	126 DataSet dataset () { return _dataset; }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	127 void dataset (DataSet ds) /// ditto
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	128 { _dataset = ds; }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	129
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	130 /** A delegate for creating new DataSections within the dataset.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	131 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	132 * Allows a user-made class to be used in the DataSet instead of DefaultData (used if no
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	133 * dataSecCreator exists). Also allows an existing class instance to be used instead of a new
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	134 * one.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	135 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	136 * This works by supplying a function which returns a reference to an instance of a class
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	137 * implementing IDataSection. The function is passed the ID of the new section and may use this
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	138 * to use different IDataSection classes for different sections.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	139 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	140 * The function may also return null, in which case the section will be skipped. In the version
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	141 * of read taking a set of sections to read, the section will not be marked as read and may
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	142 * still be read later (assuming dataSecCreator returns non-null). However, in the version of
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	143 * read not taking the set argument, all sections are set as read regardless, and the section
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	144 * cannot be read later.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	145 */
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	146 void dataSecCreator (IDataSection delegate (ID) dSC) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	147 _dataSecCreator = dSC;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	148 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	149
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	150 private:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	151 // Non-static symbols:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	152 final char[] ErrFile; // added after ErrInFile to do the same without the "in " bit.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	153 final char[] ErrInFile; // something like "in \"path/file.mtt\""
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	154
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	155 final char[] fbuf; // file is read into this
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	156 MTFormatVersion.VERS fileVer = MTFormatVersion.VERS.INVALID; // Remains INVALID until set otherwise by CTOR.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	157
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	158 IDataSection delegate (ID) _dataSecCreator = null; // see property setter above
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	159
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	160 size_t endOfHeader;
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	161 bool allRead = false; // true if endOfHeader == fbuf.length or read([]) has run
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	162 bool fatal = false; // a fatal file error occured; don't try to recover
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	163 /* If the file is scanned for sections, the starting position of all sections are stored
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	164 * in secTable. If this is empty, either no sections exist (and endOfHeader == fbuf.length)
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	165 * or a section scan has not been run (read() with no section names doesn't need to do so).
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	166 */
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	167 struct SecMD { // sec meta data
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	168 static SecMD opCall (size_t _pos, bool _read) {
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	169 SecMD ret;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	170 ret.pos = _pos;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	171 ret.read = _read;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	172 return ret;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	173 }
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	174 size_t pos; // position to start reading
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	175 bool read; // true if already read
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	176 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	177 SecMD [ID] secTable;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	178
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	179 DataSet _dataset;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	180 //END DATA
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	181
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	182 //BEGIN METHODS: CTOR / DTOR
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	183 /** Tries to open file path and read it into a buffer.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	184 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	185 * Params:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	186 * path = The name or FilePath of the file to open.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	187 * Standard extensions are .mtt and .mtb for text and binary files respectively.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	188 * ds = If null create a new DataSet, else use existing DataSet ds and merge read
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	189 * data into it.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	190 * rdHeader = If true, read the header like a standard section. Doesn't read the header by
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	191 * default since if it's not requested it's likely not wanted.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	192 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	193 * Memory:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	194 * This currently works by loading the whole file into memory at once. This should be fine most
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	195 * of the time, but could potentially be a problem. Changing this would mean significantly
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	196 * changes to the way the code works.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	197 */
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	198 /* Ideas for implementing a partial-loading memory model:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	199 * Use a conduit directly.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	200 * Use a fiber to do the parsing; let it switch back when it runs out of memory.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	201 * Redesign the code so it never needs to look backwards in the buffer?
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	202 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	203 * Major problem: reading only some sections and keeping references to other sections
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	204 * would no longer be possible.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	205 */
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	206 public this (char[] path, DataSet ds = null, bool rdHeader = false) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	207 this (new FilePath (path), ds, rdHeader);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	208 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	209 /** ditto */
67 108d123238c0 Changes to work with tango r3700 (post 0.99.6). Diggory Hardy <diggory.hardy@gmail.com> parents: 47 diff changeset	210 public this (FilePath path, DataSet ds = null, bool rdHeader = false) {
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	211 // Create a dataset or use an existing one
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	212 if (ds !is null) _dataset = ds;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	213 else _dataset = new DataSet();
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	214
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	215 // Open & read the file
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	216 try { // Supports unicode files with a BOM; defaults to UTF8 when there isn't a BOM:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	217 scope file = new UnicodeFile!(char) (path, Encoding.Unknown);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	218 fbuf = cast(char[]) file.read();
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	219 } catch (Exception e) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	220 throwMTErr ("Error reading file: " ~ e.msg, new MTFileIOException);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	221 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	222 // Remember the file name so that we can report errors (somewhat) informatively:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	223 ErrFile = path.path ~ path.file;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	224 ErrInFile = " in \"" ~ ErrFile ~ '"';
24 32eff0e01c05 Only locally-changed options are stored in user-config now. Log levels revised. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	225
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	226 // Version checking & matching header section tag:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	227 if (fbuf.length < 6 \|\| fbuf[0] != '{' \|\| fbuf[1] != 'M' \|\| fbuf[2] != 'T' \|\| fbuf[5] != '}')
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	228 throwMTErr("Not a valid MergeTag text file" ~ ErrInFile, new MTFileFormatException);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	229 fileVer = MTFormatVersion.parseString (fbuf[3..5]);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	230 if (fileVer == MTFormatVersion.VERS.INVALID)
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	231 throwMTErr("Unrecognised MergeTag version: MT" ~ fbuf[3..5] ~ ErrInFile, new MTFileFormatException);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	232
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	233 // Header reading/skipping:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	234 if (rdHeader) { // only bother actually reading it if it was requested
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	235 // If already existing, merge; else create a new DefaultData.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	236 if (!_dataset.header) _dataset.header = new DefaultData;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	237 endOfHeader = parseSection (6, cast(IDataSection) _dataset.header);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	238 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	239 else endOfHeader = parseSection (6,null);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	240 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	241 //END METHODS: CTOR / DTOR
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	242
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	243 //BEGIN METHODS: PUBLIC
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	244 /** Scans for sections if not already done and returns a list of IDs.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	245 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	246 * Won't work (will return an empty array) if all sections have already been read without
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	247 * scanning for sections.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	248 */
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: 14 diff changeset	249 public ID[] getSectionNames () {
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	250 if (fatal) return [];
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	251 if (!secTable.length) read([]); // scan for sections
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: 14 diff changeset	252 return secTable.keys;
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	253 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	254
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	255 /** Reads (some) sections of the file into data. Note that sections will never be _read twice.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	256 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	257 * To be more accurate, the file is copied into a buffer by this(). read() then parses the
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	258 * contents of this buffer, and stores the contents in dataset.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	259 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	260 * Each section read is stored in a DataSection class. By default this is an instance of
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	261 * DefaultData; this can be customised (see dataSecCreator).
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	262 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	263 * If secSet is provided, reading is restricted to sections given in secSet, otherwise all
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	264 * sections are read. Sections given in secSet but not found in the file are not reported as an
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	265 * error. Suggested: supply a HashSet!(uint) as the View!(ID). An ArrayBag!(ID) as used is not a
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	266 * good choice, except that in this case it's empty.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	267 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	268 * Merging:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	269 * Where a section already exists in the DataSet (when either the section is given more than
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	270 * once in the file, or it was read from a different file by another reader) it is merged.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	271 * Entries already in the DataSet take priority.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	272 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	273 * Performance:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	274 * Note that loading only desired sections like this still parses the sections not
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	275 * read (although it does not try to understand the type or data fields), so there is only a
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	276 * small performance advantage to this where other sections do exist in the file. There is also
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	277 * some overhead in only partially reading the file to keep track of where other sections are so
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	278 * that the entire file need not be re-read if further (or all remaining) sections are read
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	279 * later.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	280 */
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	281 public void read () {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	282 if (secTable.length) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	283 foreach (ID id, ref SecMD smd; secTable) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	284 if (!smd.read) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	285 IDataSection ds = getOrCreateSec (id);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	286 parseSection (smd.pos, ds);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	287 // allRead is set true so there's no point setting smd.read = true
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	288 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	289 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	290 } else { // this time we don't need to use secTable
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	291 for (size_t pos = endOfHeader; pos < fbuf.length;) {
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	292 ID id = fbufReadSecMarker (pos);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	293 IDataSection ds = getOrCreateSec (id);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	294 pos = parseSection (pos, ds);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	295 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	296 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	297
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	298 allRead = true;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	299 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	300 /** ditto */
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	301 public void read (ID[] secSet) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	302 HashSet!(ID) hs = new HashSet!(ID);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	303 foreach (id; secSet) hs.add(id);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	304 read (hs);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	305 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	306 /** ditto */
85 56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	307 public void read (IContainer!(ID) secSet) {
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	308 if (allRead \|\| fatal) return; // never do anything in either case
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	309
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	310 if (secTable.length) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	311 foreach (ID id; secSet) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	312 SecMD* psmd = id in secTable;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	313 if (psmd && !psmd.read) { // may not exist
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	314 IDataSection ds = getOrCreateSec (id);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	315 parseSection (psmd.pos, ds);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	316 if (ds !is null) psmd.read = true; // getOrCreateSec may return null
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	317 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	318 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	319 } else {
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	320 for (size_t pos = endOfHeader; pos < fbuf.length;) {
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	321 ID id = fbufReadSecMarker (pos);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	322 secTable[id] = SecMD(pos,false); // add to table
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	323 if (secSet.contains(id)) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	324 IDataSection ds = getOrCreateSec (id);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	325 pos = parseSection (pos, ds);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	326 if (ds !is null) secTable[id].read = true;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	327 } else {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	328 pos = parseSection (pos, null); // skip section
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	329 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	330 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	331 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	332 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	333 //END METHODS: PUBLIC
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	334
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	335 //BEGIN METHODS: PRIVATE
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	336 /* Utility function for read
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	337 * Look for a section; return it if it exists otherwise create a new section:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	338 * use _dataSecCreator if it exists or just create a DefaultData if not.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	339 * However if _dataSecCreator returns null don't add it to the dataset.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	340 */
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	341 private IDataSection getOrCreateSec (ID id) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	342 IDataSection* i = id in _dataset.sec;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	343 if (i) return *i;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	344 else {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	345 IDataSection s;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	346 if (_dataSecCreator !is null) s = _dataSecCreator(id);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	347 else s = new DefaultData;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	348 if (s !is null) _dataset.sec[id] = s;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	349 return s;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	350 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	351 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	352
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	353 /* Reads a section, starting from index pos, finishing at the next section marker (returning
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	354 the position of the start of the marker). pos should start after the section marker.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	355
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	356 After analysing tags, the function passes the type, ID and data to addTag.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	357
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	358 NOTE: from performance tests on indexing char[]'s and dereferencing char's, the char's are
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	359 slightly faster, but a tiny difference isn't worth the extra effort/risk of using char*'s.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	360 */
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	361 private size_t parseSection (size_t pos, IDataSection dsec) {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	362 debug scope (failure)
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	363 logger.trace ("MTTReader.parseSection: failure");
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	364 /* Searches fbuf starting from start to find one of <=>\| and stops at its index.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	365
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	366 If quotable then be quote-aware for single and double quotes.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	367 Note: there's no length restriction for the content of the quote since it could be a single
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	368 non-ascii UTF-8 char which would look like several chars.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	369 */
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	370 void fbufLocateDataTagChar (ref size_t pos, bool quotable) {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	371 while (true) {
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	372 fbufIncrement (pos);
e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	373
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	374 if ((fbuf[pos] >= '<' && fbuf[pos] <= '>') \|\| fbuf[pos] == '\|') return;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	375 else if (quotable) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	376 char c = fbuf[pos];
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	377 if (c == '\'' \|\| c == '"') {
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	378 fbufIncrement(pos);
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	379 while (fbuf[pos] != c) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	380 if (fbuf[pos] == '\\') ++pos; // escape seq.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	381 fbufIncrement(pos);
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	382 }
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	383 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	384 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	385 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	386 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	387
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	388 // Used to ignore a tag (if it starts !< or !{ or should otherwise be ignored):
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	389 bool comment = false;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	390 for (; pos < fbuf.length; ++pos) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	391 if (Util.isSpace(fbuf[pos])) continue; // whitespace
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	392 else if (fbuf[pos] == '<') { // data tag
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	393 char[] ErrDTAG = "Bad data tag format: not <type\|id=data>" ~ ErrInFile;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	394
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	395 // Type section of tag:
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	396 size_t pos_s = pos + 1;
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	397 fbufLocateDataTagChar (pos, false); // find end of type section
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	398 if (fbuf[pos] != '\|') throwMTErr (ErrDTAG, new MTSyntaxException);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	399 char[] type = fbuf[pos_s..pos];
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	400
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	401 // ID section of tag:
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	402 pos_s = pos + 1;
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	403 fbufLocateDataTagChar (pos, false); // find end of type section
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	404 if (fbuf[pos] != '=') throwMTErr (ErrDTAG, new MTSyntaxException);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	405 ID tagID = cast(ID) fbuf[pos_s..pos];
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	406
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	407 // Data section of tag:
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	408 pos_s = pos + 1;
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	409 fbufLocateDataTagChar (pos, true); // find end of data section
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	410 if (fbuf[pos] != '>') throwMTErr (ErrDTAG, new MTSyntaxException);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	411 char[] data = fbuf[pos_s..pos];
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	412
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	413 if (!comment && dsec !is null) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	414 type = Util.trim(type);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	415 try {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	416 dsec.addTag (type, tagID, data);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	417 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	418 catch (TextException e) {
24 32eff0e01c05 Only locally-changed options are stored in user-config now. Log levels revised. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	419 logger.error ("TextException while reading " ~ ErrFile ~ ":"); // following a parse error
32eff0e01c05 Only locally-changed options are stored in user-config now. Log levels revised. Diggory Hardy <diggory.hardy@gmail.com> parents: 17 diff changeset	420 logger.error (e.msg);
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 67 diff changeset	421 logger.error ("Tag ignored: <"~type~"\|"~tagID~"="~data~">");
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	422 // No throw: tag is just ignored
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	423 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	424 catch (Exception e) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	425 logger.error ("Unknown error occured" ~ ErrInFile ~ ':');
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	426 logger.error (e.msg);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	427 throwMTErr (e.msg); // Fatal to Reader
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	428 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	429 } else comment = false; // cancel comment status now
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	430 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	431 else if (fbuf[pos] == '{') {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	432 if (comment) { // simple block comment
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	433 uint depth = 0; // depth of embedded comment blocks
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	434 while (true) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	435 fbufIncrement (pos);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	436 if (fbuf[pos] == '}') {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	437 if (depth == 0) break;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	438 else --depth;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	439 } else if (fbuf[pos] == '{')
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	440 ++depth;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	441 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	442 comment = false; // end of this comment
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	443 } else {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	444 return pos; // next section coming up; we are done
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	445 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	446 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	447 else if (fbuf[pos] == '!') { // possibly a comment; check next char
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	448 comment = true; // starting a comment (or an error)
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	449 // variable is reset at end of comment
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	450 } else // must be an error
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	451 throwMTErr ("Invalid character (or sequence starting \"!\") outside of tag" ~ ErrInFile, new MTSyntaxException);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	452 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	453 // if code execution reaches here, we're at EOF
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	454 // possible error: last character was ! (but don't bother checking since it's inconsequential)
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	455 return pos;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	456 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	457
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	458 /* Parses fbuf for a section marker. Already knows fbuf[pos] == '{'.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	459 */
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	460 private ID fbufReadSecMarker (ref size_t pos) {
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	461 // at this point pos is whatever a parseSection run returned
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	462 // since we haven't hit EOF, fbuf[pos] MUST be '{' so no need to check
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	463 fbufIncrement(pos);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	464
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	465 size_t start = pos;
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	466 for (; pos < fbuf.length; ++pos)
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	467 if (fbuf[pos] == '}' \|\| fbuf[pos] == '{') break;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	468
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	469 if (pos >= fbuf.length \|\| fbuf[pos] != '}')
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	470 throwMTErr ("Bad section tag format: not {id}" ~ ErrInFile, new MTSyntaxException);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	471
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	472 ID id = cast(ID) fbuf[start..pos];
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	473 fbufIncrement(pos);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	474 return id;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	475 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	476
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	477 /* Increments pos and checks it hasn't hit fbuf.length . */
47 e0839643ff52 New mtcp utility and changes to paths. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	478 private void fbufIncrement(ref size_t pos) {
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	479 ++pos;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	480 if (pos >= fbuf.length) throwMTErr("Unexpected EOF" ~ ErrInFile, new MTSyntaxException);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	481 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	482
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	483 private void throwMTErr (char[] msg, MTException exc = new MTException) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	484 fatal = true; // if anyone catches the error and tries to do anything --- we're dead now
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	485 logger.error (msg); // report the error
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	486 throw exc; // and signal our error
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	487 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	488 //END METHODS: PRIVATE
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	489 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	490
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: 14 diff changeset	491
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: 14 diff changeset	492 /**
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: 14 diff changeset	493 * Class for reading a mergetag text file.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: 14 diff changeset	494 *
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: 14 diff changeset	495 * Currently only a dummy class: a MTNotImplementedException will be thrown if created.
4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: 14 diff changeset	496 */
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	497 class MTBReader : IReader
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	498 {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	499 public this (char[] path, DataSet ds = null, bool rdHeader = false) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	500 this (new FilePath (path), ds, rdHeader);
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	501 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	502 public this (PathView path, DataSet ds = null, bool rdHeader = false) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	503 throw new MTNotImplementedException;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	504 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	505
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	506 DataSet dataset () { /// Get the DataSet
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	507 return null;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	508 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	509 void dataset (DataSet) {} /// Set the DataSet
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	510
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	511 void dataSecCreator (IDataSection delegate (ID)) {} /// Set the dataSecCreator
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	512
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: 14 diff changeset	513 ID[] getSectionNames () { /// Get identifiers for all sections
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	514 return [];
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	515 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	516 void read () {} /// Commence reading
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	517 void read (ID[] secSet) {} /// ditto
85 56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	518 void read (IContainer!(ID) secSet) {}/// ditto
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	519 }

Mercurial > projects > mde

annotate mde/file/mergetag/Reader.d @ 85:56c0ddd90193