comparison src/cache.c @ 318:b16b9b8979e5

Add a new struct ConfOptions to handle options. Changes were made among the code to use only one global var named "options" of type ConfOptions *. Initialization takes place in new init_options().

317:46169c246c51

	else
		{
		cache_ext = NULL;
		}

	if (((type != CACHE_TYPE_METADATA && enable_thumb_dirs) ||
	     (type == CACHE_TYPE_METADATA && enable_metadata_dirs)) &&
	    access_file(base, W_OK))
		{
		path = g_strconcat(base, "/", cache_local, name, cache_ext, NULL);
		if (mode) *mode = 0775;
		}

	name = filename_from_path(source);
	base = remove_level_from_path(source);

	if (type == CACHE_TYPE_METADATA)
		{
		prefer_local = enable_metadata_dirs;
		}
	else
		{
		prefer_local = enable_thumb_dirs;
		}

	if (prefer_local)
		{
		path = g_strconcat(base, "/", cache_local, "/", name, cache_ext, NULL);

318:b16b9b8979e5

	else
		{
		cache_ext = NULL;
		}

	if (((type != CACHE_TYPE_METADATA && options->enable_thumb_dirs) ||
	     (type == CACHE_TYPE_METADATA && options->enable_metadata_dirs)) &&
	    access_file(base, W_OK))
		{
		path = g_strconcat(base, "/", cache_local, name, cache_ext, NULL);
		if (mode) *mode = 0775;
		}

	name = filename_from_path(source);
	base = remove_level_from_path(source);

	if (type == CACHE_TYPE_METADATA)
		{
		prefer_local = options->enable_metadata_dirs;
		}
	else
		{
		prefer_local = options->enable_thumb_dirs;
		}

	if (prefer_local)
		{
		path = g_strconcat(base, "/", cache_local, "/", name, cache_ext, NULL);