From b694e1e6c4a44da834f69fa694cb5269d67ec0ad Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sun, 24 Dec 2017 16:05:55 +0800
Subject: [PATCH] opt(announce): optimization announce data

---
 .../server/controllers/announces.server.controller.js | 11 +++++++----
 modules/torrents/server/models/peer.server.model.js   |  6 ++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index 8b2e4764..36a4ca07 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -437,7 +437,6 @@ exports.announce = function (req, res) {
         var lcount = getSelfLeecherCount();
         var scount = getSelfSeederCount();
 
-        console.log('lcount=' + lcount + ', scount=' + scount);
         if (lcount > announceConfig.announceCheck.maxLeechNumberPerUserPerTorrent && !req.seeder) {
           mtDebug.debugYellow('getSelfLeecherCount = ' + lcount, 'ANNOUNCE_REQUEST');
           removeCurrPeer();
@@ -543,7 +542,11 @@ exports.announce = function (req, res) {
         }
       }
 
-      //write peer last_announce_at time
+      //write peer data and last_announce_at time
+      req.currentPeer.peer_uploaded = query.uploaded;
+      req.currentPeer.peer_downloaded = query.downloaded;
+      req.currentPeer.peer_left = query.peer_left;
+      req.currentPeer.last_announce_at = Date.now();
       req.currentPeer.update({
         $set: {
           peer_uploaded: query.uploaded,
@@ -551,7 +554,7 @@ exports.announce = function (req, res) {
           peer_left: query.left,
           last_announce_at: Date.now()
         }
-      }).exec(function () {
+      }, function () {
         req.currentPeer.globalUpdateMethod();
       });
 
@@ -565,7 +568,7 @@ exports.announce = function (req, res) {
      ---------------------------------------------------------------*/
     function (done) {
       if (!req.currentPeer.isNewCreated) {
-        if (req.completeTorrent && req.completeTorrent.complete) {
+        if (req.completeTorrent && req.completeTorrent.complete && event(query.event) !== EVENT_COMPLETED) {
           req.completeTorrent.total_seed_time += Date.now() - req.currentPeer.last_announce_at;
           req.completeTorrent.update({
             $inc: {total_seed_time: Date.now() - req.currentPeer.last_announce_at}
diff --git a/modules/torrents/server/models/peer.server.model.js b/modules/torrents/server/models/peer.server.model.js
index db856f69..50c14331 100644
--- a/modules/torrents/server/models/peer.server.model.js
+++ b/modules/torrents/server/models/peer.server.model.js
@@ -106,9 +106,11 @@ PeerSchema.pre('save', function (next) {
 /**
  * globalUpdateMethod
  */
-PeerSchema.methods.globalUpdateMethod = function () {
+PeerSchema.methods.globalUpdateMethod = function (cb) {
   this.refreshat = Date.now();
-  this.save();
+  this.save(function (err, p) {
+    if (cb) cb(p || this);
+  });
 };
 
 /**