patx/mrhttp-asgi

Add mime type to pipeline and switch on response

Commit 1bf077e · MarkReedZ · 2024-03-13T19:21:09Z

Changeset

1bf077e6e6d81682e6a1c9d5a2c4e1ecc14033f5

Parents

cda4a3f37cd340a1d0fa96b326d27a6e81db47dc

View source at this commit

Comments

No comments yet.

Log in to comment

Diff

diff --git a/src/mrhttp/internals/protocol.c b/src/mrhttp/internals/protocol.c
index dc77c28..1c9a498 100644
--- a/src/mrhttp/internals/protocol.c
+++ b/src/mrhttp/internals/protocol.c
@@ -517,7 +517,7 @@ Protocol* Protocol_on_body(Protocol* self, char* body, size_t body_len) {
       return Protocol_handle_request( self, self->request, r );
     }
 
-    //?  PyObject *ret = pipeline_queue(self, (PipelineRequest){true, self->request, task});
+    //?  PyObject *ret = pipeline_queue(self, (PipelineRequest){true, 0, self->request, task});
   }
   if ( r->mrq ) { //TODO
     DBG printf("Route uses mrq\n"); 
@@ -602,7 +602,7 @@ Protocol* Protocol_handle_request(Protocol* self, Request* request, Route* r) {
         return self;
       }
     }
-    printf("Unhandled exception :\n");
+    printf("Unhandled exception in the page handler :\n");
     PyObject_Print( type, stdout, 0 ); printf("\n");
     if ( value ) { PyObject_Print( value, stdout, 0 ); printf("\n"); }
     PyErr_Clear();
@@ -618,12 +618,11 @@ Protocol* Protocol_handle_request(Protocol* self, Request* request, Route* r) {
 
 
   if ( r->iscoro ) {
-    response_setMimeType(r->mtype); // TODO this doesn't work if we pipeline different types
 
     DBG printf("protocol - Request is a coroutine\n");
     PyObject *task;
     if(!(task = PyObject_CallFunctionObjArgs(self->create_task, result, NULL))) return NULL;
-    PyObject *ret = pipeline_queue(self, (PipelineRequest){true, request, task});
+    PyObject *ret = pipeline_queue(self, (PipelineRequest){true, r->mtype, request, task});
     Py_XDECREF(task);
     Py_DECREF(result);
     if ( !ret ) return NULL;
@@ -632,7 +631,7 @@ Protocol* Protocol_handle_request(Protocol* self, Request* request, Route* r) {
 
   if(!PIPELINE_EMPTY(self))
   {
-    if(!pipeline_queue(self, (PipelineRequest){false, request, result})) goto error;
+    if(!pipeline_queue(self, (PipelineRequest){false, r->mtype, request, result})) goto error;
     Py_DECREF(result);
     return self;
   }
@@ -823,7 +822,7 @@ static void* protocol_pipeline_ready(Protocol* self, PipelineRequest r)
       }
       PyErr_Clear();
 
-      printf("Unhandled exception:\n");
+      printf("Unhandled exception in coro page handler:\n");
       PyObject_Print( type, stdout, 0 ); printf("\n");
       PyObject_Print( value, stdout, 0 ); printf("\n");
  
@@ -843,6 +842,7 @@ static void* protocol_pipeline_ready(Protocol* self, PipelineRequest r)
     //response = PyUnicode_FromEncodedObject( response, "utf-8", "strict" );
     //printf("WARNING: Page handler should return a string. Bytes object returned from the page handler is being converted to unicode using utf-8\n");
   //}
+  response_setMimeType(r.mtype); 
 
   //if ( !PyUnicode_Check( response ) ) {
   if ( !( PyUnicode_Check( response ) || PyBytes_Check( response ) ) ) {
diff --git a/src/mrhttp/internals/protocol.h b/src/mrhttp/internals/protocol.h
index 989c6cd..75394aa 100644
--- a/src/mrhttp/internals/protocol.h
+++ b/src/mrhttp/internals/protocol.h
@@ -13,6 +13,7 @@
 
 typedef struct {
   bool is_task;
+  int mtype;
   Request* request;
   PyObject* task; // Task if coroutine otherwise response output
 } PipelineRequest;