jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow L: drive letter in script path

Browse Source
This commit is contained in:
fvanroie 2022-05-07 00:58:37 +02:00
parent 09e459bc5b
commit 5dfd577599
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/hasp/hasp_dispatch.cpp
View File

@ -685,13 +685,12 @@ void dispatch_parse_jsonl(const char*, const char* payload, uint8_t source)
void dispatch_exec(const char*, const char* payload, uint8_t source) void dispatch_exec(const char*, const char* payload, uint8_t source)
{ {
const char* filename = payload;
if(filename[0] == 'L' && filename[1] == ':') filename += 2; // strip littlefs drive letter
#if ARDUINO #if ARDUINO
#if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0 #if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0
const char* filename = payload;
if(filename[0] == 'L' && filename[1] == ':') filename += 2; // strip littlefs drive letter
if(!HASP_FS.exists(filename)) { if(!HASP_FS.exists(filename)) {
LOG_WARNING(TAG_MSGR, F(D_FILE_NOT_FOUND ": %s"), payload); LOG_WARNING(TAG_MSGR, F(D_FILE_NOT_FOUND ": %s"), payload);
return; return;
@ -731,13 +730,13 @@ void dispatch_exec(const char*, const char* payload, uint8_t source)
cmdfile.close(); cmdfile.close();
LOG_INFO(TAG_MSGR, F(D_FILE_LOADED), payload); LOG_INFO(TAG_MSGR, F(D_FILE_LOADED), payload);
#else #else
LOG_INFO(TAG_MSGR, F(D_FILE_LOAD_FAILED), payload); LOG_ERROR(TAG_MSGR, F(D_FILE_LOAD_FAILED), payload);
#endif #endif
#else #else
char path[strlen(payload) + 4]; char path[strlen(filename) + 4];
path[0] = '.'; path[0] = '.';
path[1] = '\0'; path[1] = '\0';
strcat(path, payload); strcat(path, filename);
path[1] = '\\'; path[1] = '\\';
LOG_TRACE(TAG_HASP, F("Loading %s from disk..."), path); LOG_TRACE(TAG_HASP, F("Loading %s from disk..."), path);