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

FTp server fixes for Arduino v1

Browse Source
This commit is contained in:
fvanroie 2022-02-24 11:26:11 +01:00
parent d53130ce30
commit e8e78df7d9
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/SimpleFTPServer/FtpServer.cpp
View File

@ -64,13 +64,14 @@ void FtpServer::end()
DEBUG_PRINTLN(F("Stop server!")); DEBUG_PRINTLN(F("Stop server!"));
if(client.connected()) { if(client.connected()) {
DEBUG_PRINTLN(F("Disconnect client!"));
disconnectClient(); disconnectClient();
} }
ftpServer.end(); ftpServer.end();
dataServer.end(); dataServer.end();
cmdStage = FTP_Init; cmdStage = FTP_Stop;
transferStage = FTP_Close; transferStage = FTP_Close;
dataConn = FTP_NoConn; dataConn = FTP_NoConn;
} }
@ -1194,12 +1195,12 @@ bool FtpServer::doList()
#endif #endif
{ {
if(dir.isDirectory()) { if(fileDir.isDirectory()) {
data.print(F("+/,\t")); data.print(F("drw-rw-rw- 1 hasp hasp "));
DEBUG_PRINT(F("+/,\t")); DEBUG_PRINT(F("drw-rw-rw- "));
} else { } else {
data.print(F("+r,s")); data.print(F("-rw-rw-rw- 1 hasp hasp "));
DEBUG_PRINT(F("+r,s")); DEBUG_PRINT(F("-rw-rw-rw- "));
} }
#if ESP8266 #if ESP8266
data.print(long(dir.fileSize())); data.print(long(dir.fileSize()));
@ -1214,11 +1215,13 @@ bool FtpServer::doList()
long fz = fileDir.size(); long fz = fileDir.size();
#else #else
data.print(long(fileDir.size())); data.print(long(fileDir.size()));
data.print(F(",\t")); data.print(F(" "));
data.print(long(fileDir.getLastWrite()));
data.print(F(" "));
data.println(fileDir.name()); data.println(fileDir.name());
DEBUG_PRINT(long(fileDir.size())); DEBUG_PRINT(long(fileDir.size()));
DEBUG_PRINT(F(",\t")); DEBUG_PRINT(F(" "));
DEBUG_PRINTLN(fileDir.name()); DEBUG_PRINTLN(fileDir.name());
#endif #endif

17
lib/SimpleFTPServer/FtpServer.h
View File

@ -260,13 +260,14 @@
#define FTP_FILE_WRITE_APPEND "a+" #define FTP_FILE_WRITE_APPEND "a+"
#define FTP_FILE_WRITE_CREATE "w+" #define FTP_FILE_WRITE_CREATE "w+"
#else #else
#if 1 #if ESP_ARDUINO_VERSION_MAJOR >= 2
#include "LittleFS.h" #include "FS.h"
#define STORAGE_MANAGER LittleFS #include "LittleFS.h"
#else #define STORAGE_MANAGER LittleFS
#include "LITTLEFS.h" #else
#define STORAGE_MANAGER LITTLEFS #include "LITTLEFS.h"
#endif #define STORAGE_MANAGER LITTLEFS
#endif
#define FTP_FILE File #define FTP_FILE File
#define FTP_DIR File #define FTP_DIR File
@ -514,7 +515,7 @@ private:
#elif STORAGE_TYPE == STORAGE_FATFS #elif STORAGE_TYPE == STORAGE_FATFS
return file->fileName(); return file->fileName();
#else #else
#if 1 #if ESP_ARDUINO_VERSION_MAJOR >= 2
return file->path(); return file->path();
#else #else
return file->name(); return file->name();