Changeset 295 for cpp/frams

Timestamp:

01/15/15 22:43:01 (10 years ago)

Author:

Maciej Komosinski

Message:

Reorganizations and extensions of directory/file/filesystem IO classes

Location:

cpp/frams/virtfile

Files:

• stdiofile.cpp (modified) (1 diff)
• stdiofile.h (modified) (6 diffs)
• stringfile.cpp (modified) (1 diff)
• stringfile.h (modified) (2 diffs)
• virtfile.cpp (modified) (3 diffs)
• virtfile.h (modified) (5 diffs)

cpp/frams/virtfile/stdiofile.cpp

@@ -37 +37 @@
 }
 
-int StdioFileSystem::Vfexists(const char* path)
+bool StdioFileSystem::Vfexists(const char* path)
 {
         return fileExists(path);

cpp/frams/virtfile/stdiofile.h

@@ -8 +8 @@
 #include "virtfile.h"
 #include <frams/util/sstring.h>
-#ifdef USE_MFILE
 #include <common/nonstd_stdio.h>
-#else
-#include <stdio.h>
-#endif
 #include <common/nonstd_dir.h>
 
@@ -19 +15 @@
 public:
         VirtFILE *Vfopen(const char *path, const char *mode);
-        int Vfexists(const char* path);
+        bool Vfexists(const char* path);
         VirtDIR *Vopendir(const char* path);
+        bool Vmkdir(const char* path) { return makeDirectory(path); }
+        bool Vdirexists(const char* path,bool is_writable) { return directoryExists(path,is_writable); }
 };
 
@@ -28 +26 @@
 protected:
         MFILE *file;
-        SString path;
 public:
-        StdioFILE(MFILE *f) { file = f; }
-        StdioFILE(MFILE *f, const SString& p) { file = f; path = p; }
+        StdioFILE(MFILE *f):VirtFILE("") { file = f; }
+        StdioFILE(MFILE *f, const SString& p):VirtFILE(p) { file = f; }
         static void setStdio();
         size_t Vread(void *ptr, size_t size, size_t nmemb) { return mfread(ptr, size, nmemb, file); }
@@ -41 +38 @@
         long Vtell() { return mftell(file); }
         int Vflush() { return 0; /*NOT IMPLEMENTED!*/ }
-        const char* VgetPath() { return path; }
 
         ~StdioFILE() { if (file) mfclose(file); }
@@ -50 +46 @@
 protected:
         FILE *file;
-        SString path;
 public:
-        StdioFILE(FILE *f) { file = f; }
-        StdioFILE(FILE *f, const SString& p) { file = f; path = p; }
+        StdioFILE(FILE *f):VirtFILE("") { file = f; }
+        StdioFILE(FILE *f, const SString& p):VirtFILE(p) { file = f; }
         static void setStdio();
         size_t Vread(void *ptr, size_t size, size_t nmemb) { return fread(ptr, size, nmemb, file); }
@@ -67 +62 @@
         void Vrewind() { rewind(file); }
         int Vflush() { return fflush(file); }
-        const char* VgetPath() { return path; }
 
         ~StdioFILE() { if (file) fclose(file); }

cpp/frams/virtfile/stringfile.cpp

@@ -71 +71 @@
         return (chain != NULL) ? chain->Vfopen(path, mode) : NULL;
 }
-
-int StringFileSystem::Vfexists(const char* path)
-{
-        return (chain != NULL) ? chain->Vfexists(path) : 0;
-}
-
-VirtDIR *StringFileSystem::Vopendir(const char* path)
-{
-        return (chain != NULL) ? chain->Vopendir(path) : NULL;
-}

cpp/frams/virtfile/stringfile.h

@@ -15 +15 @@
         long pos;
 public:
-        StringFILE(SString& s) :str(s), pos(0) {}
+        StringFILE(SString& s): VirtFILE(""), str(s), pos(0) {}
         size_t Vread(void *ptr, size_t size, size_t nmemb);
         size_t Vwrite(const void *ptr, size_t size, size_t nmemb) { str.append((const char*)ptr, (int)(size*nmemb)); return size*nmemb; }
