From 37684729283f62fd7f1e74bc2b318dc9ad2cb695 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Fri, 17 Jan 2025 12:12:01 -0500 Subject: Account for dependency changes, platform testing Signed-off-by: Andrew Opalach --- src/portal/cpy/str.pxd | 4 ++-- src/portal/cpy/types.pxd | 4 +++- src/portal/py/modules/youtube.py | 2 +- src/portal/src/packet_ext.c | 4 ++-- src/portal/src/search.c | 10 +++++----- 5 files changed, 13 insertions(+), 11 deletions(-) (limited to 'src/portal') diff --git a/src/portal/cpy/str.pxd b/src/portal/cpy/str.pxd index 3ef1e90..77cd093 100644 --- a/src/portal/cpy/str.pxd +++ b/src/portal/cpy/str.pxd @@ -2,7 +2,7 @@ include "types.pxd" cdef extern from "": ctypedef struct str: - u32 len + u32 length u32 alloc char *data @@ -11,7 +11,7 @@ cdef extern from "": cdef extern from "": ctypedef struct wstr: - u32 len + u32 length u32 alloc wchar_t *data diff --git a/src/portal/cpy/types.pxd b/src/portal/cpy/types.pxd index 09cb224..d630afa 100644 --- a/src/portal/cpy/types.pxd +++ b/src/portal/cpy/types.pxd @@ -8,7 +8,9 @@ from libc.stdint cimport uint64_t from libc.stdint cimport int64_t from libc.stddef cimport wchar_t -ctypedef bint bool +from libcpp cimport bool +cdef extern from "": + pass ctypedef uint8_t u8 ctypedef int8_t s8 diff --git a/src/portal/py/modules/youtube.py b/src/portal/py/modules/youtube.py index 582a16c..9d5a135 100644 --- a/src/portal/py/modules/youtube.py +++ b/src/portal/py/modules/youtube.py @@ -27,7 +27,7 @@ ydl_opts = { 'logger': YDLLogger(), 'cachedir': False, 'socket_timeout': 10, - 'extractor_args': {'youtube': {'skip': ['hls'], 'player_client': ['android_vr']}} + 'extractor_args': {'youtube': {'skip': ['hls'], 'player_client': ['tv', 'ios']}} # 'android_vr', # 'cookiefile': '' } diff --git a/src/portal/src/packet_ext.c b/src/portal/src/packet_ext.c index 9b6d6be..8f30470 100644 --- a/src/portal/src/packet_ext.c +++ b/src/portal/src/packet_ext.c @@ -12,7 +12,7 @@ void nn_packet_write_post(struct nn_packet *packet, struct camu_post *post) NNWT_PACKET_WRITE_TYPE(packet, u8, post->type); nn_packet_write_str(packet, &post->unique_id); nn_packet_write_str(packet, &post->url); - NNWT_PACKET_WRITE_TYPE(packet, u32, post->dates.size); + NNWT_PACKET_WRITE_TYPE(packet, u32, post->dates.count); struct camu_post_date *date; al_array_foreach_ptr(post->dates, i, date) { NNWT_PACKET_WRITE_TYPE(packet, u8, date->type); @@ -32,7 +32,7 @@ void nn_packet_write_post(struct nn_packet *packet, struct camu_post *post) nn_packet_write_optional_int(packet, &post->quotes); nn_packet_write_optional_int(packet, &post->comments); nn_packet_write_optional_int(packet, &post->views); - NNWT_PACKET_WRITE_TYPE(packet, u32, post->media.size); + NNWT_PACKET_WRITE_TYPE(packet, u32, post->media.count); struct camu_post_media *media; al_array_foreach_ptr(post->media, i, media) { NNWT_PACKET_WRITE_TYPE(packet, u8, media->type); diff --git a/src/portal/src/search.c b/src/portal/src/search.c index 447e44c..e5d5dca 100644 --- a/src/portal/src/search.c +++ b/src/portal/src/search.c @@ -91,7 +91,7 @@ static nn_thread_result NNWT_THREADCALL queue_thread(void *userdata) al_str_clone(&search->query, &cmd->query); search->bridge = bridge; al_array_push(bridge->searches, search); - al_log_info("portal", "New search %x (%.*s).", id, AL_STR_PRINTF(&cmd->query)); + al_log_info("portal", "New search %x (%.*s).", id, al_str_fmt(&cmd->query)); result.id = search->id; } else { } @@ -107,7 +107,7 @@ static nn_thread_result NNWT_THREADCALL queue_thread(void *userdata) al_array_foreach_ptr(search->pages, j, page) { if (page->num == cmd->num) break; } - al_log_info("portal", "Loading page %i (%.*s).", cmd->num, AL_STR_PRINTF(&search->query)); + al_log_info("portal", "Loading page %i (%.*s).", cmd->num, al_str_fmt(&search->query)); if (portal_bridge_get_page(search, search->id, cmd->num) == -1) { break; } @@ -125,7 +125,7 @@ static nn_thread_result NNWT_THREADCALL queue_thread(void *userdata) } camu_queue_push(bridge->results, result); } - bridge->queue.size = 0; + bridge->queue.count = 0; nn_signal_send(&bridge->results_signal); } nn_mutex_unlock(&bridge->mutex); @@ -164,7 +164,7 @@ void camu_portal_init(struct camu_portal_bridge *bridge, struct camu_post_cache void camu_portal_create_search(struct camu_portal_bridge *bridge, str *module, str *query, void (*callback)(void *, void *, struct camu_portal_result *), void *userdata) { - struct camu_portal_cmd cmd; + struct camu_portal_cmd cmd = { 0 }; cmd.op = CAMU_CLIENT_CREATE_SEARCH; al_str_clone(&cmd.module, module); al_str_clone(&cmd.query, query); @@ -181,7 +181,7 @@ void camu_portal_create_search(struct camu_portal_bridge *bridge, str *module, s void camu_portal_get_page(struct camu_portal_bridge *bridge, s32 id, u32 num, void (*callback)(void *, void *, struct camu_portal_result *), void *userdata) { - struct camu_portal_cmd cmd; + struct camu_portal_cmd cmd = { 0 }; cmd.op = CAMU_CLIENT_GET_PAGE; cmd.id = id; cmd.num = num; -- cgit v1.2.3-101-g0448