Big refactor

wjch-krl · Nov 8, 2014 · bc47f14 · bc47f14
1 parent bc6ca49
commit bc47f14
Show file tree

Hide file tree

Showing 185 changed files with 223,893 additions and 1,355 deletions.
diff --git a/._.DS_Store b/._.DS_Store
diff --git a/._PiggyLogo_128.png b/._PiggyLogo_128.png
diff --git a/._PiggyLogo_64.png b/._PiggyLogo_64.png
diff --git a/._PiggySync b/._PiggySync
diff --git a/.gitignore b/.gitignore
diff --git a/BouncyCastle.Crypto.dll b/BouncyCastle.Crypto.dll
diff --git a/PiggyLogo.xcf b/PiggyLogo.xcf
diff --git a/PiggyLogo_128.png b/PiggyLogo_128.png
diff --git a/PiggySync/PiggyLogo_64.png → PiggyLogo_64.png b/PiggySync/PiggyLogo_64.png → PiggyLogo_64.png
diff --git a/PiggySync/PiggySync.Common/Concrete/CheckSumGenerator.cs b/PiggySync/PiggySync.Common/Concrete/CheckSumGenerator.cs
@@ -1,5 +1,7 @@
 using System;
 using System.IO;
+using PiggySync.Common.Abstract;
+using PiggySync.Common.Concrete;
 
 namespace PiggySync.Core
 {
@@ -9,7 +11,7 @@ public static class CheckSumGenerator
 
 		static CheckSumGenerator ()
 		{
-			generator = new MD5Generator ();
+			generator = new Md5Generator ();
 		}
 
 		public static void ChangeGenerator (ICheckSumGenerator generator)

diff --git a/PiggySync/PiggySync.Common/Extensions.cs b/PiggySync/PiggySync.Common/Extensions.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace PiggySyncWin.Domain
+namespace PiggySync.Common
 {
     public static class Extensions
     {

diff --git a/PiggySync/PiggySync.Common/IPUtils.cs b/PiggySync/PiggySync.Common/IPUtils.cs
@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Net.Sockets;
+using System.Linq;
 using System.Net;
-using PiggySyncWin.WinUI.Models;
 using System.Net.NetworkInformation;
+using System.Net.Sockets;
 
-namespace PiggySyncWin.WinUI.Models
+namespace PiggySync.Common
 {
     public class IPUtils
     {

diff --git a/PiggySync/PiggySync.Core/._Properties b/PiggySync/PiggySync.Core/._Properties
diff --git a/PiggySync/PiggySync.Core/Concrete/TcpSocket.cs b/PiggySync/PiggySync.Core/Concrete/TcpSocket.cs
@@ -1,19 +1,8 @@
-using PiggySyncWin.Domain.Concrete;
-using PiggySyncWin.WinUI.Infrastructure;
-using PiggySyncWin.WinUI.Infrastructure.Concrete;
-using PiggySyncWin.WinUI.Models;
-using PiggySyncWin.WinUI.Models.Concrete;
-using PiggySyncWin.WinUI.Sync;
 using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Net.Sockets;
-using System.Threading;
-using System.Threading.Tasks;
 
-namespace PiggySyncWin.WinUI
+namespace PiggySync.Core.Concrete
 {
 	public class TcpSocket
 	{

diff --git a/PiggySync/PiggySync.Core/Concrete/TcpSocketListner.cs b/PiggySync/PiggySync.Core/Concrete/TcpSocketListner.cs
@@ -1,9 +1,8 @@
-using PiggySyncWin.Domain.Concrete;
+using PiggySync.Core.Concrete;
 using PiggySyncWin.WinUI.Infrastructure;
 using PiggySyncWin.WinUI.Infrastructure.Concrete;
 using PiggySyncWin.WinUI.Models;
 using PiggySyncWin.WinUI.Models.Concrete;
-using PiggySyncWin.WinUI.Sync;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;

diff --git a/PiggySync/PiggySync.Core/Concrete/UdpSocket.cs b/PiggySync/PiggySync.Core/Concrete/UdpSocket.cs
@@ -1,19 +1,7 @@
-using PiggySyncWin.Domain.Concrete;
-using PiggySyncWin.WinUI.Infrastructure;
-using PiggySyncWin.WinUI.Infrastructure.Concrete;
-using PiggySyncWin.WinUI.Models;
-using PiggySyncWin.WinUI.Models.Concrete;
-using PiggySyncWin.WinUI.Sync;
 using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Sockets;
-using System.Threading;
-using System.Threading.Tasks;
 
-namespace PiggySyncWin.WinUI
+namespace PiggySync.Core.Concrete
 {
 	class UdpSocket
 	{

diff --git a/PiggySync/PiggySync.Core/DeviaceManager.cs b/PiggySync/PiggySync.Core/DeviaceManager.cs
@@ -1,41 +1,36 @@
-using PiggySyncWin.WinUI.Models;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using PiggySync.DatabaseManager;
+using PiggySync.Model;
+using PiggySyncWin.WinUI.Infrastructure;
+using PiggySyncWin.WinUI.Models;
 
-namespace PiggySyncWin.WinUI.Infrastructure
+namespace PiggySync.Core
 {
-	public static class DeviaceHistoryManager
-	{
-		public static List<PiggyRemoteHostHistoryEntry> AllHosts
-		{
-			get;
-			set;
-		}
+    public static class DeviaceHistoryManager
+    {
+        static DeviaceHistoryManager()
+        {
+            AllHosts = DatabaseManager.Instance.GetHistoricalDeviaces();
+        }
 
-		static DeviaceHistoryManager ()
-		{
-			AllHosts = DatabaseManager.Instance.GetHistoricalDeviaces ();
-		}
+        public static List<PiggyRemoteHostHistoryEntry> AllHosts { get; set; }
 
-		public static void AddHost (PiggyRemoteHost host)
-		{
-			foreach (var x in AllHosts)
-			{
-				if (x == host)
-				{
-					x.LastSync = DateTime.Now;
-					DatabaseManager.Instance.UpdateHistoricalDeviace (x);
-					return;
-				}
-			}
-			var newHost = new PiggyRemoteHostHistoryEntry (host);
-			newHost.LastSync = DateTime.Now;
-			DatabaseManager.Instance.SaveHistoricalDeviace (newHost);
+        public static void AddHost(PiggyRemoteHost host)
+        {
+            foreach (PiggyRemoteHostHistoryEntry x in AllHosts)
+            {
+                if (x == host)
+                {
+                    x.LastSync = DateTime.Now;
+                    DatabaseManager.Instance.UpdateHistoricalDeviace(x);
+                    return;
+                }
+            }
+            var newHost = new PiggyRemoteHostHistoryEntry(host);
+            newHost.LastSync = DateTime.Now;
+            DatabaseManager.Instance.SaveHistoricalDeviace(newHost);
 
-			AllHosts.Add (newHost);
-		}
-	}
+            AllHosts.Add(newHost);
+        }
+    }
 }
diff --git a/PiggySync/PiggySync.Core/FileManager.cs b/PiggySync/PiggySync.Core/FileManager.cs
@@ -1,19 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections.Concurrent;
-using System.Threading;
-using PiggySyncWin.Domain.Concrete;
-using PiggySyncWin.Domain;
 using System.IO;
-using PiggySyncWin.WinUI.Infrastructure;
-using PiggySync.Core;
-using PiggySync.DatabaseManager;
+using System.Linq;
+using PiggySync.Domain.Concrete;
 using PiggySync.Model;
+using PiggySync.Model.Concrete;
+using PiggySyncWin.WinUI.Models;
 using PiggySyncWin.WinUI.Models.Concrete;
 
-namespace PiggySyncWin.WinUI.Models
+namespace PiggySync.Core
 {
 	public class FileManager
 	{
@@ -146,10 +141,14 @@ static void AddOtherDeletedFiles (HashSet<FileInf> dbFiles, SyncInfoPacket root)
 					curr = string.Format ("{1}/{0}", element, curr);
 					if (!Directory.Exists (curr))
 					{
-						root.Folders.Add (new FolderInfoPacket (element, 144));//TODO
+						var deletedFolder = new FolderInfoPacket (curr.Replace(XmlSettingsRepository.Instance.Settings.SyncPath, String.Empty), 144);
+
+						root.Folders.Add (deletedFolder);//TODO
+						deletedFolder.DeletedFiles.Add (new FileDeletePacket (file));
+						break;
 					}
 				}
-				//rootFolder.DeletedFiles.Add (new FileDeletePacket(file));
+				rootFolder.DeletedFiles.Add (new FileDeletePacket(file));
 				//TODO Create deleted folder packet
 			}
 		}

diff --git a/PiggySync/PiggySync.Core/FilePacketCreator.cs b/PiggySync/PiggySync.Core/FilePacketCreator.cs
@@ -1,7 +1,6 @@
-using PiggySyncWin.Domain.Concrete;
-using System.IO;
+using System.IO;
 
-namespace PiggySyncWin.WinUI.Infrastructure
+namespace PiggySync.Core
 {
     public static class FilePacketCreator
     {

diff --git a/PiggySync/PiggySync.Core/Properties/AssemblyInfo.cs b/PiggySync/PiggySync.Core/Properties/AssemblyInfo.cs