mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Cleanup: move tag functions into own translation unit
Make dive.h a bit slimmer. It's only a drop in the bucket - but at least when modifying tag functions not the *whole* application is rebuilt anymore. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger
Dirk Hohndel
parent
46c69fccb7
commit
6200909ba4
25 changed files with 321 additions and 267 deletions
223
core/dive.c
223
core/dive.c
|
|
@ -14,24 +14,14 @@
|
|||
#include "qthelper.h"
|
||||
#include "metadata.h"
|
||||
#include "membuffer.h"
|
||||
#include "tag.h"
|
||||
#include "structured_list.h"
|
||||
|
||||
/* one could argue about the best place to have this variable -
|
||||
* it's used in the UI, but it seems to make the most sense to have it
|
||||
* here */
|
||||
struct dive displayed_dive;
|
||||
|
||||
struct tag_entry *g_tag_list = NULL;
|
||||
|
||||
static const char *default_tags[] = {
|
||||
QT_TRANSLATE_NOOP("gettextFromC", "boat"), QT_TRANSLATE_NOOP("gettextFromC", "shore"), QT_TRANSLATE_NOOP("gettextFromC", "drift"),
|
||||
QT_TRANSLATE_NOOP("gettextFromC", "deep"), QT_TRANSLATE_NOOP("gettextFromC", "cavern"), QT_TRANSLATE_NOOP("gettextFromC", "ice"),
|
||||
QT_TRANSLATE_NOOP("gettextFromC", "wreck"), QT_TRANSLATE_NOOP("gettextFromC", "cave"), QT_TRANSLATE_NOOP("gettextFromC", "altitude"),
|
||||
QT_TRANSLATE_NOOP("gettextFromC", "pool"), QT_TRANSLATE_NOOP("gettextFromC", "lake"), QT_TRANSLATE_NOOP("gettextFromC", "river"),
|
||||
QT_TRANSLATE_NOOP("gettextFromC", "night"), QT_TRANSLATE_NOOP("gettextFromC", "fresh"), QT_TRANSLATE_NOOP("gettextFromC", "student"),
|
||||
QT_TRANSLATE_NOOP("gettextFromC", "instructor"), QT_TRANSLATE_NOOP("gettextFromC", "photo"), QT_TRANSLATE_NOOP("gettextFromC", "video"),
|
||||
QT_TRANSLATE_NOOP("gettextFromC", "deco")
|
||||
};
|
||||
|
||||
const char *cylinderuse_text[] = {
|
||||
QT_TRANSLATE_NOOP("gettextFromC", "OC-gas"), QT_TRANSLATE_NOOP("gettextFromC", "diluent"), QT_TRANSLATE_NOOP("gettextFromC", "oxygen"), QT_TRANSLATE_NOOP("gettextFromC", "not used")
|
||||
};
|
||||
|
|
@ -474,31 +464,6 @@ struct dive *alloc_dive(void)
|
|||
return dive;
|
||||
}
|
||||
|
||||
/* Clear everything but the first element;
|
||||
* this works for taglist, picturelist, even dive computers */
|
||||
#define STRUCTURED_LIST_FREE(_type, _start, _free) \
|
||||
{ \
|
||||
_type *_ptr = _start; \
|
||||
while (_ptr) { \
|
||||
_type *_next = _ptr->next; \
|
||||
_free(_ptr); \
|
||||
_ptr = _next; \
|
||||
} \
|
||||
}
|
||||
|
||||
#define STRUCTURED_LIST_COPY(_type, _first, _dest, _cpy) \
|
||||
{ \
|
||||
_type *_sptr = _first; \
|
||||
_type **_dptr = &_dest; \
|
||||
while (_sptr) { \
|
||||
*_dptr = malloc(sizeof(_type)); \
|
||||
_cpy(_sptr, *_dptr); \
|
||||
_sptr = _sptr->next; \
|
||||
_dptr = &(*_dptr)->next; \
|
||||
} \
|
||||
*_dptr = 0; \
|
||||
}
|
||||
|
||||
static void free_dc(struct divecomputer *dc);
|
||||
static void free_dc_contents(struct divecomputer *dc);
|
||||
|
||||
|
|
@ -548,14 +513,6 @@ static void copy_pl(struct picture *sp, struct picture *dp)
|
|||
dp->filename = copy_string(sp->filename);
|
||||
}
|
||||
|
||||
/* copy an element in a list of tags */
|
||||
static void copy_tl(struct tag_entry *st, struct tag_entry *dt)
|
||||
{
|
||||
dt->tag = malloc(sizeof(struct divetag));
|
||||
dt->tag->name = copy_string(st->tag->name);
|
||||
dt->tag->source = copy_string(st->tag->source);
|
||||
}
|
||||
|
||||
static void free_dive_structures(struct dive *d)
|
||||
{
|
||||
if (!d)
|
||||
|
|
@ -3253,182 +3210,6 @@ static void join_dive_computers(struct dive *d, struct divecomputer *res,
|
|||
remove_redundant_dc(res, prefer_downloaded);
|
||||
}
|
||||
|
||||
static bool tag_seen_before(struct tag_entry *start, struct tag_entry *before)
|
||||
{
|
||||
while (start && start != before) {
|
||||
if (same_string(start->tag->name, before->tag->name))
|
||||
return true;
|
||||
start = start->next;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/* remove duplicates and empty nodes */
|
||||
void taglist_cleanup(struct tag_entry **tag_list)
|
||||
{
|
||||
struct tag_entry **tl = tag_list;
|
||||
while (*tl) {
|
||||
/* skip tags that are empty or that we have seen before */
|
||||
if (empty_string((*tl)->tag->name) || tag_seen_before(*tag_list, *tl)) {
|
||||
*tl = (*tl)->next;
|
||||
continue;
|
||||
}
|
||||
tl = &(*tl)->next;
|
||||
}
|
||||
}
|
||||
|
||||
char *taglist_get_tagstring(struct tag_entry *tag_list)
|
||||
{
|
||||
bool first_tag = true;
|
||||
struct membuffer b = { 0 };
|
||||
struct tag_entry *tmp = tag_list;
|
||||
while (tmp != NULL) {
|
||||
if (!empty_string(tmp->tag->name)) {
|
||||
if (first_tag) {
|
||||
put_format(&b, "%s", tmp->tag->name);
|
||||
first_tag = false;
|
||||
} else {
|
||||
put_format(&b, ", %s", tmp->tag->name);
|
||||
}
|
||||
}
|
||||
tmp = tmp->next;
|
||||
}
|
||||
/* Ensures we do return null terminated empty string for:
|
||||
* - empty tag list
|
||||
* - tag list with empty tag only
|
||||
*/
|
||||
mb_cstring(&b);
|
||||
return detach_buffer(&b);
|
||||
}
|
||||
|
||||
static inline void taglist_free_divetag(struct divetag *tag)
|
||||
{
|
||||
if (tag->name != NULL)
|
||||
free(tag->name);
|
||||
if (tag->source != NULL)
|
||||
free(tag->source);
|
||||
free(tag);
|
||||
}
|
||||
|
||||
/* Add a tag to the tag_list, keep the list sorted */
|
||||
static struct divetag *taglist_add_divetag(struct tag_entry **tag_list, struct divetag *tag)
|
||||
{
|
||||
struct tag_entry *next, *entry;
|
||||
|
||||
while ((next = *tag_list) != NULL) {
|
||||
int cmp = strcmp(next->tag->name, tag->name);
|
||||
|
||||
/* Already have it? */
|
||||
if (!cmp)
|
||||
return next->tag;
|
||||
/* Is the entry larger? If so, insert here */
|
||||
if (cmp > 0)
|
||||
break;
|
||||
/* Continue traversing the list */
|
||||
tag_list = &next->next;
|
||||
}
|
||||
|
||||
/* Insert in front of it */
|
||||
entry = malloc(sizeof(struct tag_entry));
|
||||
entry->next = next;
|
||||
entry->tag = tag;
|
||||
*tag_list = entry;
|
||||
return tag;
|
||||
}
|
||||
|
||||
struct divetag *taglist_add_tag(struct tag_entry **tag_list, const char *tag)
|
||||
{
|
||||
size_t i = 0;
|
||||
int is_default_tag = 0;
|
||||
struct divetag *ret_tag, *new_tag;
|
||||
const char *translation;
|
||||
new_tag = malloc(sizeof(struct divetag));
|
||||
|
||||
for (i = 0; i < sizeof(default_tags) / sizeof(char *); i++) {
|
||||
if (strcmp(default_tags[i], tag) == 0) {
|
||||
is_default_tag = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* Only translate default tags */
|
||||
if (is_default_tag) {
|
||||
translation = translate("gettextFromC", tag);
|
||||
new_tag->name = malloc(strlen(translation) + 1);
|
||||
memcpy(new_tag->name, translation, strlen(translation) + 1);
|
||||
new_tag->source = malloc(strlen(tag) + 1);
|
||||
memcpy(new_tag->source, tag, strlen(tag) + 1);
|
||||
} else {
|
||||
new_tag->source = NULL;
|
||||
new_tag->name = malloc(strlen(tag) + 1);
|
||||
memcpy(new_tag->name, tag, strlen(tag) + 1);
|
||||
}
|
||||
/* Try to insert new_tag into g_tag_list if we are not operating on it */
|
||||
if (tag_list != &g_tag_list) {
|
||||
ret_tag = taglist_add_divetag(&g_tag_list, new_tag);
|
||||
/* g_tag_list already contains new_tag, free the duplicate */
|
||||
if (ret_tag != new_tag)
|
||||
taglist_free_divetag(new_tag);
|
||||
ret_tag = taglist_add_divetag(tag_list, ret_tag);
|
||||
} else {
|
||||
ret_tag = taglist_add_divetag(tag_list, new_tag);
|
||||
if (ret_tag != new_tag)
|
||||
taglist_free_divetag(new_tag);
|
||||
}
|
||||
return ret_tag;
|
||||
}
|
||||
|
||||
void taglist_free(struct tag_entry *entry)
|
||||
{
|
||||
STRUCTURED_LIST_FREE(struct tag_entry, entry, free)
|
||||
}
|
||||
|
||||
struct tag_entry *taglist_copy(struct tag_entry *s)
|
||||
{
|
||||
struct tag_entry *res;
|
||||
STRUCTURED_LIST_COPY(struct tag_entry, s, res, copy_tl);
|
||||
return res;
|
||||
}
|
||||
|
||||
/* Merge src1 and src2, write to *dst */
|
||||
static void taglist_merge(struct tag_entry **dst, struct tag_entry *src1, struct tag_entry *src2)
|
||||
{
|
||||
struct tag_entry *entry;
|
||||
|
||||
for (entry = src1; entry; entry = entry->next)
|
||||
taglist_add_divetag(dst, entry->tag);
|
||||
for (entry = src2; entry; entry = entry->next)
|
||||
taglist_add_divetag(dst, entry->tag);
|
||||
}
|
||||
|
||||
void taglist_init_global()
|
||||
{
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < sizeof(default_tags) / sizeof(char *); i++)
|
||||
taglist_add_tag(&g_tag_list, default_tags[i]);
|
||||
}
|
||||
|
||||
bool taglist_contains(struct tag_entry *tag_list, const char *tag)
|
||||
{
|
||||
while (tag_list) {
|
||||
if (same_string(tag_list->tag->name, tag))
|
||||
return true;
|
||||
tag_list = tag_list->next;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
struct tag_entry *taglist_added(struct tag_entry *original_list, struct tag_entry *new_list)
|
||||
{
|
||||
struct tag_entry *added_list = NULL;
|
||||
while (new_list) {
|
||||
if (!taglist_contains(original_list, new_list->tag->name))
|
||||
taglist_add_tag(&added_list, new_list->tag->name);
|
||||
new_list = new_list->next;
|
||||
}
|
||||
return added_list;
|
||||
}
|
||||
|
||||
bool is_dc_planner(const struct divecomputer *dc)
|
||||
{
|
||||
return same_string(dc->model, "planned dive");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue