+ extend PyStreambuf to write data

2016-06-11 11:54:01 +02:00
parent e42385a25b
commit 432dcb5833
2 changed files with 97 additions and 51 deletions
--- a/src/Base/Stream.cpp
+++ b/src/Base/Stream.cpp
@@ -523,56 +523,99 @@ IODeviceIStreambuf::seekpos(std::streambuf::pos_type pos,
 }

 // ---------------------------------------------------------
-
-PyStreambuf::PyStreambuf(PyObject* o) : inp(o)
-{
-    setg (buffer+pbSize,
-          buffer+pbSize,
-          buffer+pbSize);
-}
-
-int PyStreambuf::underflow()
-{
-    if (gptr() < egptr()) {
-        return *gptr();
-    }
-
-    int numPutback;
-    numPutback = gptr() - eback();
-    if (numPutback > pbSize) {
-        numPutback = pbSize;
-    }
-
-    memcpy (buffer+(pbSize-numPutback), gptr()-numPutback, numPutback);
-
-    int num=0;
-    for (int i=0; i<bufSize; i++) {
-        char c;
-        Py::Tuple arg(1);
-        arg.setItem(0, Py::Int(1));
-        Py::Callable meth(Py::Object(inp).getAttr("read"));
-        try {
-            Py::Char res(meth.apply(arg));
-            c = static_cast<std::string>(res)[0];
-            num++;
-            buffer[pbSize+i] = c;
-            if (c == '\n')
-                break;
-        }
-        catch (Py::Exception& e) {
-            e.clear();
-            if (num == 0)
-                return EOF;
-            break;
-        }
-    }
-
-    setg (buffer+(pbSize-numPutback),
-          buffer+pbSize,
-          buffer+pbSize+num);
-
-    return *gptr();
-}
+
+PyStreambuf::PyStreambuf(PyObject* o) : inp(o)
+{
+    Py_INCREF(inp);
+    setg (buffer+pbSize,
+          buffer+pbSize,
+          buffer+pbSize);
+}
+
+PyStreambuf::~PyStreambuf()
+{
+    Py_DECREF(inp);
+}
+
+std::streambuf::int_type PyStreambuf::underflow()
+{
+    if (gptr() < egptr()) {
+        return *gptr();
+    }
+
+    int numPutback;
+    numPutback = gptr() - eback();
+    if (numPutback > pbSize) {
+        numPutback = pbSize;
+    }
+
+    memcpy (buffer+(pbSize-numPutback), gptr()-numPutback, numPutback);
+
+    int num=0;
+    for (int i=0; i<bufSize; i++) {
+        char c;
+        Py::Tuple arg(1);
+        arg.setItem(0, Py::Int(1));
+        Py::Callable meth(Py::Object(inp).getAttr("read"));
+        try {
+            Py::Char res(meth.apply(arg));
+            c = static_cast<std::string>(res)[0];
+            num++;
+            buffer[pbSize+i] = c;
+            if (c == '\n')
+                break;
+        }
+        catch (Py::Exception& e) {
+            e.clear();
+            if (num == 0)
+                return EOF;
+            break;
+        }
+    }
+
+    setg (buffer+(pbSize-numPutback),
+          buffer+pbSize,
+          buffer+pbSize+num);
+
+    return *gptr();
+}
+
+std::streambuf::int_type
+PyStreambuf::overflow(std::streambuf::int_type c)
+{
+    if (c != EOF) {
+        char z = c;
+
+        try {
+            Py::Tuple arg(1);
+            arg.setItem(0, Py::Char(z));
+            Py::Callable meth(Py::Object(inp).getAttr("write"));
+            meth.apply(arg);
+        }
+        catch(Py::Exception& e) {
+            e.clear();
+            return EOF;
+        }
+    }
+
+    return c;
+}
+
+std::streamsize PyStreambuf::xsputn (const char* s, std::streamsize num)
+{
+    try {
+        Py::Tuple arg(1);
+        arg.setItem(0, Py::String(s, num));
+        Py::Callable meth(Py::Object(inp).getAttr("write"));
+        meth.apply(arg);
+    }
+    catch(Py::Exception& e) {
+        e.clear();
+        return 0;
+    }
+
+    return num;
+}

 // ---------------------------------------------------------