Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨Add list_files function #615 #615

Open
wants to merge 19 commits into
base: develop-pros-4
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions include/pros/misc.h
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,49 @@ double battery_get_capacity(void);
*/
int32_t usd_is_installed(void);

/**
* Lists the files in a directory specified by the path
* Puts the list of file names (NOT DIRECTORIES) into the buffer seperated by newlines
*
* This function uses the following values of errno when an error state is
* reached:
*
* EIO - Hard error occured in the low level disk I/O layer
* EINVAL - file or directory is invalid, or length is invalid
* EBUSY - THe physical drinve cannot work
* ENOENT - cannot find the path or file
* EINVAL - the path name format is invalid
* EACCES - Access denied or directory full
* EEXIST - Access denied
* EROFS - SD card is write protected
* ENXIO - drive number is invalid or not a FAT32 drive
* ENOBUFS - drive has no work area
* ENFILE - too many open files
*
*
*
* \note use a path of "\" to list the files in the main directory NOT "/usd/"
* DO NOT PREPEND YOUR PATHS WITH "/usd/"
*
* \return 1 on success or PROS_ERR on failure setting errno
*
* \b Example
* \code
* void opcontrol() {
* char* test = (char*) malloc(128);
* pros::c::usd_list_files_raw("/", test, 128);
* pros::delay(200);
* printf("%s\n", test); //Prints the file names in the root directory seperated by newlines
* pros::delay(100);
* pros::c::usd_list_files_raw("/test", test, 128);
* pros::delay(200);
* printf("%s\n", test); //Prints the names of files in the folder named test seperated by newlines
* pros::delay(100);
* }
* \endcode
*/
int32_t usd_list_files_raw(const char* path, char* buffer, int32_t len);

/******************************************************************************/
/** Date and Time **/
/******************************************************************************/
Expand Down
90 changes: 90 additions & 0 deletions include/pros/misc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include <cstdint>
#include <string>
#include <vector>

namespace pros {
inline namespace v5 {
Expand Down Expand Up @@ -525,6 +526,95 @@ namespace usd {
* \endcode
*/
std::int32_t is_installed(void);

/**
Lists the files in a directory specified by the path
* Puts the list of file names (NOT DIRECTORIES) into the buffer seperated by newlines
*
* This function uses the following values of errno when an error state is
* reached:
*
* EIO - Hard error occured in the low level disk I/O layer
* EINVAL - file or directory is invalid, or length is invalid
* EBUSY - THe physical drinve cannot work
* ENOENT - cannot find the path or file
* EINVAL - the path name format is invalid
* EACCES - Access denied or directory full
* EEXIST - Access denied
* EROFS - SD card is write protected
* ENXIO - drive number is invalid or not a FAT32 drive
* ENOBUFS - drive has no work area
* ENFILE - too many open files
*
*
*
* \note use a path of "\" to list the files in the main directory NOT "/usd/"
* DO NOT PREPEND YOUR PATHS WITH "/usd/"
*
* \return 1 on success or PROS_ERR on failure, setting errno
*
* \b Example
* \code
* void opcontrol() {
* char* test = (char*) malloc(128);
* pros::usd::list_files_raw("/", test, 128);
* pros::delay(200);
* printf("%s\n", test); //Prints the file names in the root directory seperated by newlines
* pros::delay(100);
* pros::list_files_raw("/test", test, 128);
* pros::delay(200);
* printf("%s\n", test); //Prints the names of files in the folder named test seperated by newlines
* pros::delay(100);
* }
* \endcode
*/
std::int32_t list_files_raw(const char* path, char* buffer, int32_t len);

/**
Lists the files in a directory specified by the path
* Puts the list of file names (NOT DIRECTORIES) into the buffer seperated by newlines
*
* This function uses the following values of errno when an error state is
* reached:
*
* EIO - Hard error occured in the low level disk I/O layer
* EINVAL - file or directory is invalid, or length is invalid
* EBUSY - THe physical drinve cannot work
* ENOENT - cannot find the path or file
* EINVAL - the path name format is invalid
* EACCES - Access denied or directory full
* EEXIST - Access denied
* EROFS - SD card is write protected
* ENXIO - drive number is invalid or not a FAT32 drive
* ENOBUFS - drive has no work area
* ENFILE - too many open files
*
*
*
* \note use a path of "\" to list the files in the main directory NOT "/usd/"
* DO NOT PREPEND YOUR PATHS WITH "/usd/"
*
* \return vector of std::string of file names, if error occurs, returns vector containing
* one element specifying the error state
*
* \b Example
* \code
* void opcontrol() {
* char* test = (char*) malloc(128);
* // Will return vector containing names of files in root directory
* std::vector<std::string> files = pros::usd::list_files("/", test, 128);
* pros::delay(200);
* // Given vector of std::string file names, print each file name
* // Note that if there is an error, the vector will contain one element, which
* // is the error state
* // Print each file name
* for (std::string file : files) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for (std::string& file : files) {

That & is very important for performance reasons.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implemented this suggestion in commit on Oct 30, 3d41ca6

* std::cout << file << std::endl;
* }
* }
* \endcode
*/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Surely the docs should explain the params as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added param in header for funcs in commit 3d41ca6 and 4247fb1

std::vector<std::string> list_files(const char* path, char* buffer, int32_t len);
} // namespace usd

} // namespace pros
Expand Down
12 changes: 12 additions & 0 deletions src/devices/vdml_usd.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,15 @@
int32_t usd_is_installed(void) {
return vexFileDriveStatus(0);
}
static const int FRESULTMAP[] = {0, EIO, EINVAL, EBUSY, ENOENT, ENOENT, EINVAL, EACCES, // FR_DENIED
EEXIST, EINVAL, EROFS, ENXIO, ENOBUFS, ENXIO, EIO, EACCES, // FR_LOCKED
ENOBUFS, ENFILE, EINVAL};

int32_t usd_list_files_raw(const char* path, char* buffer, int32_t len) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this might be handled by vexFileDirectoryGet already, but can we add nullchecks for these parameters?

FRESULT result = vexFileDirectoryGet(path, buffer, len);
if (result != F_OK) {
errno = FRESULTMAP[result];
return PROS_ERR;
}
return PROS_SUCCESS;
}
75 changes: 75 additions & 0 deletions src/devices/vdml_usd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,80 @@ std::int32_t is_installed(void) {
return usd_is_installed();
}

