4.06.2013 - Version 0.3.4 - PIOBJECT() macro, ethernet improvement, documentation based on Doxygen

pifile.h

@@ -27,27 +27,29 @@
 /// void clear()
 /// void resize(llong new_size, char fill = 0)
 /// void remove()
-class PIFile: public PIIODevice
+class PIP_EXPORT PIFile: public PIIODevice
 {
+	PIOBJECT(PIFile)
 public:
 	PIFile(const PIString & path = PIString(), DeviceMode type = ReadWrite): PIIODevice(path, type) {setPrecision(5); openDevice();}
+	~PIFile() {close();}
 
 	//PIFile & operator =(const PIFile & f) {path_ = f.path_; type_ = f.type_; return *this;}
 
-	void flush() {fflush(fd);}
-	EVENT_HANDLER(PIFile, void, clear) {close(); fd = fopen(path_.data(), "w"); close(); open();}
+	void flush() {if (!opened_) fflush(fd);}
+	EVENT_HANDLER(void, clear) {close(); fd = fopen(path_.data(), "w"); if (fd != 0) fclose(fd); fd = 0; opened_ = false; open();}
 	void seek(llong position) {if (!opened_) return; fseek(fd, position, SEEK_SET); clearerr(fd);}
 	void seekToBegin() {if (!opened_) return; fseek(fd, 0, SEEK_SET); clearerr(fd);}
 	void seekToEnd() {if (!opened_) return; fseek(fd, 0, SEEK_END); clearerr(fd);}
 	void seekToLine(llong line) {if (!opened_) return; seekToBegin(); piForTimes (line) readLine(); clearerr(fd);} // line 0 - begin of file
-	EVENT_HANDLER1(PIFile, void, resize, llong, new_size) {resize(new_size, 0);}
-	EVENT_HANDLER2(PIFile, void, resize, llong, new_size, char, fill);
+	EVENT_HANDLER1(void, resize, llong, new_size) {resize(new_size, 0);}
+	EVENT_HANDLER2(void, resize, llong, new_size, char, fill);
 	//void fill(char c) {stream.fill(c);}
 	char readChar() {return (char)fgetc(fd);}
 	PIString readLine();
 	llong readAll(void * data);
 	PIByteArray readAll(bool forceRead = false);
-	EVENT_HANDLER0(PIFile, void, remove) {close(); std::remove(path_.data());}
+	EVENT_HANDLER0(void, remove) {close(); std::remove(path_.data());}
 
 	void setPath(const PIString & path) {path_ = path; if (opened_) openDevice();}
 	llong size();
@@ -56,11 +58,11 @@ public:
 	bool isEmpty() {return (size() <= 0);}
 
 	int precision() const {return prec;}
-	void setPrecision(int prec_) {prec = prec_; prec_str = "." + itos(prec_);}
+	void setPrecision(int prec_) {prec = prec_; if (prec >= 0) prec_str = "." + itos(prec_); else prec_str = "";}
 
-	int read(void * read_to, int max_size) {if (!canRead()) return -1; return fread(read_to, max_size, 1, fd);}
-	int write(const void * data, int max_size) {if (!canWrite()) return -1; return fwrite(data, max_size, 1, fd);}
-	PIFile & writeToBinLog(ushort id, const void * data, int size) {if (!isWriteable()) return *this; writeBinary(id).writeBinary((ushort)size); write(data, size); flush(); return *this;}
+	int read(void * read_to, int max_size) {if (!canRead() || fd == 0) return -1; return fread(read_to, max_size, 1, fd);}
+	int write(const void * data, int max_size) {if (!canWrite() || fd == 0) return -1; return fwrite(data, max_size, 1, fd);}
+	PIFile & writeToBinLog(ushort id, const void * data, int size) {if (!isWriteable() || fd == 0) return *this; writeBinary(id).writeBinary((ushort)size); write(data, size); flush(); return *this;}
 
 	PIFile & writeBinary(const char v) {write(&v, sizeof(v)); return *this;}
 	PIFile & writeBinary(const short v) {write(&v, sizeof(v)); return *this;}
@@ -75,7 +77,9 @@ public:
 	PIFile & writeBinary(const float v) {write(&v, sizeof(v)); return *this;}
 	PIFile & writeBinary(const double v) {write(&v, sizeof(v)); return *this;}
 
-	PIFile & operator <<(const char & v) {if (!isWriteable()) return *this; write(&v, 1); return *this;}
+	PIFile & operator =(const PIFile & f) {path_ = f.path_; mode_ = f.mode_; return *this;}
+	
+	PIFile & operator <<(const char v) {if (!isWriteable()) return *this; write(&v, 1); return *this;}
 	//PIFile & operator <<(const string & v) {write(v.c_str(), v.size()); return *this;}
 	PIFile & operator <<(const PIString & v) {if (!isWriteable()) return *this; write(v.data(), v.lengthAscii()); return *this;}
 	PIFile & operator <<(const PIByteArray & v) {if (!isWriteable()) return *this; write(v.data(), v.size()); return *this;}
@@ -83,11 +87,11 @@ public:
 	PIFile & operator <<(int v) {if (!isWriteable()) return *this; ret = fprintf(fd, "%d", v); return *this;}
 	PIFile & operator <<(long v) {if (!isWriteable()) return *this; ret = fprintf(fd, "%ld", v); return *this;}
 	PIFile & operator <<(llong v) {if (!isWriteable()) return *this; ret = fprintf(fd, "%lld", v); return *this;}
-	PIFile & operator <<(uchar v) {if (!isWriteable()) return *this; ret = fprintf(fd, "%c", v); return *this;}
-	PIFile & operator <<(ushort v) {if (!isWriteable()) return *this; ret = fprintf(fd, "%hd", v); return *this;}
-	PIFile & operator <<(uint v) {if (!isWriteable()) return *this; ret = fprintf(fd, "%d", v); return *this;}
-	PIFile & operator <<(ulong v) {if (!isWriteable()) return *this; ret = fprintf(fd, "%ld", v); return *this;}
-	PIFile & operator <<(ullong v) {if (!isWriteable()) return *this; ret = fprintf(fd, "%lld", v); return *this;}
+	PIFile & operator <<(uchar v) {if (!isWriteable()) return *this; ret = fprintf(fd, "%u", int(v)); return *this;}
+	PIFile & operator <<(ushort v) {if (!isWriteable()) return *this; ret = fprintf(fd, "%hu", v); return *this;}
+	PIFile & operator <<(uint v) {if (!isWriteable()) return *this; ret = fprintf(fd, "%u", v); return *this;}
+	PIFile & operator <<(ulong v) {if (!isWriteable()) return *this; ret = fprintf(fd, "%lu", v); return *this;}
+	PIFile & operator <<(ullong v) {if (!isWriteable()) return *this; ret = fprintf(fd, "%llu", v); return *this;}
 	PIFile & operator <<(float v) {if (!isWriteable()) return *this; ret = fprintf(fd, ("%" + prec_str + "f").c_str(), v); return *this;}
 	PIFile & operator <<(double v) {if (!isWriteable()) return *this; ret = fprintf(fd, ("%" + prec_str + "lf").c_str(), v); return *this;}