2007-10-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Implemented BitTorrent/http/ftp integrated download.
	I've rewritten lots of files and now some headers have forward
	class declarations to reduce compile time.
	The implementation is extremely alpha stage, I recommend to use this
	for testing purpose only.

1 files changed, 19 insertions, 35 deletions

diff --git a/src/DefaultBtProgressInfoFile.h b/src/DefaultBtProgressInfoFile.h
index 201900dd..4ca0e5e6 100644
--- a/src/DefaultBtProgressInfoFile.h
+++ b/src/DefaultBtProgressInfoFile.h
@@ -36,49 +36,33 @@
 #define _D_DEFAULT_BT_PROGRESS_INFO_FILE_H_
 
 #include "BtProgressInfoFile.h"
-#include "BtContext.h"
-#include "PieceStorage.h"
-#include "BtRuntime.h"
-#include "PeerStorage.h"
-#include "Logger.h"
-#include "Option.h"
+
+class DownloadContext;
+extern typedef SharedHandle<DownloadContext> DownloadContextHandle;
+class PieceStorage;
+extern typedef SharedHandle<PieceStorage> PieceStorageHandle;
+class Logger;
+class Option;
 
 class DefaultBtProgressInfoFile : public BtProgressInfoFile {
 private:
-  BtContextHandle btContext;
-  const Option* option;
-  Logger* logger;
-  PieceStorageHandle pieceStorage;
-  BtRuntimeHandle btRuntime;
-  PeerStorageHandle peerStorage;
-  string filename;
+  DownloadContextHandle _dctx;
+  PieceStorageHandle _pieceStorage;
+  const Option* _option;
+  const Logger* _logger;
+  string _filename;
+
+  bool isTorrentDownload();
 
-  FILE* openFile(const string& filename, const string& mode) const;
 public:
-  DefaultBtProgressInfoFile(const BtContextHandle& btContext,
+  DefaultBtProgressInfoFile(const DownloadContextHandle& btContext,
+			    const PieceStorageHandle& pieceStorage,
 			    const Option* option);
-  virtual ~DefaultBtProgressInfoFile();
-
-  void setBtRuntime(const BtRuntimeHandle& btRuntime) {
-    this->btRuntime = btRuntime;
-  }
-  BtRuntimeHandle getBtRuntime() const { return btRuntime; }
 
-  void setPieceStorage(const PieceStorageHandle& pieceStorage) {
-    this->pieceStorage = pieceStorage;
-  }
-  PieceStorageHandle getPieceStorage() const { return pieceStorage; }
-
-  void setPeerStorage(const PeerStorageHandle& peerStorage) {
-    this->peerStorage = peerStorage;
-  }
-  PeerStorageHandle getPeerStorage() const { return peerStorage; }
-
-  virtual void setFilename(const string& filename) {
-    this->filename = filename;
-  }
-  virtual string getFilename() { return filename; }
+  virtual ~DefaultBtProgressInfoFile();
 
+  virtual string getFilename() { return _filename; }
+  
   virtual bool exists();
 
   virtual void save();