std::int32_t list_files_raw(const char* path, char* buffer, int32_t len) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for our C++ API please use std::string and .c_str to call the internal C funcs.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make sure all of the std::strings are also references pls*

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

std::string_view

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

std::string_view

I understand that's more C++onic but for the sake of our users I think a std::string would be a little more approachable... saves everyone a google search.

Copy link
Contributor

@djava djava Nov 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😖 wasted allocation for every call with a string literal for path, which I assume is the typical case.

Copy link
Contributor

@djava djava Nov 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make sure all of the std::strings are also references pls*

If you choose to use std::string instead of string_view do make sure its const refs, as mutable refs will cause other issues (won't accept temporaries i.e. string literals that convert to std::string)

return usd_list_files_raw(path, buffer, len);
}

std::vector<std::string> list_files(const char* path, char* buffer, int32_t len) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function should definitely not require users to pass in their own buffer and len. You should just allocate a buffer yourself at the top of this function body then free it after it's done being used.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implemented this change in commit 4247fb1

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, can I ask if the number 10000 came from somewhere or was it chosen arbitrarily?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Came from an estimate of the worst case that is realistic to happen. We needed to chose a number, and decided that 100 files in a single directory with an approximate average length of 100 (really 99 if you include the separators) will be enough for every feasible use case we could come up with.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, fair enough. If you're choosing a number, a power of 2 (or sum of powers of 2) might be nice for memory allocator friendliness :)

(I have no idea what allocation strategy VexOS uses, this may be completely irrelevant)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use a std::string instead of a c_string pls.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

std::string_view actually

std::vector<std::string> files = {};
// Call the C function
int32_t success = usd_list_files_raw(path, buffer, len);
// Check if call successful, if error return vector containing error state
if (success == PROS_ERR) {
// Check errno to see which error state occurred
// push back error state to files vector as std::string
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mmm I'm definitely not convinced that this error handling strategy is a good approach. Maybe an out-param for the vector is better so you have some other way to return errors? That's more inline with how pros usually does things anyway. (returning errors via return type)

switch (errno) {
case EIO:
files.push_back("EIO");
break;
case EINVAL:
files.push_back("EINVAL");
break;
case EBUSY:
files.push_back("EBUSY");
break;
case ENOENT:
files.push_back("ENOENT");
break;
case EACCES:
files.push_back("EACCES");
break;
case EEXIST:
files.push_back("EEXIST");
break;
case EROFS:
files.push_back("EROFS");
break;
case ENXIO:
files.push_back("ENXIO");
break;
case ENOBUFS:
files.push_back("ENOBUFS");
break;
case ENFILE:
files.push_back("ENFILE");
break;
default:
// If none of the above, will be FILE IO error
files.push_back("FILE I/O ERROR");
break;
}
return files;
}
// Parse buffer given call successful, split by '/n'
// Store char * buffer as std::string in str
// Store delimiter in std::string, '\n'
std::string str(buffer);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no reason to allocate a whole additional std::string for this, use std::string_view over the already-existing buffer instead. You can still use .find() the same way.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implemented this change in commit 3d41ca6.

std::string delimiter = "\n";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

char delimeter = '\n';

You definitely don't need a whole std::string for just \n, which is only a single char.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implemented this change in commit 3d41ca6


// position to keep track of position in str
// file_name used to store each file name
size_t position = 0;
std::string file_name;

// Loop until delimiter '\n' can not be found anymore
while ((position = str.find(delimiter)) != std::string::npos) {
// file_name is the string from the beginning of str to the first '\n', excluding '\n'
file_name = str.substr(0, position);
// Add token to files vector
files.push_back(file_name);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should move file_name into the vector instead of copying it. This will reuse the already allocated heap buffer instead of copying over a new one, resulting in each file name being copied once instead of twice or more.

files.emplace_back(std::move(file_name));

Alternatively, file_name could be a std::string_view that you emplace_back. Since files::value_type is std::string, that will result in the file name being copied (for the first time). Actually I think I like this solution better than the move anyway.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implemented this change in commit 3d41ca6. Made file_name a std::string_view.

// Erase file_name from str, would be pos + 1 if we wanted to include '\n'
str.erase(0, position + 1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't work if you use a std::string_view for str (and it's very unnecessarily slow even as a std::string). You should either keep track of the index to start at for the next iteration, or maybe str = str.substr(...)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implemented this change in commit 3d41ca6. Altered code to instead have index to keep track of start for next iteration.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice! Thanks

}

// return vector of file names
return files;
}

} // namespace usd
} // namespace pros