X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Fpacksource.cpp;h=d054e1d4ee9e50ef99c8d9c136aee978237113bf;hp=c06b270e30d8ecb4ef4fed14840989ae85e5e47f;hb=835fcd2f79e8848fa0d92be667c0e02952e23436;hpb=a5d5fa04bcbe360fc55fdb25b45937b29fb5c9cd

diff --git a/source/packsource.cpp b/source/packsource.cpp
index c06b270..d054e1d 100644
--- a/source/packsource.cpp
+++ b/source/packsource.cpp
@@ -1,4 +1,5 @@
 #include <msp/strings/format.h>
+#include <msp/strings/regex.h>
 #include "collection.h"
 #include "packsource.h"
 
@@ -9,11 +10,26 @@ namespace DataFile {
 
 void PackSource::add_pack_file(const string &fn)
 {
-	packs.push_back(Pack(fn));
-	Pack &pack = packs.back();
-	DataFile::load(pack, fn);
+	add_pack_file(fn, string());
+}
+
+void PackSource::add_pack_file(const string &fn, const string &filter)
+{
+	Pack *pack = 0;
+	for(list<Pack>::iterator i=packs.begin(); (!pack && i!=packs.end()); ++i)
+		if(i->get_filename()==fn)
+			pack = &*i;
+	if(!pack)
+	{
+		packs.push_back(Pack(fn));
+		pack = &packs.back();
+		DataFile::load(*pack, fn);
+	}
 
-	pack.collect_objects(objects);
+	FileMap pack_files;
+	pack->collect_files(pack_files, filter);
+	for(FileMap::const_iterator i=pack_files.begin(); i!=pack_files.end(); ++i)
+		i->second->collect_objects(objects);
 }
 
 bool PackSource::is_loadable(const CollectionItemTypeBase &type, const string &name) const
@@ -76,10 +92,20 @@ PackSource::Pack::Pack(const string &fn):
 	base_offset(0)
 { }
 
-void PackSource::Pack::collect_objects(ObjectMap &objs) const
+void PackSource::Pack::collect_files(FileMap &fm, const string &filter) const
 {
-	for(list<File>::const_iterator i=files.begin(); i!=files.end(); ++i)
-		i->collect_objects(objs);
+	if(filter.empty())
+	{
+		for(list<File>::const_iterator i=files.begin(); i!=files.end(); ++i)
+			fm[i->get_filename()] = &*i;
+	}
+	else
+	{
+		Regex re(filter);
+		for(list<File>::const_iterator i=files.begin(); i!=files.end(); ++i)
+			if(re.match(i->get_filename()))
+				fm[i->get_filename()] = &*i;
+	}
 }