Reorganising methods and removing unnecessary references

seanoflynn · May 27, 2016 · f022d1b · f022d1b
1 parent e60d2c5
commit f022d1b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 40 deletions.
diff --git a/BitTorrent/Client.cs b/BitTorrent/Client.cs
@@ -289,6 +289,26 @@ private void ProcessPeers()
 
         #region Uploads
 
+        private void HandleBlockRequested(object sender, DataRequest block)
+        {
+            OutgoingBlocks.Enqueue(block);
+
+            ProcessUploads();
+        }
+
+        private void HandleBlockCancelled(object sender, DataRequest block)
+        {
+            foreach (var item in OutgoingBlocks)
+            {
+                if (item.Peer != block.Peer || item.Piece != block.Piece || item.Begin != block.Begin || item.Length != block.Length)
+                    continue;
+
+                item.IsCancelled = true;
+            }
+
+            ProcessUploads();
+        }
+
         private void ProcessUploads()
         {
             if (Interlocked.Exchange(ref isProcessUploads, 1) == 1)
@@ -315,30 +335,28 @@ private void ProcessUploads()
             Interlocked.Exchange(ref isProcessUploads, 0);
         }
 
-        private void HandleBlockRequested(object sender, DataRequest block)
-        {
-            OutgoingBlocks.Enqueue(block);
+        #endregion
 
-            ProcessUploads();
-        }
+        #region Downloads
 
-        private void HandleBlockCancelled(object sender, DataRequest block)
+        private void HandleBlockReceived(object sender, DataPackage args)
         {
-            foreach (var item in OutgoingBlocks)
+            IncomingBlocks.Enqueue(args);
+
+            args.Peer.IsBlockRequested[args.Piece][args.Block] = false;
+
+            foreach(var peer in Peers)
             {
-                if (item.Peer != block.Peer || item.Piece != block.Piece || item.Begin != block.Begin || item.Length != block.Length)
+                if (!peer.Value.IsBlockRequested[args.Piece][args.Block])
                     continue;
 
-                item.IsCancelled = true;
+                peer.Value.SendCancel(args.Piece, args.Block * Torrent.BlockSize, Torrent.BlockSize);
+                peer.Value.IsBlockRequested[args.Piece][args.Block] = false;
             }
 
-            ProcessUploads();
+            ProcessDownloads();
         }
 
-        #endregion
-
-        #region Downloads
-
         private void ProcessDownloads()
         {
             if (Interlocked.Exchange(ref isProcessDownloads, 1) == 1)
@@ -394,24 +412,6 @@ private void ProcessDownloads()
             Interlocked.Exchange(ref isProcessDownloads, 0);
         }
 
-        private void HandleBlockReceived(object sender, DataPackage args)
-        {
-            IncomingBlocks.Enqueue(args);
-
-            args.Peer.IsBlockRequested[args.Piece][args.Block] = false;
-
-            foreach(var peer in Peers)
-            {
-                if (!peer.Value.IsBlockRequested[args.Piece][args.Block])
-                    continue;
-
-                peer.Value.SendCancel(args.Piece, args.Block * Torrent.BlockSize, Torrent.BlockSize);
-                peer.Value.IsBlockRequested[args.Piece][args.Block] = false;
-            }
-
-            ProcessDownloads();
-        }
-
         #endregion
 
         #region Ranking

diff --git a/BitTorrent/Peer.cs b/BitTorrent/Peer.cs
@@ -228,6 +228,10 @@ private int GetMessageLength(List<byte> data)
             return EndianBitConverter.Big.ToInt32(data.ToArray(), 0) + 4;
         }
 
+        #endregion
+
+        #region Incoming Messages
+
         private MessageType GetMessageType(byte[] bytes)
         {
             if (!IsHandshakeReceived)
@@ -348,10 +352,6 @@ private void HandleMessage(byte[] bytes)
             Disconnect();
         }
 
-        #endregion
-
-        #region Incoming Messages
-
         private void HandleHandshake(byte[] hash, string id)
         {
             Log.WriteLine(this, "<- handshake");

diff --git a/Client/Program.cs b/Client/Program.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Linq;
 using System.IO;
-using System.Collections.Generic;
-using System.Threading;
-using System.Text;
 using Mono.Unix;
 using Mono.Unix.Native;
 using BitTorrent;