@@ -38 +38 @@
 };
 
-class StringFileSystem : public VirtFileSystem
+class StringFileSystem : public ChainFileSystem
 {
 public:
-        VirtFileSystem *chain;
-        StringFileSystem(VirtFileSystem *_chain = NULL) :chain(_chain) {}
+        StringFileSystem(VirtFileSystem *_chain = NULL):ChainFileSystem(_chain) {}
         VirtFILE *Vfopen(const char* path, const char*mode);
-        int Vfexists(const char* path);
-        VirtDIR *Vopendir(const char* path);
         static const char PREFIX[];
         static bool isStringPath(const char* path);

cpp/frams/virtfile/virtfile.cpp

@@ -22 +22 @@
 }
 
-int Vfexists(const char* path)
+bool Vfexists(const char* path)
 {
-return VirtFILE::vfs ? VirtFILE::vfs->Vfexists(path) : 0;
+return VirtFILE::vfs ? VirtFILE::vfs->Vfexists(path) : false;
+}
+
+bool Vdirexists(const char* path,bool is_writable)
+{
+return VirtFILE::vfs ? VirtFILE::vfs->Vdirexists(path,is_writable) : false;
+}
+
+bool Vmkdir(const char* path)
+{
+return VirtFILE::vfs ? VirtFILE::vfs->Vmkdir(path) : false;
+}
+
+bool Vmkdirs(const char* path)
+{
+return VirtFILE::vfs ? VirtFILE::vfs->Vmkdirs(path) : false;
 }
 
@@ -65 +80 @@
 
 VirtFILE* VirtFileSystem::Vfopen(const char* path,const char*mode) {return 0;}
-int VirtFileSystem::Vfexists(const char* path) {return 0;}
+bool VirtFileSystem::Vfexists(const char* path) {return 0;}
 VirtDIR* VirtFileSystem::Vopendir(const char* path) {return 0;}
+bool VirtFileSystem::Vmkdir(const char* path) {return false;} //error - not supported
+bool VirtFileSystem::Vdirexists(const char* path,bool is_writable) {return false;}
 
 //////////////////////////////////////////////////////////////////////////
@@ -117 +134 @@
 dirent* readdir(VirtDIR* d) {return d->Vreaddir();}
 
+/////////
+
+bool VirtFileSystem::Vmkdirs(const char* path)
+{
+if (Vdirexists(path,true)) return true;
+string parentdir = getFileDir(path);
+if (!Vmkdirs(parentdir.c_str())) return false;
+return Vmkdir(path);
+}
+
+//////////
+
+VirtFILE *ChainFileSystem::Vfopen(const char* path, const char*mode)
+{
+        return (chain != NULL) ? chain->Vfopen(path, mode) : NULL;
+}
+
+bool ChainFileSystem::Vfexists(const char* path)
+{
+        return (chain != NULL) ? chain->Vfexists(path) : false;
+}
+
+VirtDIR *ChainFileSystem::Vopendir(const char* path)
+{
+        return (chain != NULL) ? chain->Vopendir(path) : NULL;
+}
+
+bool ChainFileSystem::Vmkdir(const char* path)
+{
+        return (chain != NULL) ? chain->Vmkdir(path) : false;
+}
+
+bool ChainFileSystem::Vmkdirs(const char* path)
+{
+        return (chain != NULL) ? chain->Vmkdirs(path) : false;
+}
+
+bool ChainFileSystem::Vdirexists(const char* path,bool is_writable)
+{
+        return (chain != NULL) ? chain->Vdirexists(path,is_writable) : false;
+}

cpp/frams/virtfile/virtfile.h

@@ -9 +9 @@
 #include <stdarg.h>
 #include <common/nonstd_dir.h>
