Improvements for Source Code

CodeHub.Core/Factories/ILoginFactory.cs

@@ -9,7 +9,7 @@ public interface ILoginFactory
 
 		Task<GitHubSharp.Client> LoginAccount(GitHubAccount account);
 
-        Task<LoginData> Authenticate(string domain, string user, string pass, string twoFactor, bool enterprise, GitHubAccount existingAccount);
+        Task<LoginData> CreateLoginData(string domain, string user, string pass, string twoFactor, bool enterprise, GitHubAccount existingAccount);
     }
 
 	public class LoginData

CodeHub.Core/Factories/LoginFactory.cs

@@ -58,11 +58,15 @@ public async Task<Client> LoginAccount(GitHubAccount account)
             account.Username = userInfo.Login;
             account.AvatarUrl = userInfo.AvatarUrl;
 			client.Username = userInfo.Login;
-            _accounts.Update(account);
+
+            if (_accounts.Exists(account))
+                _accounts.Update(account);
+            else
+                _accounts.Insert(account);
             return client;
         }
 
-        public async Task<LoginData> Authenticate(string domain, string user, string pass, string twoFactor, bool enterprise, GitHubAccount account)
+        public async Task<LoginData> CreateLoginData(string domain, string user, string pass, string twoFactor, bool enterprise, GitHubAccount account)
         {
             //Fill these variables in during the proceeding try/catch
             var apiUrl = domain;
@@ -77,11 +81,7 @@ public async Task<LoginData> Authenticate(string domain, string user, string pas
                 if (apiUrl != null && !Uri.IsWellFormedUriString(apiUrl, UriKind.Absolute))
                     throw new ArgumentException("Domain is invalid");
 
-                //Does this user exist?
-                bool exists = account != null;
-                if (!exists)
-                    account = new GitHubAccount { Username = user };
-
+                account = account ?? new GitHubAccount { Username = user };
                 account.Domain = apiUrl;
 				account.IsEnterprise = enterprise;
                 var client = twoFactor == null ? Client.Basic(user, pass, apiUrl) : Client.BasicTwoFactorAuthentication(user, pass, twoFactor, apiUrl);
@@ -96,11 +96,6 @@ public async Task<LoginData> Authenticate(string domain, string user, string pas
 	                account.OAuth = auth.Data.Token;
 				}
 
-                if (exists)
-                    _accounts.Update(account);
-                else
-                    _accounts.Insert(account);
-
 				return new LoginData { Client = client, Account = account };
             }
             catch (StatusCodeException ex)

CodeHub.Core/ViewModels/Accounts/AccountsViewModel.cs

@@ -37,7 +37,7 @@ protected async override void SelectAccount(IAccount account)
 				//Hack for now
 				if (isEnterprise)
 				{
-					ShowViewModel<AddAccountViewModel>(new AddAccountViewModel.NavObject { IsEnterprise = true, AttemptedAccountId = account.Id });
+					ShowViewModel<AddAccountViewModel>(new AddAccountViewModel.NavObject { AttemptedAccountId = account.Id });
 				}
 				else
 				{
@@ -58,7 +58,7 @@ protected async override void SelectAccount(IAccount account)
                 DisplayAlert("The credentials for the selected account are incorrect. " + e.Message);
 
 				if (isEnterprise)
-					ShowViewModel<AddAccountViewModel>(new AddAccountViewModel.NavObject { IsEnterprise = true, AttemptedAccountId = githubAccount.Id });
+					ShowViewModel<AddAccountViewModel>(new AddAccountViewModel.NavObject { AttemptedAccountId = githubAccount.Id });
 				else
 					ShowViewModel<LoginViewModel>(LoginViewModel.NavObject.CreateDontRemember(githubAccount));
 			}

CodeHub.Core/ViewModels/Accounts/AddAccountViewModel.cs

@@ -19,8 +19,6 @@ public class AddAccountViewModel : BaseViewModel
         private string _domain;
         private bool _isLoggingIn;
 
-        public bool IsEnterprise { get; private set; }
-
         public bool IsLoggingIn
         {
             get { return _isLoggingIn; }
@@ -66,13 +64,7 @@ public void Init(NavObject navObject)
             if (_attemptedAccount != null)
             {
                 Username = _attemptedAccount.Username;
-                IsEnterprise = _attemptedAccount.Domain != null;
-                if (IsEnterprise)
-                    Domain = _attemptedAccount.Domain;
-            }
-            else
-            {
-                IsEnterprise = navObject.IsEnterprise;
+                Domain = _attemptedAccount.Domain;
             }
         }
 
@@ -85,7 +77,7 @@ private bool CanLogin()
 
 		private async Task Login()
         {
-            var apiUrl = IsEnterprise ? Domain : null;
+            var apiUrl = Domain;
             if (apiUrl != null)
             {
                 if (!apiUrl.StartsWith("http://") && !apiUrl.StartsWith("https://"))
@@ -99,8 +91,7 @@ private async Task Login()
             try
             {
                 IsLoggingIn = true;
-				Console.WriteLine(apiUrl);
-                var loginData = await _loginFactory.Authenticate(apiUrl, Username, Password, TwoFactor, IsEnterprise, _attemptedAccount);
+                var loginData = await _loginFactory.CreateLoginData(apiUrl, Username, Password, TwoFactor, true, _attemptedAccount);
 				var client = await _loginFactory.LoginAccount(loginData.Account);
 				_application.ActivateUser(loginData.Account, client);
             }
@@ -123,7 +114,6 @@ private async Task Login()
 
         public class NavObject
         {
-            public bool IsEnterprise { get; set; }
 			public int AttemptedAccountId { get; set; }
 
 			public NavObject()

CodeHub.Core/ViewModels/Accounts/LoginViewModel.cs

@@ -49,11 +49,6 @@ public string LoginUrl
 
         public string WebDomain { get; set; }
 
-        public ICommand GoToOldLoginWaysCommand
-        {
-            get { return new MvxCommand(() => ShowViewModel<AddAccountViewModel>(new AddAccountViewModel.NavObject { IsEnterprise = IsEnterprise })); }
-        }
-
         public ICommand GoBackCommand
         {
             get { return new MvxCommand(() => ChangePresentation(new MvxClosePresentationHint(this))); }

CodeHub.Core/ViewModels/Accounts/NewAccountViewModel.cs

@@ -13,7 +13,7 @@ public ICommand GoToDotComLoginCommand
 
         public ICommand GoToEnterpriseLoginCommand
         {
-			get { return new MvxCommand(() => this.ShowViewModel<AddAccountViewModel>(new AddAccountViewModel.NavObject { IsEnterprise = true })); }
+            get { return new MvxCommand(() => this.ShowViewModel<AddAccountViewModel>(new AddAccountViewModel.NavObject())); }
         }
     }
 }

CodeHub.Core/ViewModels/App/StartupViewModel.cs

@@ -38,17 +38,6 @@ protected async override void Startup()
             if (account.DontRemember)
             {
                 ShowViewModel<Accounts.AccountsViewModel>();
-
-                //Hack for now
-                if (isEnterprise)
-                {
-                    ShowViewModel<Accounts.AddAccountViewModel>(new Accounts.AddAccountViewModel.NavObject { IsEnterprise = true, AttemptedAccountId = account.Id });
-                }
-                else
-                {
-                    ShowViewModel<Accounts.LoginViewModel>(Accounts.LoginViewModel.NavObject.CreateDontRemember(account));
-                }
-
                 return;
             }
 
@@ -71,7 +60,7 @@ protected async override void Startup()
 
                 ShowViewModel<Accounts.AccountsViewModel>();
                 if (isEnterprise)
-                    ShowViewModel<Accounts.AddAccountViewModel>(new Accounts.AddAccountViewModel.NavObject { IsEnterprise = true, AttemptedAccountId = account.Id });
+                    ShowViewModel<Accounts.AddAccountViewModel>(new Accounts.AddAccountViewModel.NavObject { AttemptedAccountId = account.Id });
                 else
                     ShowViewModel<Accounts.LoginViewModel>(Accounts.LoginViewModel.NavObject.CreateDontRemember(account));
             }

CodeHub.Core/ViewModels/FileSourceViewModel.cs

@@ -24,7 +24,9 @@ protected set
 				_filePath = value;
 				RaisePropertyChanged(() => FilePath);
 			}
-		}
+		}
+
+        public bool IsMarkdown { get; protected set; }
 
 		public string ContentPath
 		{
@@ -61,15 +63,6 @@ public ICommand ShareCommand
 			}
 		}
 
