From 6f826ba20531402e1445de6ef7d54fe8d4dde1f5 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Fri, 1 Apr 2016 09:24:01 +0100 Subject: [PATCH] controller: Remove redundant method --- SparkleShare/Common/BaseController.cs | 9 +-------- Sparkles/Extensions.cs | 3 ++- Sparkles/Git/GitRepository.cs | 4 ++-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/SparkleShare/Common/BaseController.cs b/SparkleShare/Common/BaseController.cs index 7653d45f..4dfa0c88 100644 --- a/SparkleShare/Common/BaseController.cs +++ b/SparkleShare/Common/BaseController.cs @@ -721,15 +721,8 @@ namespace SparkleShare { string [] files = Directory.GetFiles (path); foreach (string file in files) - if (!IsSymlink (file)) + if (file.IsSymlink ()) File.SetAttributes (file, FileAttributes.Normal); } - - - bool IsSymlink (string file) - { - FileAttributes attributes = File.GetAttributes (file); - return ((attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint); - } } } diff --git a/Sparkles/Extensions.cs b/Sparkles/Extensions.cs index 7ec1cd6b..8475f5cb 100644 --- a/Sparkles/Extensions.cs +++ b/Sparkles/Extensions.cs @@ -81,8 +81,9 @@ namespace Sparkles { } - public static bool IsSymlink (this FileSystemInfo file) + public static bool IsSymlink (this string path) { + var file = new FileInfo (path); return ((file.Attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint); } diff --git a/Sparkles/Git/GitRepository.cs b/Sparkles/Git/GitRepository.cs index ab049794..53a3c4a8 100644 --- a/Sparkles/Git/GitRepository.cs +++ b/Sparkles/Git/GitRepository.cs @@ -1116,7 +1116,7 @@ namespace Sparkles.Git { try { foreach (DirectoryInfo directory in parent.GetDirectories ()) { - if (directory.IsSymlink () || + if (directory.FullName.IsSymlink () || directory.Name.Equals (".git") || directory.Name.Equals ("rebase-apply")) { @@ -1132,7 +1132,7 @@ namespace Sparkles.Git { try { foreach (FileInfo file in parent.GetFiles ()) { - if (file.IsSymlink ()) + if (file.FullName.IsSymlink ()) continue; if (file.Name.Equals (".empty"))