console: Use 2k buffer by default and add setBufferSize

No need to append extra zeroes, so set the default to 2k exactly.
Allow clients to change the buffer size, convenient when reading large
amounts of data from a subprocess like a screenshot.

lib/base/console.cpp

@@ -60,7 +60,7 @@ DEFINE_REF(eConsoleAppContainer);
 eConsoleAppContainer::eConsoleAppContainer():
 	pid(-1),
 	killstate(0),
-	buffer(2049)
+	buffer(2048)
 {
 	for (int i=0; i < 3; ++i)
 	{
@@ -83,6 +83,12 @@ int eConsoleAppContainer::setCWD( const char *path )
 	return 0;
 }
 
+void eConsoleAppContainer::setBufferSize(int size)
+{
+	if (size > 0)
+		buffer.resize(size);
+}
+
 int eConsoleAppContainer::execute( const char *cmd )
 {
 	int argc = 3;
@@ -227,7 +233,7 @@ void eConsoleAppContainer::readyRead(int what)
 //		eDebug("what = %d");
 		char* buf = &buffer[0];
 		int rd;
-		while((rd = read(fd[0], buf, 2048)) > 0)
+		while((rd = read(fd[0], buf, buffer.size())) > 0)
 		{
 			buf[rd]=0;
 			/*emit*/ dataAvail(std::make_pair(buf, rd));
@@ -266,7 +272,7 @@ void eConsoleAppContainer::readyErrRead(int what)
 //		eDebug("what = %d");
 		char* buf = &buffer[0];
 		int rd;
-		while((rd = read(fd[2], buf, 2048)) > 0)
+		while((rd = read(fd[2], buf, buffer.size())) > 0)
 		{
 /*			for ( int i = 0; i < rd; i++ )
 				eDebug("%d = %c (%02x)", i, buf[i], buf[i] );*/
@@ -309,7 +315,7 @@ void eConsoleAppContainer::readyWrite(int what)
 		if ( filefd[0] >= 0 )
 		{
 			char* buf = &buffer[0];
-			int rsize = read(filefd[0], buf, 2048);
+			int rsize = read(filefd[0], buf, buffer.size());
 			if ( rsize > 0 )
 				write(buf, rsize);
 			else

lib/base/console.h

@@ -38,6 +38,7 @@ class eConsoleAppContainer: public Object, public iObject
 	eConsoleAppContainer();
 	~eConsoleAppContainer();
 	int setCWD( const char *path );
+	void setBufferSize(int size);
 	int execute( const char *str );
 	int execute( const char *cmdline, const char *const argv[] );
 	int getPID() { return pid; }

lib/python/python_console.i

@@ -217,6 +217,16 @@ eConsolePy_setCWD(eConsolePy* self, PyObject *args)
 	Py_RETURN_NONE;
 }
 
+static PyObject *
+eConsolePy_setBufferSize(eConsolePy* self, PyObject *args)
+{
+	int size = 0;
+	if (!PyArg_ParseTuple(args, "i", &size))
+		return NULL;
+	self->cont->setBufferSize(size);
+	Py_RETURN_NONE;
+}
+
 static PyObject *
 eConsolePy_kill(eConsolePy* self)
 {
@@ -291,6 +301,9 @@ static PyMethodDef eConsolePy_methods[] = {
 	{"setCWD", (PyCFunction)eConsolePy_setCWD, METH_VARARGS,
 	 "set working dir"
 	},
+	{"setBufferSize", (PyCFunction)eConsolePy_setBufferSize, METH_VARARGS,
+	 "set transfer buffer size"
+	},
 	{"execute", (PyCFunction)eConsolePy_execute, METH_VARARGS,
 	 "execute command"
 	},