Use HttpMetaCache to minimize network use.

1 files changed, 27 insertions, 6 deletions

diff --git a/logic/net/HttpMetaCache.h b/logic/net/HttpMetaCache.h
index 161483ad..fac6bec3 100644
--- a/logic/net/HttpMetaCache.h
+++ b/logic/net/HttpMetaCache.h
@@ -2,6 +2,7 @@
 #include <QString>
 #include <QSharedPointer>
 #include <QMap>
+#include <qtimer.h>
 
 struct MetaEntry
 {
@@ -9,23 +10,42 @@ struct MetaEntry
 	QString path;
 	QString md5sum;
 	QString etag;
-	quint64 last_changed_timestamp = 0;
+	qint64 last_changed_timestamp = 0;
+	bool stale = true;
+	QString getFullPath();
 };
 
 typedef QSharedPointer<MetaEntry> MetaEntryPtr;
 
-class HttpMetaCache
+class HttpMetaCache : public QObject
 {
+	Q_OBJECT
 public:
 	// supply path to the cache index file
 	HttpMetaCache(QString path);
 	~HttpMetaCache();
-	MetaEntryPtr getEntryForResource(QString base, QString resource_path);
-	void addEntry(QString base, QString resource_path, QString etag);
+	
+	// get the entry solely from the cache
+	// you probably don't want this, unless you have some specific caching needs.
+	MetaEntryPtr getEntry(QString base, QString resource_path);
+	
+	// get the entry from cache and verify that it isn't stale (within reason)
+	MetaEntryPtr resolveEntry(QString base, QString resource_path, QString expected_etag = QString());
+	
+	// add a previously resolved stale entry
+	bool updateEntry(MetaEntryPtr stale_entry);
+	
 	void addBase(QString base, QString base_root);
-private:
-	void Save();
+	
+	// (re)start a timer that calls SaveNow later.
+	void SaveEventually();
 	void Load();
+	QString getBasePath ( QString base );
+public slots:
+	void SaveNow();
+private:
+	// create a new stale entry, given the parameters
+	MetaEntryPtr staleEntry(QString base, QString resource_path);
 	struct EntryMap
 	{
 		QString base_path;
@@ -33,4 +53,5 @@ private:
 	};
 	QMap<QString, EntryMap> m_entries;
 	QString m_index_file;
+	QTimer saveBatchingTimer;
 };
\ No newline at end of file