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

Remove path field from EntryList struct, move to argument for Load/Save

Browse Source
This commit is contained in:
UnknownShadow200 2020-07-01 21:12:14 +10:00
parent 925346278d
commit 278e7c70cd
5 changed files with 57 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Drawer2D.c
View File

@ -722,7 +722,7 @@ static void Font_SysTextDraw(struct DrawTextArgs* args, Bitmap* bmp, int x, int
static FT_Library ft_lib; static FT_Library ft_lib;
static struct FT_MemoryRec_ ft_mem; static struct FT_MemoryRec_ ft_mem;
static struct EntryList font_list; static struct EntryList font_list;
static cc_bool font_list_changed; static cc_bool fonts_changed;
struct SysFont { struct SysFont {
FT_Face face; FT_Face face;
@ -822,6 +822,8 @@ static void* FT_ReallocWrapper(FT_Memory memory, long cur_size, long new_size, v
} }
static cc_bool updatedSysFonts; static cc_bool updatedSysFonts;
#define FONT_CACHE_FILE "fontscache.txt"
/* Updates fonts list cache with system's list of fonts */ /* Updates fonts list cache with system's list of fonts */
/* This should be avoided due to overhead potential */ /* This should be avoided due to overhead potential */
static void SysFonts_Update(void) { static void SysFonts_Update(void) {
@ -829,10 +831,9 @@ static void SysFonts_Update(void) {
updatedSysFonts = true; updatedSysFonts = true;
Platform_LoadSysFonts(); Platform_LoadSysFonts();
if (font_list_changed) EntryList_Save(&font_list); if (fonts_changed) EntryList_Save(&font_list, FONT_CACHE_FILE);
} }
#define FONT_CACHE_FILE "fontscache.txt"
static void SysFonts_Init(void) { static void SysFonts_Init(void) {
static const String cachePath = String_FromConst(FONT_CACHE_FILE); static const String cachePath = String_FromConst(FONT_CACHE_FILE);
FT_Error err; FT_Error err;
@ -876,7 +877,7 @@ static void SysFonts_Add(const String* path, FT_Face face, int index, char type,
Platform_Log2("Face: %s = %s", &key, &value); Platform_Log2("Face: %s = %s", &key, &value);
EntryList_Set(&font_list, &key, &value); EntryList_Set(&font_list, &key, &value);
font_list_changed = true; fonts_changed = true;
} }
static int SysFonts_DoRegister(const String* path, int faceIndex) { static int SysFonts_DoRegister(const String* path, int faceIndex) {

4
src/Options.c
View File

@ -151,12 +151,12 @@ void Options_Load(void) {
} }
/* Load only options which have not changed */ /* Load only options which have not changed */
EntryList_Load(&Options, Options_LoadFilter); EntryList_Load(&Options, "options.txt", Options_LoadFilter);
} }
} }
void Options_Save(void) { void Options_Save(void) {
EntryList_Save(&Options); EntryList_Save(&Options, "options.txt");
StringsBuffer_Clear(&changedOpts); StringsBuffer_Clear(&changedOpts);
} }

88
src/TexturePack.c
View File

@ -150,14 +150,18 @@ cc_bool Atlas_TryChange(Bitmap* atlas) {
/*########################################################################################################################* /*########################################################################################################################*
*------------------------------------------------------TextureCache-------------------------------------------------------* *------------------------------------------------------TextureCache-------------------------------------------------------*
*#########################################################################################################################*/ *#########################################################################################################################*/
static struct EntryList acceptedList, deniedList, etagCache, lastModifiedCache; static struct EntryList acceptedList, deniedList, etagCache, lastModCache;
#define ACCEPTED_TXT "texturecache/acceptedurls.txt"
#define DENIED_TXT "texturecache/deniedurls.txt"
#define ETAGS_TXT "texturecache/etags.txt"
#define LASTMOD_TXT "texturecache/lastmodified.txt"
/* Initialises cache state (loading various lists) */ /* Initialises cache state (loading various lists) */
static void TextureCache_Init(void) { static void TextureCache_Init(void) {
EntryList_Init(&acceptedList, "texturecache/acceptedurls.txt", ' '); EntryList_Init(&acceptedList, ACCEPTED_TXT, ' ');
EntryList_Init(&deniedList, "texturecache/deniedurls.txt", ' '); EntryList_Init(&deniedList, DENIED_TXT, ' ');
EntryList_Init(&etagCache, "texturecache/etags.txt", ' '); EntryList_Init(&etagCache, ETAGS_TXT, ' ');
EntryList_Init(&lastModifiedCache, "texturecache/lastmodified.txt", ' '); EntryList_Init(&lastModCache, LASTMOD_TXT, ' ');
} }
cc_bool TextureCache_HasAccepted(const String* url) { return EntryList_Find(&acceptedList, url) >= 0; } cc_bool TextureCache_HasAccepted(const String* url) { return EntryList_Find(&acceptedList, url) >= 0; }
@ -165,48 +169,48 @@ cc_bool TextureCache_HasDenied(const String* url) { return EntryList_Find(&den
void TextureCache_Accept(const String* url) { void TextureCache_Accept(const String* url) {
EntryList_Set(&acceptedList, url, &String_Empty); EntryList_Set(&acceptedList, url, &String_Empty);
EntryList_Save(&acceptedList); EntryList_Save(&acceptedList, ACCEPTED_TXT);
} }
void TextureCache_Deny(const String* url) { void TextureCache_Deny(const String* url) {
EntryList_Set(&deniedList, url, &String_Empty); EntryList_Set(&deniedList, url, &String_Empty);
EntryList_Save(&deniedList); EntryList_Save(&deniedList, DENIED_TXT);
} }
int TextureCache_ClearDenied(void) { int TextureCache_ClearDenied(void) {
int count = deniedList.entries.count; int count = deniedList.entries.count;
StringsBuffer_Clear(&deniedList.entries); StringsBuffer_Clear(&deniedList.entries);
EntryList_Save(&deniedList); EntryList_Save(&deniedList, DENIED_TXT);
return count; return count;
} }
CC_INLINE static void TextureCache_HashUrl(String* key, const String* url) { CC_INLINE static void HashUrl(String* key, const String* url) {
String_AppendUInt32(key, Utils_CRC32((const cc_uint8*)url->buffer, url->length)); String_AppendUInt32(key, Utils_CRC32((const cc_uint8*)url->buffer, url->length));
} }
CC_NOINLINE static void TextureCache_MakePath(String* path, const String* url) { CC_NOINLINE static void MakeCachePath(String* path, const String* url) {
String key; char keyBuffer[STRING_INT_CHARS]; String key; char keyBuffer[STRING_INT_CHARS];
String_InitArray(key, keyBuffer); String_InitArray(key, keyBuffer);
TextureCache_HashUrl(&key, url); HashUrl(&key, url);
String_Format1(path, "texturecache/%s", &key); String_Format1(path, "texturecache/%s", &key);
} }
/* Returns non-zero if given URL has been cached */ /* Returns non-zero if given URL has been cached */
static int TextureCache_Has(const String* url) { static int IsCached(const String* url) {
String path; char pathBuffer[FILENAME_SIZE]; String path; char pathBuffer[FILENAME_SIZE];
String_InitArray(path, pathBuffer); String_InitArray(path, pathBuffer);
TextureCache_MakePath(&path, url); MakeCachePath(&path, url);
return File_Exists(&path); return File_Exists(&path);
} }
/* Attempts to get the cached data stream for the given url */ /* Attempts to open the cached data stream for the given url */
static cc_bool TextureCache_Get(const String* url, struct Stream* stream) { static cc_bool OpenCachedData(const String* url, struct Stream* stream) {
String path; char pathBuffer[FILENAME_SIZE]; String path; char pathBuffer[FILENAME_SIZE];
cc_result res; cc_result res;
String_InitArray(path, pathBuffer); String_InitArray(path, pathBuffer);
TextureCache_MakePath(&path, url); MakeCachePath(&path, url);
res = Stream_OpenFile(stream, &path); res = Stream_OpenFile(stream, &path);
if (res == ReturnCode_FileNotFound) return false; if (res == ReturnCode_FileNotFound) return false;
@ -214,17 +218,17 @@ static cc_bool TextureCache_Get(const String* url, struct Stream* stream) {
return true; return true;
} }
CC_NOINLINE static String TextureCache_GetFromTags(const String* url, struct EntryList* list) { CC_NOINLINE static String GetCachedTag(const String* url, struct EntryList* list) {
String key; char keyBuffer[STRING_INT_CHARS]; String key; char keyBuffer[STRING_INT_CHARS];
String_InitArray(key, keyBuffer); String_InitArray(key, keyBuffer);
TextureCache_HashUrl(&key, url); HashUrl(&key, url);
return EntryList_UNSAFE_Get(list, &key); return EntryList_UNSAFE_Get(list, &key);
} }
static String TextureCache_GetLastModified(const String* url) { static String GetCachedLastModified(const String* url) {
int i; int i;
String entry = TextureCache_GetFromTags(url, &lastModifiedCache); String entry = GetCachedTag(url, &lastModCache);
/* Entry used to be a timestamp of C# ticks since 01/01/0001 */ /* Entry used to be a timestamp of C# ticks since 01/01/0001 */
/* Check if this is new format */ /* Check if this is new format */
for (i = 0; i < entry.length; i++) { for (i = 0; i < entry.length; i++) {
@ -235,42 +239,34 @@ static String TextureCache_GetLastModified(const String* url) {
entry.length = 0; return entry; entry.length = 0; return entry;
} }
static String TextureCache_GetETag(const String* url) { static String GetCachedETag(const String* url) {
return TextureCache_GetFromTags(url, &etagCache); return GetCachedTag(url, &etagCache);
} }
CC_NOINLINE static void TextureCache_SetEntry(const String* url, const String* data, struct EntryList* list) { CC_NOINLINE static void SetCachedTag(const String* url, struct EntryList* list,
const String* data, const char* file) {
String key; char keyBuffer[STRING_INT_CHARS]; String key; char keyBuffer[STRING_INT_CHARS];
if (!data->length) return;
String_InitArray(key, keyBuffer); String_InitArray(key, keyBuffer);
HashUrl(&key, url);
TextureCache_HashUrl(&key, url);
EntryList_Set(list, &key, data); EntryList_Set(list, &key, data);
EntryList_Save(list); EntryList_Save(list, file);
}
static void TextureCache_SetETag(const String* url, const String* etag) {
if (!etag->length) return;
TextureCache_SetEntry(url, etag, &etagCache);
}
static void TextureCache_SetLastModified(const String* url, const String* time) {
if (!time->length) return;
TextureCache_SetEntry(url, time, &lastModifiedCache);
} }
/* Updates cached data, ETag, and Last-Modified for the given URL */ /* Updates cached data, ETag, and Last-Modified for the given URL */
static void TextureCache_Update(struct HttpRequest* req) { static void UpdateCache(struct HttpRequest* req) {
String path, url; char pathBuffer[FILENAME_SIZE]; String path, url; char pathBuffer[FILENAME_SIZE];
cc_result res; cc_result res;
url = String_FromRawArray(req->url); url = String_FromRawArray(req->url);
path = String_FromRawArray(req->etag); path = String_FromRawArray(req->etag);
TextureCache_SetETag(&url, &path); SetCachedTag(&url, &etagCache, &path, ETAGS_TXT);
path = String_FromRawArray(req->lastModified); path = String_FromRawArray(req->lastModified);
TextureCache_SetLastModified(&url, &path); SetCachedTag(&url, &lastModCache, &path, LASTMOD_TXT);
String_InitArray(path, pathBuffer); String_InitArray(path, pathBuffer);
TextureCache_MakePath(&path, &url); MakeCachePath(&path, &url);
res = Stream_WriteAllTo(&path, req->data, req->size); res = Stream_WriteAllTo(&path, req->data, req->size);
if (res) { Logger_Warn2(res, "caching", &url); } if (res) { Logger_Warn2(res, "caching", &url); }
} }
@ -382,7 +378,7 @@ void TexturePack_ExtractCurrent(cc_bool forceReload) {
cc_bool zip; cc_bool zip;
cc_result res; cc_result res;
if (!url.length || !TextureCache_Get(&url, &stream)) { if (!url.length || !OpenCachedData(&url, &stream)) {
/* don't pointlessly load default texture pack */ /* don't pointlessly load default texture pack */
if (texturePackDefault && !forceReload) return; if (texturePackDefault && !forceReload) return;
file = TexturePack_UNSAFE_GetDefault(); file = TexturePack_UNSAFE_GetDefault();
@ -408,7 +404,7 @@ void TexturePack_Apply(struct HttpRequest* item) {
cc_result res; cc_result res;
url = String_FromRawArray(item->url); url = String_FromRawArray(item->url);
TextureCache_Update(item); UpdateCache(item);
/* Took too long to download and is no longer active texture pack */ /* Took too long to download and is no longer active texture pack */
if (!String_Equals(&World_TextureUrl, &url)) return; if (!String_Equals(&World_TextureUrl, &url)) return;
@ -429,9 +425,9 @@ void TexturePack_DownloadAsync(const String* url, const String* id) {
/* Only retrieve etag/last-modified headers if the file exists */ /* Only retrieve etag/last-modified headers if the file exists */
/* This inconsistency can occur if user deleted some cached files */ /* This inconsistency can occur if user deleted some cached files */
if (TextureCache_Has(url)) { if (IsCached(url)) {
time = TextureCache_GetLastModified(url); time = GetCachedLastModified(url);
etag = TextureCache_GetETag(url); etag = GetCachedETag(url);
} }
Http_AsyncGetDataEx(url, true, id, &time, &etag, NULL); Http_AsyncGetDataEx(url, true, id, &time, &etag, NULL);
} }

11
src/Utils.c
View File

@ -220,7 +220,7 @@ int Convert_FromBase64(const char* src, int len, cc_uint8* dst) {
/*########################################################################################################################* /*########################################################################################################################*
*--------------------------------------------------------EntryList--------------------------------------------------------* *--------------------------------------------------------EntryList--------------------------------------------------------*
*#########################################################################################################################*/ *#########################################################################################################################*/
void EntryList_Load(struct EntryList* list, EntryList_Filter filter) { void EntryList_Load(struct EntryList* list, const char* file, EntryList_Filter filter) {
String entry; char entryBuffer[768]; String entry; char entryBuffer[768];
String path; char pathBuffer[FILENAME_SIZE]; String path; char pathBuffer[FILENAME_SIZE];
String key, value; String key, value;
@ -230,7 +230,7 @@ void EntryList_Load(struct EntryList* list, EntryList_Filter filter) {
cc_result res; cc_result res;
String_InitArray(path, pathBuffer); String_InitArray(path, pathBuffer);
String_AppendConst(&path, list->path); String_AppendConst(&path, file);
res = Stream_OpenFile(&stream, &path); res = Stream_OpenFile(&stream, &path);
if (res == ReturnCode_FileNotFound) return; if (res == ReturnCode_FileNotFound) return;
@ -268,14 +268,14 @@ void EntryList_Load(struct EntryList* list, EntryList_Filter filter) {
if (res) { Logger_Warn2(res, "closing", &path); } if (res) { Logger_Warn2(res, "closing", &path); }
} }
void EntryList_Save(struct EntryList* list) { void EntryList_Save(struct EntryList* list, const char* file) {
String path, entry; char pathBuffer[FILENAME_SIZE]; String path, entry; char pathBuffer[FILENAME_SIZE];
struct Stream stream; struct Stream stream;
int i; int i;
cc_result res; cc_result res;
String_InitArray(path, pathBuffer); String_InitArray(path, pathBuffer);
String_AppendConst(&path, list->path); String_AppendConst(&path, file);
res = Stream_CreateFile(&stream, &path); res = Stream_CreateFile(&stream, &path);
if (res) { Logger_Warn2(res, "creating", &path); return; } if (res) { Logger_Warn2(res, "creating", &path); return; }
@ -337,7 +337,6 @@ int EntryList_Find(struct EntryList* list, const String* key) {
} }
void EntryList_Init(struct EntryList* list, const char* path, char separator) { void EntryList_Init(struct EntryList* list, const char* path, char separator) {
list->path = path;
list->separator = separator; list->separator = separator;
EntryList_Load(list, NULL); EntryList_Load(list, path, NULL);
} }

6
src/Utils.h
View File

@ -62,9 +62,9 @@ struct EntryList {
typedef cc_bool (*EntryList_Filter)(const String* entry); typedef cc_bool (*EntryList_Filter)(const String* entry);
/* Loads the entries from disc. */ /* Loads the entries from disc. */
CC_NOINLINE void EntryList_Load(struct EntryList* list, EntryList_Filter filter); CC_NOINLINE void EntryList_Load(struct EntryList* list, const char* file, EntryList_Filter filter);
/* Saves the entries to disc. */ /* Saves the entries to disc. */
CC_NOINLINE void EntryList_Save(struct EntryList* list); CC_NOINLINE void EntryList_Save(struct EntryList* list, const char* file);
/* Removes the entry whose key caselessly equals the given key. */ /* 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 EntryList* list, const String* key);
/* Replaces the entry whose key caselessly equals the given key, or adds a new entry. */ /* Replaces the entry whose key caselessly equals the given key, or adds a new entry. */
@ -74,5 +74,5 @@ CC_NOINLINE STRING_REF String EntryList_UNSAFE_Get(struct EntryList* list, const
/* Finds the index of the entry whose key caselessly equals the given key. */ /* Finds the index of the entry whose key caselessly equals the given key. */
CC_NOINLINE int EntryList_Find(struct EntryList* list, const String* key); CC_NOINLINE int EntryList_Find(struct EntryList* list, const String* key);
/* Initialises the EntryList and loads the entries from disc. */ /* Initialises the EntryList and loads the entries from disc. */
void EntryList_Init(struct EntryList* list, const char* path, char separator); void EntryList_Init(struct EntryList* list, const char* file, char separator);
#endif #endif