Move more crap to the base class

src/timer_base.cpp

@@ -17,7 +17,9 @@
 
 #include "timer_base.hpp"
 #include "roar11/ThreadPool.hpp"
+#include "oro/api.hpp"
 #include <cassert>
+#include <iostream>
 
 namespace duck {
 
@@ -41,6 +43,12 @@ void TimerBase::on_timer() {
 	m_pool->submit(&TimerBase::fetch_data, this);
 }
 
+void TimerBase::set_next_timer (const oro::Header& header) {
+	const int next_timer = header.retry_after / header.rate_limit;
+	std::cout << "Next timer in " << next_timer << " secs\n";
+	this->set_timer(static_cast<double>(next_timer));
+}
+
 roar11::ThreadPool& TimerBase::pool() {
 	assert(m_pool);
 	return *m_pool;

src/timer_base.hpp

@@ -27,6 +27,7 @@ namespace roar11 {
 namespace oro {
 	class Api;
 	class OriginsDB;
+	struct Header;
 } //namespace oro
 
 namespace duck {
@@ -45,6 +46,7 @@ public:
 	virtual void on_timer() override;
 
 protected:
+	void set_next_timer (const oro::Header& header);
 	roar11::ThreadPool& pool();
 	oro::Api& oro_api();
 	oro::OriginsDB& db();

src/timer_icons.cpp

@@ -34,13 +34,7 @@ namespace duck {
 
 	void TimerIcons::fetch_data() {
 		auto icons = oro_api().items_icons();
-
+		set_next_timer(icons.first);
-		{
-			const int next_timer = icons.first.retry_after / icons.first.rate_limit;
-			std::cout << "Next timer in " << next_timer << " secs\n";
-			set_timer(static_cast<double>(next_timer));
-		}
-
 		db().update(icons.second);
 	}
 

src/timer_items.cpp

@@ -34,13 +34,7 @@ namespace duck {
 
 	void TimerItems::fetch_data() {
 		auto items = oro_api().items_list();
-
+		set_next_timer(items.first);
-		{
-			const int next_timer = items.first.retry_after / items.first.rate_limit;
-			std::cout << "Next timer in " << next_timer << " secs\n";
-			set_timer(static_cast<double>(next_timer));
-		}
-
 		db().update(items.second);
 	}
 

src/timer_shops.cpp

@@ -34,13 +34,7 @@ namespace duck {
 
 	void TimerShops::fetch_data() {
 		auto shops = oro_api().market_list();
-
+		set_next_timer(shops.first);
-		{
-			const int next_timer = shops.first.retry_after / shops.first.rate_limit;
-			std::cout << "Next timer in " << next_timer << " secs\n";
-			set_timer(static_cast<double>(next_timer));
-		}
-
 		db().update(shops.second);
 	}