-		protected string CreateContentFile()
-		{
-			var html = System.IO.File.ReadAllText("SourceBrowser/index.html");
-			var filled = html.Replace("{CODE_PATH}", "file://" + FilePath + "#" + System.Environment.TickCount);
-			var filepath = System.IO.Path.Combine(System.IO.Path.GetTempPath(), "source.html");
-			System.IO.File.WriteAllText(filepath, filled, System.Text.Encoding.UTF8);
-			return filepath;
-		}
-
 		protected static string CreatePlainContentFile(string data, string filename)
 		{
 			var filepath = System.IO.Path.Combine(System.IO.Path.GetTempPath(), filename);

CodeHub.Core/ViewModels/Gists/GistFileViewModel.cs

@@ -1,5 +1,4 @@
 using System;
-using CodeHub.Core.ViewModels;
 using System.Threading.Tasks;
 using GitHubSharp.Models;
 using CodeHub.Core.ViewModels;
@@ -11,7 +10,18 @@ public class GistFileViewModel : FileSourceViewModel
     {
 		private string _id;
 		private string _filename;
-		private GistFileModel _fileModel;
+
+        public string FileName { get; private set; }
+
+        private GistFileModel _gist;
+        public GistFileModel Gist
+        {
+            get { return _gist; }
+            private set {
+                _gist = value;
+                RaisePropertyChanged();
+            }
+        }
 
 		public void Init(NavObject navObject)
         {
@@ -22,33 +32,33 @@ public void Init(NavObject navObject)
 
 			//Create the temp file path
 			Title = fileName;
+            FileName = fileName;
 
 			_id = navObject.GistId;
 			_filename = navObject.Filename;
 
 			//Grab the data
-			_fileModel = GetService<IViewModelTxService>().Get() as GistFileModel;
+            Gist = GetService<IViewModelTxService>().Get() as GistFileModel;
         }
 
 		protected override async Task Load(bool forceCacheInvalidation)
 		{
-			if (_fileModel == null)
+
+            if (Gist == null)
 			{
 				var data = await this.GetApplication().Client.ExecuteAsync(this.GetApplication().Client.Gists[_id].Get());
-				_fileModel = data.Data.Files[_filename];
+                Gist = data.Data.Files[_filename];
 			}
 
-			//Check to make sure...
-			if (_fileModel == null || _fileModel.Content == null)
-			{
+            if (Gist == null || Gist.Content == null)
 				throw new Exception("Unable to retreive gist!");
-			}
 
-			var content = _fileModel.Content;
-			var filePath = System.IO.Path.Combine(System.IO.Path.GetTempPath(), System.IO.Path.GetFileName(_fileModel.Filename));
-			System.IO.File.WriteAllText(filePath, content, System.Text.Encoding.UTF8);
-			FilePath = filePath;
-			ContentPath = CreateContentFile();
+            IsMarkdown = string.Equals(Gist?.Language, "Markdown");
+            Gist = Gist;
+
+            var filepath = System.IO.Path.Combine(System.IO.Path.GetTempPath(), FileName);
+            System.IO.File.WriteAllText(filepath, Gist.Content, System.Text.Encoding.UTF8);
+            ContentPath = FilePath = filepath;
 		}
 
 		public class NavObject

CodeHub.Core/ViewModels/Source/SourceViewModel.cs

@@ -5,12 +5,14 @@
 using CodeHub.Core.Messages;
 using MvvmCross.Plugins.Messenger;
 using MvvmCross.Core.ViewModels;
+using System.Linq;
 
 namespace CodeHub.Core.ViewModels.Source
 {
 	public class SourceViewModel : FileSourceViewModel
     {
 		private readonly MvxSubscriptionToken _editToken;
+        private static readonly string[] MarkdownExtensions = { ".markdown", ".mdown", ".mkdn", ".md", ".mkd", ".mdwn", ".mdtxt", ".mdtext", ".text" };
 
 		private string _path;
 		private string _name;
@@ -27,7 +29,8 @@ public class SourceViewModel : FileSourceViewModel
 
 		protected override async Task Load(bool forceCacheInvalidation)
         {
-			var filepath = System.IO.Path.Combine(System.IO.Path.GetTempPath(), System.IO.Path.GetFileName(_name));
+            var fileName = System.IO.Path.GetFileName(_name);
+            var filepath = System.IO.Path.Combine(System.IO.Path.GetTempPath(), fileName);
 			string mime = string.Empty;
 
 			using (var stream = new System.IO.FileStream(filepath, System.IO.FileMode.Create, System.IO.FileAccess.Write))
@@ -44,7 +47,7 @@ protected override async Task Load(bool forceCacheInvalidation)
 			var isText = mime.Contains("charset");
 			if (isText)
 			{
-				ContentPath = CreateContentFile();
+                ContentPath = FilePath;
 			}
         }
 
@@ -84,6 +87,9 @@ public void Init(NavObject navObject)
 
 			//Create the temp file path
 			Title = fileName;
+
+            var extension = System.IO.Path.GetExtension(_path);
+            IsMarkdown = MarkdownExtensions.Contains(extension);
 		}
 
 		public class NavObject