Initial commit

Author: Kartatz

src/m3u8.c

@@ -14,6 +14,7 @@
 #include "readlines.h"
 #include "m3u8httpclient.h"
 #include "hex.h"
+#include "sutils.h"
 #include "guess_uri.h"
 
 static const enum M3U8VAttrType M3U8_VATTR_TYPES[] = {
@@ -2348,6 +2349,8 @@ int m3u8_parse(struct M3U8Playlist* const playlist, const char* const s) {
 							memcpy(attr_name, start, size);
 							attr_name[size] = '\0';
 
+							strip_whitespaces(attr_name);
+							
 							if (!namesafe(attr_name)) {
 								err = M3U8ERR_ATTRIBUTE_INVALID_NAME;
 								goto end;

src/python-kai.c

@@ -982,6 +982,9 @@ static PyObject* topy(
 	PyObject* subtitles = NULL;
 	PyObject* closed_captions = NULL;
 	PyObject* size = NULL;
+	PyObject* version = NULL;
+	PyObject* value = NULL;
+	PyObject* data_id = NULL;
 
 	PyObject* result = NULL;
 
@@ -996,6 +999,128 @@ static PyObject* topy(
 	}
 
 	switch (item->type) {
+		case M3U8_STREAM_SESSION_DATA: {
+			const struct M3U8SessionData* const session_data = item->item;
+			
+			/* Data ID */
+			Py_XDECREF(data_id);
+			
+			data_id = get_string(session_data->data_id);
+			
+			if (data_id == NULL) {
+				return NULL;
+			}
+			
+			/* Value */
+			Py_XDECREF(value);
+			
+			value = get_string(session_data->value);
+			
+			if (value == NULL) {
+				return NULL;
+			}
+			
+			/* URI */
+			Py_XDECREF(uri);
+			
+			err = m3u8uri_resolve(base_uri, session_data->uri, &resolved_uri);
+			
+			uri = get_string((err == M3U8ERR_SUCCESS) ? resolved_uri : session_data->uri);
+			
+			if (uri == NULL) {
+				return NULL;
+			}
+			
+			/* Language */
+			Py_XDECREF(language);
+			
+			language = get_string(session_data->language);
+			
+			if (language == NULL) {
+				return NULL;
+			}
+			
+			/* Tag */
+			Py_XDECREF(tag);
+			
+			tag = PyLong_FromLongLong((uintptr_t) session_data->tag);
+			
+			if (tag == NULL) {
+				return NULL;
+			}
+			
+			Py_XDECREF(args);
+			
+			args = Py_BuildValue(
+				"(OOOOO)", 
+				data_id,
+				value,
+				uri,
+				language,
+				tag
+			);
+			
+			if (args == NULL) {
+				return NULL;
+			}
+			
+			Py_XDECREF(class);
+			
+			class = PyObject_GetAttrString(module, "M3U8SessionData");
+			
+			if (class == NULL) {
+				return NULL;
+			}
+			
+			result = PyObject_Call(class, args, NULL);
+			
+			break;
+		}
+		case M3U8_STREAM_VERSION: {
+			const struct M3U8Version* const ver = item->item;
+			
+			/* Version */
+			Py_XDECREF(version);
+			
+			version = PyLong_FromLongLong(ver->version);
+			
+			if (version == NULL) {
+				return NULL;
+			}
+			
+			/* Tag */
+			Py_XDECREF(tag);
+			
+			tag = PyLong_FromLongLong((uintptr_t) ver->tag);
+			
+			if (tag == NULL) {
+				return NULL;
+			}
+			
+			Py_XDECREF(args);
+			
+			args = Py_BuildValue(
+				"(OO)", 
+				version,
+				tag
+			);
+			
+			if (args == NULL) {
+				return NULL;
+			}
+			
+			Py_XDECREF(class);
+			
+			class = PyObject_GetAttrString(module, "M3U8Version");
+			
+			if (class == NULL) {
+				return NULL;
+			}
+			
+			result = PyObject_Call(class, args, NULL);
+			
+			break;
+		}
 		case M3U8_STREAM_MEDIA: {
 			const struct M3U8Media* const media = item->item;
 
@@ -1479,11 +1604,9 @@ static PyObject* _m3u8stream_getstream(
 		const struct M3U8StreamItem* const item = &stream->items[index];
 
 		switch (item->type) {
-			case M3U8_STREAM_MEDIA: {
-				kitem = topy(stream, item);
-				PyList_Append(items, kitem);
-				break;
-			}
+			case M3U8_STREAM_SESSION_DATA:
+			case M3U8_STREAM_MEDIA:
+			case M3U8_STREAM_VERSION:
 			case M3U8_STREAM_VARIANT_STREAM: {
 				kitem = topy(stream, item);
 				PyList_Append(items, kitem);

src/sutils.c

@@ -84,3 +84,57 @@ size_t uintptrlen(const uintptr_t value) {
 	return size;
 
 }
+
+char* strip_whitespaces(char* const s) {
+	
+	size_t size = 0;
+	
+	const char* start = s;
+	const char* end = strchr(s, '\0');
+	
+	while (start != end) {
+		const char ch = *start;
+		
+		if (!isspace(ch)) {
+			break;
+		}
+		
+		start++;
+	}
+	
+	if (start != end) {
+		end--;
+	}
+	
+	while (end != start) {
+		const unsigned char ch = *end;
+		
+		if (!isspace(ch)) {
+			break;
+		}
+		
+		end--;
+	}
+	
+	if (*end != '\0') {
+		end++;
+	}
+	
+	size = (size_t) (start - s);
+	
+	if (size != 0) {
+		size = (size_t) (end - start);
+		memmove(s, start, size);
+		s[size] = '\0';
+	}
+	
+	return s;
+	
+}
+
+int main() {
+	char s[] = "VALUE";
+	strip_whitespaces(s);
+	puts(s);
+}
+	

src/sutils.h

@@ -10,4 +10,6 @@ size_t uintlen(const biguint_t value);
 size_t intptrlen(const intptr_t value);
 size_t uintptrlen(const uintptr_t value);
 
+char* strip_whitespaces(char* const s);
+
 #endif