zip.patch

Abdelghani Omari, 05/06/2017 04:50 PM

     	for(int i = 0; i < entries; i++) {
     		if(zip->Get32le() != 0x02014b50 && zip->IsEof())
     			return;
     		File& f = file.Add();
     		File f;
     		zip->Get16le();
     		zip->Get16le();
     		f.bit = zip->Get16le();  // general purpose bit flag
-...
     		zip->Get32le(); // external file attributes
     		f.offset = zip->Get32le();
     		f.path = zip->Get(fnlen);
     		file.Add(f);
     		zip->SeekCur(extralen + commentlen);
     		if(zip->IsEof() || zip->IsError())
     			return;
-...
     	return ReadFile(ss, progress) ? ss.GetResult() : String::GetVoid();
+    }
     String UnZip::ReadFile(const char* path, Gate<int, int> progress)
+    {
     	for(int i = 0; i < file.GetCount(); i++)
+    	{
     		if(file[i].path.IsEqual(path))
+    		{
     			Seek(i);
     			return ReadFile( progress );
+    		}
+    	}
     	return String::GetVoid();
+    }
     Vector<String> UnZip::Search(String pattern)
+    {
     	Vector<String> v;
     	for(const auto& f: file)
+    	{
     		if(!f.path.EndsWith("/") && PatternMatch(pattern, f.path))
+    		{
     			v.Add(f.path);
+    		}
+    	}
     	return v;
+    }
     void UnZip::Create(Stream& _zip)
+    {
     	zip = &_zip;

     	void   SkipFile()             { current++; }
     	bool   ReadFile(Stream& out, Gate<int, int> progress = Null);
     	String ReadFile(Gate<int, int> progress = Null);
     	String ReadFile(const char* path, Gate<int, int> progress = Null);
     	Vector<String> Search(String pattern);
     	dword  GetPos() const;