Clean-up of the "Upload to" code (AstroBox, Duet, FlashAir, OctoPrint)

This commit is contained in:
bubnikv 2020-01-06 10:59:46 +01:00
parent b08a315a46
commit 791f487c76
8 changed files with 48 additions and 179 deletions

View file

@ -9,7 +9,6 @@
namespace Slic3r {
class DynamicPrintConfig;
class Http;
@ -17,18 +16,18 @@ class FlashAir : public PrintHost
{
public:
FlashAir(DynamicPrintConfig *config);
virtual ~FlashAir();
~FlashAir() override = default;
virtual const char* get_name() const;
const char* get_name() const override;
virtual bool test(wxString &curl_msg) const;
virtual wxString get_test_ok_msg () const;
virtual wxString get_test_failed_msg (wxString &msg) const;
virtual bool upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn) const;
virtual bool has_auto_discovery() const;
virtual bool can_test() const;
virtual bool can_start_print() const;
virtual std::string get_host() const { return host; }
bool test(wxString &curl_msg) const override;
wxString get_test_ok_msg() const override;
wxString get_test_failed_msg(wxString &msg) const override;
bool upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn) const override;
bool has_auto_discovery() const override { return false; }
bool can_test() const override { return true; }
bool can_start_print() const override { return false; }
std::string get_host() const override { return host; }
private:
std::string host;
@ -38,7 +37,6 @@ private:
std::string make_url(const std::string &path, const std::string &arg, const std::string &val) const;
};
}
#endif