TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Propagate partial_range up into PHYSFSX_findFiles family

Browse source
This commit is contained in:
Kp 2016-01-29 04:05:47 +00:00
parent 92625ff2d0
commit ff67afd440
5 changed files with 21 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/include/partial_range.h
View file

@ -42,6 +42,7 @@ public:
}
partial_range_t(const partial_range_t &) = default;
partial_range_t(partial_range_t &&) = default;
partial_range_t &operator=(const partial_range_t &) = default;
template <typename T>
partial_range_t(T &t) :
m_begin(partial_range_detail::adl_begin(t)), m_end(partial_range_detail::adl_end(t))

20
common/include/physfs_list.h
View file

@ -82,27 +82,11 @@ typedef PHYSFSX_counted_list_template<PHYSFS_list_deleter> PHYSFSX_counted_list;
__attribute_nonnull()
__attribute_warn_unused_result
PHYSFSX_uncounted_list PHYSFSX_findFiles(const char *path, const file_extension_t *exts, uint_fast32_t count);
template <std::size_t count>
__attribute_nonnull()
__attribute_warn_unused_result
static inline PHYSFSX_uncounted_list PHYSFSX_findFiles(const char *path, const array<file_extension_t, count> &exts)
{
return PHYSFSX_findFiles(path, exts.data(), count);
}
PHYSFSX_uncounted_list PHYSFSX_findFiles(const char *path, partial_range_t<const file_extension_t *> exts);
__attribute_nonnull()
__attribute_warn_unused_result
PHYSFSX_uncounted_list PHYSFSX_findabsoluteFiles(const char *path, const char *realpath, const file_extension_t *exts, uint_fast32_t count);
template <std::size_t count>
__attribute_nonnull()
__attribute_warn_unused_result
static inline PHYSFSX_uncounted_list PHYSFSX_findabsoluteFiles(const char *path, const char *realpath, const array<file_extension_t, count> &exts)
{
return PHYSFSX_findabsoluteFiles(path, realpath, exts.data(), count);
}
PHYSFSX_uncounted_list PHYSFSX_findabsoluteFiles(const char *path, const char *realpath, const partial_range_t<const file_extension_t *> exts);
}
#endif

7
common/include/physfsx.h
View file

@ -451,13 +451,6 @@ __attribute_nonnull()
__attribute_warn_unused_result
int PHYSFSX_checkMatchingExtension(const char *filename, const partial_range_t<const file_extension_t *>);
__attribute_nonnull()
__attribute_warn_unused_result
static inline int PHYSFSX_checkMatchingExtension(const char *filename, const file_extension_t *exts, const uint_fast32_t count)
{
return PHYSFSX_checkMatchingExtension(filename, unchecked_partial_range(exts, count));
}
template <std::size_t count>
__attribute_nonnull()
__attribute_warn_unused_result

26
similar/main/menu.cpp
View file

