From 01fe58e20e65c82d8a250198ce199c4cb891e7cc Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Thu, 26 Jan 2012 14:05:56 +0000 Subject: [PATCH] Retrieve thumbnails, saves and info from caching server (static.powdertoy.co.uk) --- includes/defines.h | 1 + src/interface.c | 46 +++++++++++++++++++++++++++------------------- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/includes/defines.h b/includes/defines.h index 0dfce3433..7c673dbbc 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -21,6 +21,7 @@ #define SERVER "powdertoy.co.uk" #define SCRIPTSERVER "powdertoy.co.uk" +#define STATICSERVER "static.powdertoy.co.uk" #define LOCAL_SAVE_DIR "Saves" diff --git a/src/interface.c b/src/interface.c index e027506ea..b7f6d7a43 100644 --- a/src/interface.c +++ b/src/interface.c @@ -3725,11 +3725,12 @@ int search_ui(pixel *vid_buf) { if (search_dates[pos]) { char *id_d_temp = malloc(strlen(search_ids[pos])+strlen(search_dates[pos])+2); - uri = malloc(strlen(search_ids[pos])*3+strlen(search_dates[pos])*3+strlen(SERVER)+71); - strcpy(uri, "http://" SERVER "/Get.api?Op=thumbsmall&ID="); + uri = malloc(strlen(search_ids[pos])*3+strlen(search_dates[pos])*3+strlen(STATICSERVER)+71); + strcpy(uri, "http://" STATICSERVER "/"); strcaturl(uri, search_ids[pos]); - strappend(uri, "&Date="); + strappend(uri, "_"); strcaturl(uri, search_dates[pos]); + strappend(uri, "_small.pti"); strcpy(id_d_temp, search_ids[pos]); strappend(id_d_temp, "_"); @@ -3738,8 +3739,9 @@ int search_ui(pixel *vid_buf) free(id_d_temp); } else { uri = malloc(strlen(search_ids[pos])*3+strlen(SERVER)+64); - strcpy(uri, "http://" SERVER "/Get.api?Op=thumbsmall&ID="); + strcpy(uri, "http://" STATICSERVER "/"); strcaturl(uri, search_ids[pos]); + strappend(uri, "_small.pti"); img_id[i] = mystrdup(search_ids[pos]); } printf("Not found: %s, downloading\n", img_id[i]); @@ -3935,36 +3937,42 @@ int open_ui(pixel *vid_buf, char *save_id, char *save_date) //Begin Async loading of data if (save_date) { // We're loading an historical save - uri = malloc(strlen(save_id)*3+strlen(save_date)*3+strlen(SERVER)+71); - strcpy(uri, "http://" SERVER "/Get.api?Op=save&ID="); + uri = malloc(strlen(save_id)*3+strlen(save_date)*3+strlen(STATICSERVER)+71); + strcpy(uri, "http://" STATICSERVER "/"); strcaturl(uri, save_id); - strappend(uri, "&Date="); + strappend(uri, "_"); strcaturl(uri, save_date); + strappend(uri, ".cps"); - uri_2 = malloc(strlen(save_id)*3+strlen(save_date)*3+strlen(SERVER)+71); - strcpy(uri_2, "http://" SERVER "/Info.api?ID="); + uri_2 = malloc(strlen(save_id)*3+strlen(save_date)*3+strlen(STATICSERVER)+71); + strcpy(uri_2, "http://" STATICSERVER "/"); strcaturl(uri_2, save_id); - strappend(uri_2, "&Date="); + strappend(uri_2, "_"); strcaturl(uri_2, save_date); + strappend(uri_2, ".info"); - uri_3 = malloc(strlen(save_id)*3+strlen(save_date)*3+strlen(SERVER)+71); - strcpy(uri_3, "http://" SERVER "/Get.api?Op=thumblarge&ID="); + uri_3 = malloc(strlen(save_id)*3+strlen(save_date)*3+strlen(STATICSERVER)+71); + strcpy(uri_3, "http://" STATICSERVER "/"); strcaturl(uri_3, save_id); - strappend(uri_3, "&Date="); + strappend(uri_3, "_"); strcaturl(uri_3, save_date); + strappend(uri_3, "_large.pti"); } else { //We're loading a normal save - uri = malloc(strlen(save_id)*3+strlen(SERVER)+64); - strcpy(uri, "http://" SERVER "/Get.api?Op=save&ID="); + uri = malloc(strlen(save_id)*3+strlen(STATICSERVER)+64); + strcpy(uri, "http://" STATICSERVER "/"); strcaturl(uri, save_id); + strappend(uri, ".cps"); - uri_2 = malloc(strlen(save_id)*3+strlen(SERVER)+64); - strcpy(uri_2, "http://" SERVER "/Info.api?ID="); + uri_2 = malloc(strlen(save_id)*3+strlen(STATICSERVER)+64); + strcpy(uri_2, "http://" STATICSERVER "/"); strcaturl(uri_2, save_id); + strappend(uri_2, ".info"); - uri_3 = malloc(strlen(save_id)*3+strlen(SERVER)+64); - strcpy(uri_3, "http://" SERVER "/Get.api?Op=thumblarge&ID="); + uri_3 = malloc(strlen(save_id)*3+strlen(STATICSERVER)+64); + strcpy(uri_3, "http://" STATICSERVER "/"); strcaturl(uri_3, save_id); + strappend(uri_3, "_large.pti"); } http = http_async_req_start(http, uri, NULL, 0, 1); http_2 = http_async_req_start(http_2, uri_2, NULL, 0, 1);