AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 11:35:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use separator argument instead, eliminate need for separate EntryList struct

Browse Source
This commit is contained in:
UnknownShadow200 2020-07-01 23:06:17 +10:00
parent 669dac1738
commit 6a1235f6a9
10 changed files with 86 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Drawer2D.c
View File

@ -721,7 +721,7 @@ static void Font_SysTextDraw(struct DrawTextArgs* args, Bitmap* bmp, int x, int
static FT_Library ft_lib;
static struct FT_MemoryRec_ ft_mem;
static struct EntryList font_list;
static struct StringsBuffer font_list;
static cc_bool fonts_changed;
struct SysFont {
@ -849,8 +849,8 @@ static void SysFonts_Init(void) {
Window_ShowDialog("One time load", "Initialising font cache, this can take several seconds.");
}
EntryList_Init(&font_list, FONT_CACHE_FILE, '=');
if (!font_list.entries.count) SysFonts_Update();
EntryList_Load(&font_list, FONT_CACHE_FILE, '=', NULL);
if (!font_list.count) SysFonts_Update();
}
static void SysFonts_Add(const String* path, FT_Face face, int index, char type, const char* defStyle) {
@ -876,7 +876,7 @@ static void SysFonts_Add(const String* path, FT_Face face, int index, char type,
String_Format2(&value, "%s,%i", path, &index);
Platform_Log2("Face: %s = %s", &key, &value);
EntryList_Set(&font_list, &key, &value);
EntryList_Set(&font_list, &key, &value, '=');
fonts_changed = true;
}
@ -913,9 +913,9 @@ void SysFonts_Register(const String* path) {
int i, count;
/* if font is already known, skip it */
for (i = 0; i < font_list.entries.count; i++) {
entry = StringsBuffer_UNSAFE_Get(&font_list.entries, i);
String_UNSAFE_Separate(&entry, font_list.separator, &name, &value);
for (i = 0; i < font_list.count; i++) {
entry = StringsBuffer_UNSAFE_Get(&font_list, i);
String_UNSAFE_Separate(&entry, '=', &name, &value);
String_UNSAFE_Separate(&value, ',', &fontPath, &index);
if (String_CaselessEquals(path, &fontPath)) return;
@ -931,12 +931,12 @@ void SysFonts_Register(const String* path) {
void Font_GetNames(struct StringsBuffer* buffer) {
String entry, name, path;
int i;
if (!font_list.entries.count) SysFonts_Init();
if (!font_list.count) SysFonts_Init();
SysFonts_Update();
for (i = 0; i < font_list.entries.count; i++) {
entry = StringsBuffer_UNSAFE_Get(&font_list.entries, i);
String_UNSAFE_Separate(&entry, font_list.separator, &name, &path);
for (i = 0; i < font_list.count; i++) {
entry = StringsBuffer_UNSAFE_Get(&font_list, i);
String_UNSAFE_Separate(&entry, '=', &name, &path);
/* only want Regular fonts here */
if (name.length < 2 || name.buffer[name.length - 1] != 'R') continue;
@ -950,12 +950,12 @@ static String Font_LookupOf(const String* fontName, const char type) {
String_InitArray(name, nameBuffer);
String_Format2(&name, "%s %r", fontName, &type);
return EntryList_UNSAFE_Get(&font_list, &name);
return EntryList_UNSAFE_Get(&font_list, &name, '=');
}
static String Font_DoLookup(const String* fontName, int style) {
String path;
if (!font_list.entries.count) SysFonts_Init();
if (!font_list.count) SysFonts_Init();
path = String_Empty;
if (style & FONT_STYLE_BOLD) path = Font_LookupOf(fontName, 'B');

16
src/Http.c
View File

@ -105,7 +105,8 @@ static void Http_DownloadNextAsync(void);
#endif
/* Adds a req to the list of pending requests, waking up worker thread if needed. */
static void Http_Add(const String* url, cc_bool priority, const String* id, cc_uint8 type, const String* lastModified, const String* etag, const void* data, cc_uint32 size, struct EntryList* cookies) {
static void Http_Add(const String* url, cc_bool priority, const String* id, cc_uint8 type, const String* lastModified,
const String* etag, const void* data, cc_uint32 size, struct StringsBuffer* cookies) {
struct HttpRequest req = { 0 };
String_CopyToRawArray(req.url, url);
@ -252,8 +253,7 @@ static void Http_ParseCookie(struct HttpRequest* req, const String* value) {
dataEnd = String_IndexOf(&data, ';');
if (dataEnd >= 0) data.length = dataEnd;
req->cookies->separator = '=';
EntryList_Set(req->cookies, &name, &data);
EntryList_Set(req->cookies, &name, &data, '=');
}
/* Parses a HTTP header */
@ -300,12 +300,12 @@ static void Http_SetRequestHeaders(struct HttpRequest* req) {
}
if (req->data) Http_AddHeader("Content-Type", &contentType);
if (!req->cookies || !req->cookies->entries.count) return;
if (!req->cookies || !req->cookies->count) return;
String_InitArray(cookies, cookiesBuffer);
for (i = 0; i < req->cookies->entries.count; i++) {
for (i = 0; i < req->cookies->count; i++) {
if (i) String_AppendConst(&cookies, "; ");
str = StringsBuffer_UNSAFE_Get(&req->cookies->entries, i);
str = StringsBuffer_UNSAFE_Get(req->cookies, i);
String_AppendString(&cookies, &str);
}
Http_AddHeader("Cookie", &cookies);
@ -1030,10 +1030,10 @@ void Http_AsyncGetData(const String* url, cc_bool priority, const String* id) {
void Http_AsyncGetHeaders(const String* url, cc_bool priority, const String* id) {
Http_Add(url, priority, id, REQUEST_TYPE_HEAD, NULL, NULL, NULL, 0, NULL);
}
void Http_AsyncPostData(const String* url, cc_bool priority, const String* id, const void* data, cc_uint32 size, struct EntryList* cookies) {
void Http_AsyncPostData(const String* url, cc_bool priority, const String* id, const void* data, cc_uint32 size, struct StringsBuffer* cookies) {
Http_Add(url, priority, id, REQUEST_TYPE_POST, NULL, NULL, data, size, cookies);
}
void Http_AsyncGetDataEx(const String* url, cc_bool priority, const String* id, const String* lastModified, const String* etag, struct EntryList* cookies) {
void Http_AsyncGetDataEx(const String* url, cc_bool priority, const String* id, const String* lastModified, const String* etag, struct StringsBuffer* cookies) {
Http_Add(url, priority, id, REQUEST_TYPE_GET, lastModified, etag, NULL, 0, cookies);
}

6
src/Http.h
View File

@ -35,7 +35,7 @@ struct HttpRequest {
char etag[STRING_SIZE]; /* ETag of cached item (if any) */
cc_uint8 requestType; /* See the various REQUEST_TYPE_ */
cc_bool success; /* Whether Result is 0, status is 200, and data is not NULL */
struct EntryList* cookies; /* Cookie list sent in requests. May be modified by the response. */
struct StringsBuffer* cookies; /* Cookie list sent in requests. May be modified by the response. */
};
/* Frees data from a HTTP request. */
@ -51,10 +51,10 @@ void Http_AsyncGetData(const String* url, cc_bool priority, const String* id);
void Http_AsyncGetHeaders(const String* url, cc_bool priority, const String* id);
/* Asynchronously performs a http POST request. (e.g. to submit data) */
/* NOTE: You don't have to persist data, a copy is made of it. */
void Http_AsyncPostData(const String* url, cc_bool priority, const String* id, const void* data, cc_uint32 size, struct EntryList* cookies);
void Http_AsyncPostData(const String* url, cc_bool priority, const String* id, const void* data, cc_uint32 size, struct StringsBuffer* cookies);
/* Asynchronously performs a http GET request. (e.g. to download data) */
/* Also sets the If-Modified-Since and If-None-Match headers. (if not NULL) */
void Http_AsyncGetDataEx(const String* url, cc_bool priority, const String* id, const String* lastModified, const String* etag, struct EntryList* cookies);
void Http_AsyncGetDataEx(const String* url, cc_bool priority, const String* id, const String* lastModified, const String* etag, struct StringsBuffer* cookies);
/* Encodes data using % or URL encoding. */
void Http_UrlEncode(String* dst, const cc_uint8* data, int len);

6
src/Input.c
View File

@ -477,9 +477,9 @@ static void Hotkeys_Init(void) {
cc_uint8 modifiers;
cc_bool more;
for (i = 0; i < Options.entries.count; i++) {
entry = StringsBuffer_UNSAFE_Get(&Options.entries, i);
String_UNSAFE_Separate(&entry, Options.separator, &key, &value);
for (i = 0; i < Options.count; i++) {
entry = StringsBuffer_UNSAFE_Get(&Options, i);
String_UNSAFE_Separate(&entry, '=', &key, &value);
if (!String_CaselessStarts(&key, &prefix)) continue;
/* Format is: key&modifiers = more-input&text */

2
src/LWeb.c
View File

@ -235,7 +235,7 @@ void LWebTask_DisplayError(struct LWebTask* task, const char* action, String* ds
/*########################################################################################################################*
*-------------------------------------------------------GetTokenTask------------------------------------------------------*
*#########################################################################################################################*/
static struct EntryList ccCookies;
static struct StringsBuffer ccCookies;
struct GetTokenTaskData GetTokenTask;
static void GetTokenTask_OnValue(struct JsonContext* ctx, const String* str) {

30
src/Options.c
View File

@ -7,13 +7,13 @@
#include "Utils.h"
#include "Logger.h"
struct EntryList Options;
struct StringsBuffer Options;
static struct StringsBuffer changedOpts;
int Options_ChangedCount(void) { return changedOpts.count; }
void Options_Free(void) {
StringsBuffer_Clear(&Options.entries);
StringsBuffer_Clear(&Options);
StringsBuffer_Clear(&changedOpts);
}
@ -32,7 +32,7 @@ cc_bool Options_UNSAFE_Get(const char* keyRaw, String* value) {
int idx;
String key = String_FromReadonly(keyRaw);
*value = EntryList_UNSAFE_Get(&Options, &key);
*value = EntryList_UNSAFE_Get(&Options, &key, '=');
if (value->length) return true;
/* Fallback to without '-' (e.g. "hacks-fly" to "fly") */
@ -41,7 +41,7 @@ cc_bool Options_UNSAFE_Get(const char* keyRaw, String* value) {
if (idx == -1) return false;
key = String_UNSAFE_SubstringAt(&key, idx + 1);
*value = EntryList_UNSAFE_Get(&Options, &key);
*value = EntryList_UNSAFE_Get(&Options, &key, '=');
return value->length > 0;
}
@ -113,10 +113,10 @@ void Options_Set(const char* keyRaw, const String* value) {
void Options_SetString(const String* key, const String* value) {
int i;
if (!value || !value->length) {
i = EntryList_Remove(&Options, key);
i = EntryList_Remove(&Options, key, '=');
if (i == -1) return;
} else {
EntryList_Set(&Options, key, value);
EntryList_Set(&Options, key, value, '=');
}
#ifdef CC_BUILD_WEB
@ -134,26 +134,26 @@ static cc_bool Options_LoadFilter(const String* entry) {
}
void Options_Load(void) {
static cc_bool loaded;
static cc_bool inited;
String entry, key, value;
int i;
if (!loaded) {
EntryList_Init(&Options, "options-default.txt", '=');
EntryList_Init(&Options, "options.txt", '=');
loaded = true;
if (!inited) {
EntryList_Load(&Options, "options-default.txt", '=', NULL);
EntryList_Load(&Options, "options.txt", '=', NULL);
inited = true;
} else {
/* Reset all the unchanged options */
for (i = Options.entries.count - 1; i >= 0; i--) {
entry = StringsBuffer_UNSAFE_Get(&Options.entries, i);
for (i = Options.count - 1; i >= 0; i--) {
entry = StringsBuffer_UNSAFE_Get(&Options, i);
String_UNSAFE_Separate(&entry, '=', &key, &value);
if (Options_HasChanged(&key)) continue;
StringsBuffer_Remove(&Options.entries, i);
StringsBuffer_Remove(&Options, i);
}
/* Load only options which have not changed */
EntryList_Load(&Options, "options.txt", Options_LoadFilter);
EntryList_Load(&Options, "options.txt", '=', Options_LoadFilter);
}
}

2
src/Options.h
View File

@ -68,7 +68,7 @@
#define OPT_MAX_CHUNK_UPDATES "gfx-maxchunkupdates"
#define OPT_CAMERA_MASS "cameramass"
extern struct EntryList Options;
extern struct StringsBuffer Options;
/* Returns the number of options changed via Options_SetXYZ since last save. */
int Options_ChangedCount(void);
/* Frees any memory allocated in storing options. */

30
src/TexturePack.c
View File

@ -150,7 +150,7 @@ cc_bool Atlas_TryChange(Bitmap* atlas) {
/*########################################################################################################################*
*------------------------------------------------------TextureCache-------------------------------------------------------*
*#########################################################################################################################*/
static struct EntryList acceptedList, deniedList, etagCache, lastModCache;
static struct StringsBuffer acceptedList, deniedList, etagCache, lastModCache;
#define ACCEPTED_TXT "texturecache/acceptedurls.txt"
#define DENIED_TXT "texturecache/deniedurls.txt"
#define ETAGS_TXT "texturecache/etags.txt"
@ -158,27 +158,27 @@ static struct EntryList acceptedList, deniedList, etagCache, lastModCache;
/* Initialises cache state (loading various lists) */
static void TextureCache_Init(void) {
EntryList_Init(&acceptedList, ACCEPTED_TXT, ' ');
EntryList_Init(&deniedList, DENIED_TXT, ' ');
EntryList_Init(&etagCache, ETAGS_TXT, ' ');
EntryList_Init(&lastModCache, LASTMOD_TXT, ' ');
EntryList_Load(&acceptedList, ACCEPTED_TXT, '=', NULL);
EntryList_Load(&deniedList, DENIED_TXT, '=', NULL);
EntryList_Load(&etagCache, ETAGS_TXT, '=', NULL);
EntryList_Load(&lastModCache, LASTMOD_TXT, '=', NULL);
}
cc_bool TextureCache_HasAccepted(const String* url) { return EntryList_Find(&acceptedList, url) >= 0; }
cc_bool TextureCache_HasDenied(const String* url) { return EntryList_Find(&deniedList, url) >= 0; }
cc_bool TextureCache_HasAccepted(const String* url) { return EntryList_Find(&acceptedList, url, ' ') >= 0; }
cc_bool TextureCache_HasDenied(const String* url) { return EntryList_Find(&deniedList, url, ' ') >= 0; }
void TextureCache_Accept(const String* url) {
EntryList_Set(&acceptedList, url, &String_Empty);
EntryList_Set(&acceptedList, url, &String_Empty, ' ');
EntryList_Save(&acceptedList, ACCEPTED_TXT);
}
void TextureCache_Deny(const String* url) {
EntryList_Set(&deniedList, url, &String_Empty);
EntryList_Set(&deniedList, url, &String_Empty, ' ');
EntryList_Save(&deniedList, DENIED_TXT);
}
int TextureCache_ClearDenied(void) {
int count = deniedList.entries.count;
StringsBuffer_Clear(&deniedList.entries);
int count = deniedList.count;
StringsBuffer_Clear(&deniedList);
EntryList_Save(&deniedList, DENIED_TXT);
return count;
}
@ -218,12 +218,12 @@ static cc_bool OpenCachedData(const String* url, struct Stream* stream) {
return true;
}
CC_NOINLINE static String GetCachedTag(const String* url, struct EntryList* list) {
CC_NOINLINE static String GetCachedTag(const String* url, struct StringsBuffer* list) {
String key; char keyBuffer[STRING_INT_CHARS];
String_InitArray(key, keyBuffer);
HashUrl(&key, url);
return EntryList_UNSAFE_Get(list, &key);
return EntryList_UNSAFE_Get(list, &key, ' ');
}
static String GetCachedLastModified(const String* url) {
@ -243,14 +243,14 @@ static String GetCachedETag(const String* url) {
return GetCachedTag(url, &etagCache);
}
CC_NOINLINE static void SetCachedTag(const String* url, struct EntryList* list,
CC_NOINLINE static void SetCachedTag(const String* url, struct StringsBuffer* list,
const String* data, const char* file) {
String key; char keyBuffer[STRING_INT_CHARS];
if (!data->length) return;
String_InitArray(key, keyBuffer);
HashUrl(&key, url);
EntryList_Set(list, &key, data);
EntryList_Set(list, &key, data, ' ');
EntryList_Save(list, file);
}

47
src/Utils.c
View File

@ -220,7 +220,7 @@ int Convert_FromBase64(const char* src, int len, cc_uint8* dst) {
/*########################################################################################################################*
*--------------------------------------------------------EntryList--------------------------------------------------------*
*#########################################################################################################################*/
void EntryList_Load(struct EntryList* list, const char* file, EntryList_Filter filter) {
void EntryList_Load(struct StringsBuffer* list, const char* file, char separator, EntryList_Filter filter) {
String entry; char entryBuffer[768];
String path; char pathBuffer[FILENAME_SIZE];
String key, value;
@ -260,15 +260,15 @@ void EntryList_Load(struct EntryList* list, const char* file, EntryList_Filter f
Logger_WarnFunc(&entry); continue;
}
String_UNSAFE_Separate(&entry, list->separator, &key, &value);
EntryList_Set(list, &key, &value);
String_UNSAFE_Separate(&entry, separator, &key, &value);
EntryList_Set(list, &key, &value, separator);
}
res = stream.Close(&stream);
if (res) { Logger_Warn2(res, "closing", &path); }
}
void EntryList_Save(struct EntryList* list, const char* file) {
void EntryList_Save(struct StringsBuffer* list, const char* file) {
String path, entry; char pathBuffer[FILENAME_SIZE];
struct Stream stream;
int i;
@ -280,8 +280,8 @@ void EntryList_Save(struct EntryList* list, const char* file) {
res = Stream_CreateFile(&stream, &path);
if (res) { Logger_Warn2(res, "creating", &path); return; }
for (i = 0; i < list->entries.count; i++) {
entry = StringsBuffer_UNSAFE_Get(&list->entries, i);
for (i = 0; i < list->count; i++) {
entry = StringsBuffer_UNSAFE_Get(list, i);
res = Stream_WriteLine(&stream, &entry);
if (res) { Logger_Warn2(res, "writing to", &path); break; }
}
@ -290,53 +290,48 @@ void EntryList_Save(struct EntryList* list, const char* file) {
if (res) { Logger_Warn2(res, "closing", &path); }
}
int EntryList_Remove(struct EntryList* list, const String* key) {
int i = EntryList_Find(list, key);
if (i >= 0) StringsBuffer_Remove(&list->entries, i);
int EntryList_Remove(struct StringsBuffer* list, const String* key, char separator) {
int i = EntryList_Find(list, key, separator);
if (i >= 0) StringsBuffer_Remove(list, i);
return i;
}
void EntryList_Set(struct EntryList* list, const String* key, const String* value) {
void EntryList_Set(struct StringsBuffer* list, const String* key, const String* value, char separator) {
String entry; char entryBuffer[1024];
String_InitArray(entry, entryBuffer);
if (value->length) {
String_Format3(&entry, "%s%r%s", key, &list->separator, value);
String_Format3(&entry, "%s%r%s", key, &separator, value);
} else {
String_Copy(&entry, key);
}
EntryList_Remove(list, key);
StringsBuffer_Add(&list->entries, &entry);
EntryList_Remove(list, key, separator);
StringsBuffer_Add(list, &entry);
}
String EntryList_UNSAFE_Get(struct EntryList* list, const String* key) {
String EntryList_UNSAFE_Get(struct StringsBuffer* list, const String* key, char separator) {
String curEntry, curKey, curValue;
int i;
for (i = 0; i < list->entries.count; i++) {
curEntry = StringsBuffer_UNSAFE_Get(&list->entries, i);
String_UNSAFE_Separate(&curEntry, list->separator, &curKey, &curValue);
for (i = 0; i < list->count; i++) {
curEntry = StringsBuffer_UNSAFE_Get(list, i);
String_UNSAFE_Separate(&curEntry, separator, &curKey, &curValue);
if (String_CaselessEquals(key, &curKey)) return curValue;
}
return String_Empty;
}
int EntryList_Find(struct EntryList* list, const String* key) {
int EntryList_Find(struct StringsBuffer* list, const String* key, char separator) {
String curEntry, curKey, curValue;
int i;
for (i = 0; i < list->entries.count; i++) {
curEntry = StringsBuffer_UNSAFE_Get(&list->entries, i);
String_UNSAFE_Separate(&curEntry, list->separator, &curKey, &curValue);
for (i = 0; i < list->count; i++) {
curEntry = StringsBuffer_UNSAFE_Get(list, i);
String_UNSAFE_Separate(&curEntry, separator, &curKey, &curValue);
if (String_CaselessEquals(key, &curKey)) return i;
}
return -1;
}
void EntryList_Init(struct EntryList* list, const char* path, char separator) {
list->separator = separator;
EntryList_Load(list, path, NULL);
}

19
src/Utils.h
View File

@ -54,24 +54,17 @@ int Convert_ToBase64(const cc_uint8* src, int len, char* dst);
/* NOTE: You MUST ensure that dst is appropriately sized. */
int Convert_FromBase64(const char* src, int len, cc_uint8* dst);
struct EntryList {
char separator;
struct StringsBuffer entries;
};
typedef cc_bool (*EntryList_Filter)(const String* entry);
/* Loads the entries from disc. */
CC_NOINLINE void EntryList_Load(struct EntryList* list, const char* file, EntryList_Filter filter);
CC_NOINLINE void EntryList_Load(struct StringsBuffer* list, const char* file, char seperator, EntryList_Filter filter);
/* Saves the entries to disc. */
CC_NOINLINE void EntryList_Save(struct EntryList* list, const char* file);
CC_NOINLINE void EntryList_Save(struct StringsBuffer* list, const char* file);
/* Removes the entry whose key caselessly equals the given key. */
CC_NOINLINE int EntryList_Remove(struct EntryList* list, const String* key);
CC_NOINLINE int EntryList_Remove(struct StringsBuffer* list, const String* key, char seperator);
/* Replaces the entry whose key caselessly equals the given key, or adds a new entry. */
CC_NOINLINE void EntryList_Set(struct EntryList* list, const String* key, const String* value);
CC_NOINLINE void EntryList_Set(struct StringsBuffer* list, const String* key, const String* value, char seperator);
/* Returns the value of the entry whose key caselessly equals the given key. */
CC_NOINLINE STRING_REF String EntryList_UNSAFE_Get(struct EntryList* list, const String* key);
CC_NOINLINE STRING_REF String EntryList_UNSAFE_Get(struct StringsBuffer* list, const String* key, char seperator);
/* Finds the index of the entry whose key caselessly equals the given key. */
CC_NOINLINE int EntryList_Find(struct EntryList* list, const String* key);
/* Initialises the EntryList and loads the entries from disc. */
void EntryList_Init(struct EntryList* list, const char* file, char separator);
CC_NOINLINE int EntryList_Find(struct StringsBuffer* list, const String* key, char seperator);
#endif