Core Namespace Fixes

pgodwin · Jun 24, 2017 · 6b7d566 · 6b7d566
1 parent 0b9fcb3
commit 6b7d566
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 13 deletions.
diff --git a/GopherServer.Core/Helpers/HtmlExtensions.cs b/GopherServer.Core/Helpers/HtmlExtensions.cs
@@ -7,6 +7,7 @@
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
+using GopherServer.Core.Models;
 
 namespace GopherServer.Core.Helpers
 {

diff --git a/GopherServer.Core/Helpers/StringExtensions.cs b/GopherServer.Core/Helpers/StringExtensions.cs
@@ -1,4 +1,5 @@
-using GopherServer.Core.Results;
+using GopherServer.Core.Models;
+using GopherServer.Core.Results;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/GopherServer.Core/Models/DirectoryItem.cs b/GopherServer.Core/Models/DirectoryItem.cs
@@ -1,10 +1,11 @@
-using System;
+using GopherServer.Core.Models;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GopherServer.Core.Results
+namespace GopherServer.Core.Models
 {
     public class DirectoryItem 
     {

diff --git a/GopherServer.Core/Models/ExternalUrlItem.cs b/GopherServer.Core/Models/ExternalUrlItem.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GopherServer.Core.Results
+namespace GopherServer.Core.Models
 {
     public class ExternalUrlItem : DirectoryItem
     {

diff --git a/GopherServer.Core/Models/ItemType.cs b/GopherServer.Core/Models/ItemType.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GopherServer.Core.Results
+namespace GopherServer.Core.Models
 {
     public class ItemType
     {
@@ -56,8 +57,7 @@ private static void BuildDictionary()
         {
             _typeDictionary = new Dictionary<char, ItemType>();
             var type = typeof(ItemType);
-            var fields = type.GetFields(System.Reflection.BindingFlags.Static)
-                             .Where(t => t.FieldType == typeof(ItemType));
+            var fields = type.GetFields(BindingFlags.Public | BindingFlags.Static).Where(f=>f.FieldType == typeof(ItemType));
 
             foreach (var p in fields)
             {

diff --git a/GopherServer.Core/Results/BaseResult.cs b/GopherServer.Core/Results/BaseResult.cs
@@ -1,4 +1,5 @@
-using System;
+using GopherServer.Core.Models;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

diff --git a/GopherServer.Core/Results/ByteResult.cs b/GopherServer.Core/Results/ByteResult.cs
@@ -1,4 +1,5 @@
-using System;
+using GopherServer.Core.Models;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

diff --git a/GopherServer.Core/Results/DirectoryResult.cs b/GopherServer.Core/Results/DirectoryResult.cs
@@ -1,4 +1,5 @@
-using System;
+using GopherServer.Core.Models;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
@@ -36,6 +37,7 @@ public override void WriteResult(Stream stream)
                 streamWriter.WriteLine(".");
                 // Server should close connection after this point.
             }
+            itemsString = null;
         }
 
 

diff --git a/GopherServer.Core/Results/ErrorResult.cs b/GopherServer.Core/Results/ErrorResult.cs
@@ -1,4 +1,5 @@
-using System;
+using GopherServer.Core.Models;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/GopherServer.Core/Results/GifResult.cs b/GopherServer.Core/Results/GifResult.cs
@@ -14,7 +14,7 @@ public class GifResult : ByteResult
     {
         public GifResult(string url)
         {
-            this.ItemType = ItemType.GIF;
+            this.ItemType = Models.ItemType.GIF;
             this.ResultBytes = ImageToGif.ConvertImageToGif(url);
         }
     }

diff --git a/GopherServer.Core/Routes/PrebuiltRoutes.cs b/GopherServer.Core/Routes/PrebuiltRoutes.cs
@@ -1,5 +1,4 @@
 using GopherServer.Core.Results;
-using GopherServer.Core.Results;
 using System;
 using System.Collections.Generic;
 using System.Linq;