CloneRepos/CYD-Klipper
2
0
Fork 0
mirror of https://github.com/suchmememanyskill/CYD-Klipper.git synced 2026-03-21 05:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Start implementation on file list

Browse Source
This commit is contained in:
Sims
2024-12-11 08:29:18 +01:00
parent 1578b4129d
commit 2fce5a9e30
6 changed files with 73 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CYD-Klipper/src/core/klipper/klipper_printer_integration.cpp
View File

@@ -330,7 +330,7 @@ Files KlipperPrinter::get_files()
Files files_result = {0};
HTTPClient client;
LOG_F(("Heap space pre-file-parse: %d bytes\n", esp_get_free_heap_size()));
std::list<FileSystemFile> files;
std::list<KlipperFileSystemFile> files;
auto timer_request = millis();
configure_http_client(client, "/server/files/list", true, 5000);

4
CYD-Klipper/src/core/klipper/klipper_printer_integration.hpp
View File

@@ -8,7 +8,7 @@
typedef struct {
char* name;
float modified;
} FileSystemFile;
} KlipperFileSystemFile;
class KlipperPrinter : public BasePrinter
{
@@ -32,7 +32,7 @@ class KlipperPrinter : public BasePrinter
int parse_macros_count(JsonDocument &in);
PowerDevices parse_power_devices(JsonDocument &in);
int parse_power_devices_count(JsonDocument &in);
void parse_file_list(JsonDocument &in, std::list<FileSystemFile> &files, int fetch_limit);
void parse_file_list(JsonDocument &in, std::list<KlipperFileSystemFile> &files, int fetch_limit);
char *parse_thumbnails(JsonDocument &in);
public:

4
CYD-Klipper/src/core/klipper/klipper_printer_parsers.cpp
View File

@@ -310,13 +310,13 @@ int KlipperPrinter::parse_power_devices_count(JsonDocument &in)
return count;
}
void KlipperPrinter::parse_file_list(JsonDocument &in, std::list<FileSystemFile> &files, int fetch_limit)
void KlipperPrinter::parse_file_list(JsonDocument &in, std::list<KlipperFileSystemFile> &files, int fetch_limit)
{
auto result = in["result"].as<JsonArray>();
for (auto file : result)
{
FileSystemFile f = {0};
KlipperFileSystemFile f = {0};
const char *path = file["path"];
float modified = file["modified"];
auto file_iter = files.begin();

13
CYD-Klipper/src/core/octoprint/octoprint_printer_integration.cpp
View File

@@ -269,6 +269,19 @@ bool OctoPrinter::set_power_device_state(const char* device_name, bool state)
Files OctoPrinter::get_files()
{
HTTPClient client;
JsonDocument filter;
JsonDocument doc;
configure_http_client(client, "/api/files?recursive=true", true, 5000, printer_config);
filter["files"][0]["path"] = true;
filter["files"][0]["date"] = true;
if (client.GET() == 200)
{
auto parseResult = deserializeJson(doc, client.getStream(), DeserializationOption::Filter(filter));
}
return {};
}

7
CYD-Klipper/src/core/octoprint/octoprint_printer_integration.hpp
View File

@@ -1,6 +1,12 @@
#include "../printer_integration.hpp"
#include <HTTPClient.h>
#include <ArduinoJson.h>
#include <list>
typedef struct {
char* name;
float modified;
} OctoFileSystemFile;
class OctoPrinter : public BasePrinter
{
@@ -11,6 +17,7 @@ class OctoPrinter : public BasePrinter
void parse_printer_state(JsonDocument& in);
void parse_job_state(JsonDocument& in);
void parse_error(JsonDocument& in);
void OctoPrinter::parse_file_list(JsonDocument &in, std::list<OctoFileSystemFile> &files, int fetch_limit);
bool get_request(const char* endpoint, int timeout_ms = 1000, bool stream = true);
bool post_request(const char* endpoint, const char* body, int timeout_ms = 1000, bool stream = false);

48
CYD-Klipper/src/core/octoprint/octoprint_printer_parsers.cpp
View File

@@ -101,4 +101,52 @@ void OctoPrinter::parse_error(JsonDocument& in)
strcpy(printer_data.state_message, error);
}
}
}
void OctoPrinter::parse_file_list(JsonDocument &in, std::list<OctoFileSystemFile> &files, int fetch_limit)
{
auto result = in["files"].as<JsonArray>();
for (auto file : result)
{
OctoFileSystemFile f = {0};
const char *path = file["path"];
float modified = file["date"];
auto file_iter = files.begin();
while (file_iter != files.end())
{
if ((*file_iter).modified < modified)
break;
file_iter++;
}
if (file_iter == files.end() && files.size() >= fetch_limit)
continue;
f.name = (char *)malloc(strlen(path) + 1);
if (f.name == NULL)
{
LOG_LN("Failed to allocate memory");
continue;
}
strcpy(f.name, path);
f.modified = modified;
if (file_iter != files.end())
files.insert(file_iter, f);
else
files.push_back(f);
if (files.size() > fetch_limit)
{
auto last_entry = files.back();
if (last_entry.name != NULL)
free(last_entry.name);
files.pop_back();
}
}
}