+#include <string>
+using std::string;
 //#include <dirent.h> //to jest inkludowane przez powyzsze 
 //struct dirent; //kiedys byla ta linia jak nie bylo jeszcze implementacji windowsowej dirent, ale borlandowi sie nie podoba jak s¹ obie
@@ -22 +24 @@
 class DLLEXP VirtFILE
 {
+  protected:
+string path;
   public:
 virtual size_t Vread(void *ptr, size_t size, size_t nmemb)=0;
@@ -36 +40 @@
 virtual int Vprintf(const char *format, va_list args);
 int printf(const char *format, ...);
-virtual const char *VgetPath() {return 0;} // 0=unspecified path
+virtual const char *VgetPath() {return path.c_str();}
 virtual int getSize();
+VirtFILE(const char* _path):path(_path) {}
 virtual ~VirtFILE();
 static VirtFILE *Vstdin,*Vstdout,*Vstderr;
@@ -48 +53 @@
 static VirtFileSystem *vfs;
 static void selectFileSystem(VirtFileSystem *s);
+};
+
+/** can be used directly or as a base class for implementations delegating VirtFILE calls to another VirtFILE object */
+class DLLEXP DelegatedFILE: public VirtFILE
+{
+VirtFILE *delegate;
+  public:
+size_t Vread(void *ptr, size_t size, size_t nmemb) {return delegate->Vread(ptr,size,nmemb);}
+size_t Vwrite(const void *ptr, size_t size, size_t nmemb) {return delegate->Vwrite(ptr,size,nmemb);}
+int Veof() {return delegate->Veof();}
+int Vputc(int c) {return delegate->Vputc(c);}
+int Vputs(const char *s) {return delegate->Vputs(s);}
+int Vgetc() {return delegate->Vgetc();}
+int Vseek(long offset, int whence) {return delegate->Vseek(offset,whence);}
+long Vtell() {return delegate->Vtell();}
+void Vrewind() {delegate->Vrewind();}
+int Vflush() {return delegate->Vflush();}
+char *Vgets(char *s, int size) {return delegate->Vgets(s,size);}
+int Vprintf(const char *format, va_list args) {return delegate->Vprintf(format,args);}
+int getSize() {return delegate->getSize();}
+// not overriden: VgetPath()
+
+DelegatedFILE(const char* _path,VirtFILE *_delegate):VirtFILE(_path),delegate(_delegate) {}
+virtual ~DelegatedFILE() {if (delegate) delete delegate; delegate=NULL;}
 };
 
@@ -61 +90 @@
 public:
 virtual VirtFILE *Vfopen(const char* path,const char*mode);
-virtual int Vfexists(const char* path);
+virtual bool Vfexists(const char* path);
 virtual VirtDIR *Vopendir(const char* path);
+virtual bool Vmkdir(const char* path);
+virtual bool Vmkdirs(const char* path);
+virtual bool Vdirexists(const char* path,bool is_writable);
 };
+
+/// base class for chained filesystems - redirect unimplemented calls -> chain
+class DLLEXP ChainFileSystem : public VirtFileSystem
+{
+public:
+        VirtFileSystem *chain;
+        ChainFileSystem(VirtFileSystem *_chain = NULL) :chain(_chain) {}
+        VirtFILE *Vfopen(const char* path, const char*mode);
+        bool Vfexists(const char* path);
+        VirtDIR *Vopendir(const char* path);
+        bool Vmkdir(const char* path);
+        bool Vmkdirs(const char* path);
+        bool Vdirexists(const char* path,bool is_writable);
+};
+
 
 DLLEXP VirtFILE *Vfopen(const char* path,const char*mode);
 DLLEXP VirtDIR *Vopendir(const char* path);
-DLLEXP int Vfexists(const char* path);
+DLLEXP bool Vfexists(const char* path);
+DLLEXP bool Vmkdir(const char* path);
+DLLEXP bool Vmkdirs(const char* path);
+DLLEXP bool Vdirexists(const char* path,bool is_writable);
 
 DLLEXP int fread(void *ptr, size_t size, size_t nmemb, VirtFILE* f);