Small refactoring - pulling things out of main.cpp

src/bitcoinity_ticker_price.cpp

@@ -0,0 +1,60 @@
+/* Copyright 2022, Michele Santullo
+ * This file is part of duckticker.
+ *
+ * Wrenpp is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Wrenpp is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with duckticker.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bitcoinity_ticker_price.hpp"
+#include "bitcoinity_reader.hpp"
+
+namespace duck {
+TickerPrice bitcoinity_ticker_price (std::string_view currency, std::string_view exchange) {
+	static const TickerPrice error_price {0.0, "", ""};
+
+	duck::BitcoinityReader bitcoinity{
+		std::string{duck::WebsocketReader::BeastVersionString} + " websocket-client-coro",
+		exchange,
+		currency
+	};
+
+	do {
+		//possible values I observed:
+		//  {"event":"new_msg","payload":{"data":{"currency":"EUR","exchange_name":"paymium","last":28363.44}},"ref":null,"topic":"webs:markets"}
+		//  {"event":"new_msg","payload":{"data":{"currency":"USD","depth":{"price":30071,"type":1,"volume":-1.4123},"exchange_name":"bitfinex"}},"ref":null,"topic":"webs:markets_bitfinex_USD"}
+		//  {"event":"new_msg","payload":{"data":{"currency":"USD","exchange_name":"bitfinex","trade":{"amount":0.0486,"date":1652471682,"exchange_name":"bitfinex","price":30072}}},"ref":null,"topic":"webs:markets_bitfinex_USD"}
+
+		double price_out;
+		std::optional<double> price;
+		auto msg = bitcoinity.read();
+
+		if (msg.payload.has_key("data", "depth_shot"))
+			continue;
+
+		if ((price = msg.payload.get_double("data", "last")))
+			price_out = *price;
+		else if ((price = msg.payload.get_double("data", "depth", "price")))
+			price_out = *price;
+		else if ((price = msg.payload.get_double("data", "trade", "price")))
+			price_out = *price;
+		else
+			continue; //keep trying, sometimes I get a message like:
+					  //{"event":"new_msg","payload":{"data":{"connected_count":1355}},"ref":null,"topic":"webs:markets"}
+
+		std::string_view currency_out = msg.payload.get_string_or_empty("data", "currency");
+		std::string_view exchange_out = msg.payload.get_string_or_empty("data", "exchange_name");
+		return {price_out, std::string(currency_out), std::string(exchange_out)};
+	} while (true);
+}
+
+} //namespace duck

src/bitcoinity_ticker_price.hpp

@@ -0,0 +1,24 @@
+/* Copyright 2022, Michele Santullo
+ * This file is part of duckticker.
+ *
+ * Wrenpp is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Wrenpp is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with duckticker.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "ticker_price.hpp"
+
+namespace duck {
+TickerPrice bitcoinity_ticker_price (std::string_view currency, std::string_view exchange);
+} //namespace duck

src/main.cpp

@@ -15,7 +15,7 @@
  * along with duckticker.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "bitcoinity_reader.hpp"
+#include "bitcoinity_ticker_price.hpp"
 #include <wrenpp/vm_fun.hpp>
 #include <wrenpp/def_configuration.hpp>
 #include <wrenpp/callback_manager.hpp>
@@ -52,70 +52,11 @@ class App {
 var the_app = App.new("USD", "kraken")
 )script";
 
-class TickerPrice {
-public:
-	TickerPrice() = default;
-	TickerPrice (double price, std::string&& currency, std::string&& exchange) :
-		m_price(price),
-		m_currency(std::move(currency)),
-		m_exchange(std::move(exchange))
-	{}
-
-	void set_price (double price) { m_price = price; }
-	void set_currency (std::string&& currency) { m_currency = std::move(currency); }
-	void set_exchange (std::string&& exchange) { m_exchange = std::move(exchange); }
-	double price() const noexcept { return m_price; }
-	const char* currency() const noexcept { return m_currency.c_str(); }
-	const char* exchange() const noexcept { return m_exchange.c_str(); }
-	bool is_valid() const noexcept { return not m_exchange.empty(); }
-
-private:
-	double m_price{};
-	std::string m_currency;
-	std::string m_exchange;
-};
-
-TickerPrice ticker_price_bitoinity (std::string_view currency, std::string_view exchange) {
-	static const TickerPrice error_price {0.0, "", ""};
-
-	duck::BitcoinityReader bitcoinity{
-		std::string{duck::WebsocketReader::BeastVersionString} + " websocket-client-coro",
-		exchange,
-		currency
-	};
-
-	do {
-		//possible values I observed:
-		//  {"event":"new_msg","payload":{"data":{"currency":"EUR","exchange_name":"paymium","last":28363.44}},"ref":null,"topic":"webs:markets"}
-		//  {"event":"new_msg","payload":{"data":{"currency":"USD","depth":{"price":30071,"type":1,"volume":-1.4123},"exchange_name":"bitfinex"}},"ref":null,"topic":"webs:markets_bitfinex_USD"}
-		//  {"event":"new_msg","payload":{"data":{"currency":"USD","exchange_name":"bitfinex","trade":{"amount":0.0486,"date":1652471682,"exchange_name":"bitfinex","price":30072}}},"ref":null,"topic":"webs:markets_bitfinex_USD"}
-
-		double price_out;
-		std::optional<double> price;
-		auto msg = bitcoinity.read();
-
-		if (msg.payload.has_key("data", "depth_shot"))
-			continue;
-
-		if ((price = msg.payload.get_double("data", "last")))
-			price_out = *price;
-		else if ((price = msg.payload.get_double("data", "depth", "price")))
-			price_out = *price;
-		else if ((price = msg.payload.get_double("data", "trade", "price")))
-			price_out = *price;
-		else
-			continue; //keep trying, sometimes I get a message like:
-					  //{"event":"new_msg","payload":{"data":{"connected_count":1355}},"ref":null,"topic":"webs:markets"}
-
-		std::string_view currency_out = msg.payload.get_string_or_empty("data", "currency");
-		std::string_view exchange_out = msg.payload.get_string_or_empty("data", "exchange_name");
-		return {price_out, std::string(currency_out), std::string(exchange_out)};
-	} while (true);
-}
-
 void ticker_price_bitcoinity_wren (wren::VM& vm) {
+	using duck::TickerPrice;
+
 	TickerPrice* const tp = wren::make_foreign_object<TickerPrice>(vm, "main");
-	*tp = ticker_price_bitoinity(wren::get<const char*>(vm, 1), wren::get<const char*>(vm, 2));
+	*tp = duck::bitcoinity_ticker_price(wren::get<const char*>(vm, 1), wren::get<const char*>(vm, 2));
 }
 
 class MyWrenConfiguration : public wren::DefConfiguration {
@@ -126,7 +67,7 @@ public:
 		std::string_view class_name
 	) {
 		if (module == "main" and class_name == "TickerPrice")
-			return wren::make_foreign_class<TickerPrice>();
+			return wren::make_foreign_class<duck::TickerPrice>();
 		else
 			return {nullptr, nullptr};
 	}
@@ -134,6 +75,8 @@ public:
 } //unnamed namespace
 
 int main() {
+	using duck::TickerPrice;
+
 	MyWrenConfiguration config;
 	wren::VM vm(&config, nullptr);
 	vm.callback_manager()

src/meson.build

@@ -26,6 +26,8 @@ executable(meson.project_name(),
   'websocket_reader.cpp',
   'bitcoinity_reader.cpp',
   'bitcoinity_payload.cpp',
+  'bitcoinity_ticker_price.cpp',
+  'ticker_price.cpp',
   install: true,
   dependencies: [
     curlcpp_dep,

src/ticker_price.cpp

@@ -0,0 +1,21 @@
+/* Copyright 2022, Michele Santullo
+ * This file is part of duckticker.
+ *
+ * Wrenpp is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Wrenpp is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with duckticker.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ticker_price.hpp"
+
+namespace duck {
+} //namespace duck

src/ticker_price.hpp

@@ -0,0 +1,45 @@
+/* Copyright 2022, Michele Santullo
+ * This file is part of duckticker.
+ *
+ * Wrenpp is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Wrenpp is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with duckticker.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <string>
+
+namespace duck {
+class TickerPrice {
+public:
+	TickerPrice() = default;
+	TickerPrice (double price, std::string&& currency, std::string&& exchange) :
+		m_price(price),
+		m_currency(std::move(currency)),
+		m_exchange(std::move(exchange))
+	{}
+
+	void set_price (double price) { m_price = price; }
+	void set_currency (std::string&& currency) { m_currency = std::move(currency); }
+	void set_exchange (std::string&& exchange) { m_exchange = std::move(exchange); }
+	double price() const noexcept { return m_price; }
+	const char* currency() const noexcept { return m_currency.c_str(); }
+	const char* exchange() const noexcept { return m_exchange.c_str(); }
+	bool is_valid() const noexcept { return not m_exchange.empty(); }
+
+private:
+	double m_price{};
+	std::string m_currency;
+	std::string m_exchange;
+};
+} //namespace duck