Merge pull request #231 from CortexFoundation/dev

Dev->Master

Author: ucwong

torrentfs/monitor.go

@@ -52,7 +52,7 @@ const (
 type TorrentManagerAPI interface {
 	Start() error
 	Close() error
-	RemoveTorrent(metainfo.Hash) error
+	//RemoveTorrent(metainfo.Hash) error
 	UpdateTorrent(interface{}) error
 	UpdateDynamicTrackers(trackers []string)
 	GetTorrent(ih metainfo.Hash) *Torrent

torrentfs/storage.go

@@ -91,7 +91,7 @@ func NewFileStorage(config *Config) (*FileStorage, error) {
 	if dbErr != nil {
 		return nil, dbErr
 	}
-	db.NoSync = true
+	//db.NoSync = true
 
 	fs := &FileStorage{
 		// filesInfoHash:     make(map[metainfo.Hash]*FileInfo),

torrentfs/torrentClient.go

@@ -32,7 +32,7 @@ import (
 )
 
 const (
-	removeTorrentChanBuffer = 1
+	//removeTorrentChanBuffer = 1
 	updateTorrentChanBuffer = 2048
 
 	torrentPending = iota //2
@@ -298,8 +298,8 @@ type TorrentManager struct {
 	DataDir             string
 	TmpDataDir          string
 	closeAll            chan struct{}
-	removeTorrent       chan metainfo.Hash
-	updateTorrent       chan interface{}
+	//removeTorrent       chan metainfo.Hash
+	updateTorrent chan interface{}
 	//mu                  sync.Mutex
 	lock      sync.RWMutex
 	wg        sync.WaitGroup
@@ -364,10 +364,10 @@ func (tm *TorrentManager) dropAll() {
 	}
 }
 
-func (tm *TorrentManager) RemoveTorrent(input metainfo.Hash) error {
-	tm.removeTorrent <- input
-	return nil
-}
+//func (tm *TorrentManager) RemoveTorrent(input metainfo.Hash) error {
+//	tm.removeTorrent <- input
+//	return nil
+//}
 
 func (tm *TorrentManager) UpdateTorrent(input interface{}) error {
 	//go func() {tm.updateTorrent <- input}()
@@ -582,7 +582,7 @@ func (tm *TorrentManager) UpdateInfoHash(ih metainfo.Hash, BytesRequested int64)
 }
 
 // DropInfoHash ...
-func (tm *TorrentManager) DropInfoHash(ih metainfo.Hash) bool {
+/*func (tm *TorrentManager) DropInfoHash(ih metainfo.Hash) bool {
 	if t := tm.GetTorrent(ih); t != nil {
 		t.Torrent.Drop()
 		tm.lock.Lock()
@@ -591,7 +591,7 @@ func (tm *TorrentManager) DropInfoHash(ih metainfo.Hash) bool {
 		return true
 	}
 	return false
-}
+}*/
 
 //var CurrentTorrentManager *TorrentManager = nil
 
@@ -662,8 +662,8 @@ func NewTorrentManager(config *Config) *TorrentManager {
 		TmpDataDir:          tmpFilePath,
 		boostFetcher:        NewBoostDataFetcher(config.BoostNodes),
 		closeAll:            make(chan struct{}),
-		removeTorrent:       make(chan metainfo.Hash, removeTorrentChanBuffer),
-		updateTorrent:       make(chan interface{}, updateTorrentChanBuffer),
+		//removeTorrent:       make(chan metainfo.Hash, removeTorrentChanBuffer),
+		updateTorrent: make(chan interface{}, updateTorrentChanBuffer),
 		//updateTorrent:       make(chan interface{}),
 	}
 
@@ -697,8 +697,8 @@ func (tm *TorrentManager) mainLoop() {
 	defer tm.wg.Done()
 	for {
 		select {
-		case torrent := <-tm.removeTorrent:
-			tm.DropInfoHash(torrent)
+		//case torrent := <-tm.removeTorrent:
+		//	tm.DropInfoHash(torrent)
 		case msg := <-tm.updateTorrent:
 			meta := msg.(FlowControlMeta)
 			if meta.IsCreate {