@ -150,13 +150,13 @@ public:
};
__attribute_nonnull()
static int select_file_recursive(const char *title, const char *orig_path, const file_extension_t *ext_list, uint32_t ext_count, int select_dir, select_file_subfunction_t<void>::type when_selected, void *userdata);
static int select_file_recursive(const char *title, const char *orig_path, const partial_range_t<const file_extension_t *> &ext_list, int select_dir, select_file_subfunction_t<void>::type when_selected, void *userdata);
template <typename T, std::size_t count>
__attribute_nonnull()
static int select_file_recursive(const char *title, const char *orig_path, const array<file_extension_t, count> &ext_list, int select_dir, typename select_file_subfunction_t<T>::type when_selected, T *userdata)
{
return select_file_recursive(title, orig_path, ext_list.data(), count, select_dir, reinterpret_cast<select_file_subfunction_t<void>::type>(when_selected), reinterpret_cast<void *>(userdata));
return select_file_recursive(title, orig_path, ext_list, select_dir, reinterpret_cast<select_file_subfunction_t<void>::type>(when_selected), reinterpret_cast<void *>(userdata));
}
// Hide all menus
@ -1603,12 +1603,16 @@ namespace {
struct browser
{
browser(const partial_range_t<const file_extension_t *> &r) :
ext_range(r)
{
}
const char *title; // The title - needed for making another listbox when changing directory
int (*when_selected)(void *userdata, const char *filename); // What to do when something chosen
void *userdata; // Whatever you want passed to when_selected
string_array_t list;
const file_extension_t *ext_list; // List of file extensions we're looking for (if looking for a music file many types are possible)
uint32_t ext_count;
// List of file extensions we're looking for (if looking for a music file many types are possible)
const partial_range_t<const file_extension_t *> ext_range;
int select_dir; // Allow selecting the current directory (e.g. for Jukebox level song directory)
int new_path; // Whether the view_path is a new searchpath, if so, remove it when finished
char view_path[PATH_MAX]; // The absolute path we're currently looking at
@ -1622,7 +1626,7 @@ static void list_dir_el(void *vb, const char *, const char *fname)
const char *r = PHYSFS_getRealDir(fname);
if (!r)
r = "";
if (!strcmp(r, b->view_path) && (PHYSFS_isDirectory(fname) || PHYSFSX_checkMatchingExtension(fname, b->ext_list, b->ext_count))
if (!strcmp(r, b->view_path) && (PHYSFS_isDirectory(fname) || PHYSFSX_checkMatchingExtension(fname, b->ext_range))
#if defined(__APPLE__) && defined(__MACH__)
&& d_stricmp(fname, "Volumes") // this messes things up, use '..' instead
#endif
@ -1675,7 +1679,7 @@ static int select_file_handler(listbox *menu,const d_event &event, browser *b)
snprintf(newpath, sizeof(char)*PATH_MAX, "%s:%s", text, sep);
if (!rval && text[0])
{
select_file_recursive(b->title, newpath, b->ext_list, b->ext_count, b->select_dir, b->when_selected, b->userdata);
select_file_recursive(b->title, newpath, b->ext_range, b->select_dir, b->when_selected, b->userdata);
// close old box.
window_close(listbox_get_window(menu));
}
@ -1740,7 +1744,7 @@ static int select_file_handler(listbox *menu,const d_event &event, browser *b)
if ((citem == 0) || PHYSFS_isDirectory(list[citem]))
{
// If it fails, stay in this one
return !select_file_recursive(b->title, newpath, b->ext_list, b->ext_count, b->select_dir, b->when_selected, b->userdata);
return !select_file_recursive(b->title, newpath, b->ext_range, b->select_dir, b->when_selected, b->userdata);
}
return !(*b->when_selected)(b->userdata, list[citem]);
}
@ -1758,18 +1762,16 @@ static int select_file_handler(listbox *menu,const d_event &event, browser *b)
return 0;
}
static int select_file_recursive(const char *title, const char *orig_path, const file_extension_t *ext_list, uint32_t ext_count, int select_dir, select_file_subfunction_t<void>::type when_selected, void *userdata)
static int select_file_recursive(const char *title, const char *orig_path, const partial_range_t<const file_extension_t *> &ext_range, int select_dir, select_file_subfunction_t<void>::type when_selected, void *userdata)
{
const char *sep = PHYSFS_getDirSeparator();
char *p;
char new_path[PATH_MAX];
auto b = make_unique<browser>();
auto b = make_unique<browser>(ext_range);
b->title = title;
b->when_selected = when_selected;
b->userdata = userdata;
b->ext_list = ext_list;
b->ext_count = ext_count;
b->select_dir = select_dir;
b->view_path[0] = '\0';
b->new_path = 1;
@ -1849,7 +1851,7 @@ static int select_file_recursive(const char *title, const char *orig_path, const
DXX_MENUITEM(VERB, MENU, TXT " (browse...)", OPT)
#else
int select_file_recursive(const char *title, const char *orig_path, const file_extension_t *ext_list, uint32_t ext_count, int select_dir, int (*when_selected)(void *userdata, const char *filename), void *userdata)
int select_file_recursive(const char *title, const char *orig_path, const partial_range_t<const file_extension_t *> &ext_range, int select_dir, int (*when_selected)(void *userdata, const char *filename), void *userdata)
{
return 0;
}

8
similar/misc/physfsx.cpp
View file

@ -472,20 +472,20 @@ static inline PHYSFSX_uncounted_list PHYSFSX_findPredicateFiles(const char *path
// Find files at path that have an extension listed in exts
// The extension list exts must be NULL-terminated, with each ext beginning with a '.'
PHYSFSX_uncounted_list PHYSFSX_findFiles(const char *path, const file_extension_t *exts, uint_fast32_t count)
PHYSFSX_uncounted_list PHYSFSX_findFiles(const char *path, const partial_range_t<const file_extension_t *> exts)
{
const auto predicate = [&](const char *i) {
return PHYSFSX_checkMatchingExtension(i, exts, count);
return PHYSFSX_checkMatchingExtension(i, exts);
};
return PHYSFSX_findPredicateFiles(path, predicate);
}
// Same function as above but takes a real directory as second argument, only adding files originating from this directory.
// This can be used to further seperate files in search path but it must be made sure realpath is properly formatted.
PHYSFSX_uncounted_list PHYSFSX_findabsoluteFiles(const char *path, const char *realpath, const file_extension_t *exts, uint_fast32_t count)
PHYSFSX_uncounted_list PHYSFSX_findabsoluteFiles(const char *path, const char *realpath, const partial_range_t<const file_extension_t *> exts)
{
const auto predicate = [&](const char *i) {
return PHYSFSX_checkMatchingExtension(i, exts, count) && (!strcmp(PHYSFS_getRealDir(i), realpath));
return PHYSFSX_checkMatchingExtension(i, exts) && (!strcmp(PHYSFS_getRealDir(i), realpath));
};
return PHYSFSX_findPredicateFiles(path, predicate);
}