- for(TrackMap::iterator i=tracks.begin(); i!=tracks.end(); ++i)
- delete i->second;
- for(SignalMap::iterator i=signals.begin(); i!=signals.end(); ++i)
- delete i->second;
- for(VehicleMap::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
- delete i->second;
-}
-
-float Catalogue::get_rail_elevation() const
-{
- return ballast_profile.get_height()+rail_profile.get_height();
-}
-
-void Catalogue::add_track(TrackType &track)
-{
- insert_unique(tracks, track.get_article_number(), &track);
- signal_track_added.emit(track);
-}
-
-const TrackType &Catalogue::get_track(const ArticleNumber &art_nr) const
-{
- return *get_item(tracks, art_nr);
-}
-
-void Catalogue::add_vehicle(VehicleType &veh)
-{
- insert_unique(vehicles, veh.get_article_number(), &veh);
- signal_vehicle_added.emit(veh);
-}
-
-const VehicleType &Catalogue::get_vehicle(const ArticleNumber &art_nr) const
-{
- return *get_item(vehicles, art_nr);
-}
-
-void Catalogue::add_signal(SignalType &sig)
-{
- insert_unique(signals, sig.get_article_number(), &sig);
- signal_signal_added.emit(sig);
-}
-
-const SignalType &Catalogue::get_signal(const ArticleNumber &art_nr) const
-{
- return *get_item(signals, art_nr);
+ add_type<TrackType>().keyword("track");
+ add_type<SignalType>().keyword("signal");
+ add_type<VehicleType>().suffix(".veh").keyword("vehicle");
+ add_type<TerrainType>().suffix(".terr").keyword("terrain");
+ add_type<TrackAppearance>().suffix("trkapp").keyword("track_appearance");
+
+ add_source("data/r2c2");
+}
+
+void Catalogue::add_source(const FS::Path &path)
+{
+ string ext = FS::extpart(path.str());
+ DataFile::CollectionSource *source = 0;
+ IO::Seekable *init_file = 0;
+ if(ext==".mdt")
+ {
+ DataFile::PackSource *pack_source = new DataFile::PackSource;
+ pack_source->add_pack_file(path.str());
+ source = pack_source;
+
+ list<DataFile::PackSource::FileInfo> files = pack_source->list_files();
+ for(list<DataFile::PackSource::FileInfo>::const_iterator i=files.begin(); i!=files.end(); ++i)
+ {
+ string fext = FS::extpart(i->name);
+ if(fext==".cat" && !init_file)
+ init_file = pack_source->open(i->name);
+ }
+ }
+ else if(FS::is_dir(path))
+ {
+ DataFile::DirectorySource *dir_source = new DataFile::DirectorySource;
+ dir_source->add_directory(path);
+
+ list<FS::Path> queue;
+ queue.push_back(path);
+ while(!queue.empty())
+ {
+ FS::Path dir = queue.front();
+ queue.pop_front();
+ list<string> files = FS::list_files(dir);
+ for(list<string>::const_iterator i=files.begin(); i!=files.end(); ++i)
+ {
+ FS::Path full = dir/ *i;
+ if(FS::is_dir(full))
+ {
+ dir_source->add_directory(full);
+ queue.push_back(full);
+ }
+
+ string fext = FS::extpart(*i);
+ if(fext==".cat" && !init_file)
+ init_file = new IO::BufferedFile(full.str());
+ }
+ }
+
+ source = dir_source;
+ }
+
+ sources.push_back(source);
+ Collection::add_source(*source);
+ signal_source_added.emit(*source);
+
+ if(init_file)
+ {
+ DataFile::Parser parser(*init_file, path.str());
+ Loader ldr(*this);
+ ldr.load(parser);
+ }
+ delete init_file;