Moved file URI conversion and escaping to GradleWrapper

Moved file URI conversion and escaping to GradleWrapper so that
it can be reused by other modules.

Bug: 135269831, 135273820
Change-Id: I576b0d8d1eb6ae88ebd3c6a7d82ad04e57421601

Author: Stewart Miles

source/PlayServicesResolver/src/GradleResolver.cs

@@ -121,11 +121,6 @@ internal static Dictionary<string, string> DependenciesToPackageSpecs(
             return sourcesByPackageSpec;
         }
 
-        // Special characters that should not be escaped in URIs for Gradle property values.
-        private static HashSet<string> GradleUriExcludeEscapeCharacters = new HashSet<string> {
-            ":"
-        };
-
         /// <summary>
         /// Convert a repo path to a valid URI.
         /// If the specified repo is a local directory and it doesn't exist, search the project
@@ -145,40 +140,31 @@ internal static string RepoPathToUri(string repoPath, string sourceLocation=null
             if (repoPath.StartsWith(PlayServicesSupport.SdkVariable)) return null;
             // Since we need a URL, determine whether the repo has a scheme.  If not,
             // assume it's a local file.
-            bool validScheme = false;
             foreach (var scheme in new [] { "file:", "http:", "https:" }) {
-                validScheme |= repoPath.StartsWith(scheme);
+                if (repoPath.StartsWith(scheme)) return GradleWrapper.EscapeUri(repoPath);
             }
-            if (!validScheme) {
-                // If the directory isn't found, it is possible the user has moved the repository
-                // in the project, so try searching for it.
-                string searchDir = "Assets" + Path.DirectorySeparatorChar;
-                if (!Directory.Exists(repoPath) &&
-                    FileUtils.NormalizePathSeparators(repoPath.ToLower()).StartsWith(
-                        searchDir.ToLower())) {
-                    var foundPath = FileUtils.FindPathUnderDirectory(
-                        searchDir, repoPath.Substring(searchDir.Length));
-                    string warningMessage;
-                    if (!String.IsNullOrEmpty(foundPath)) {
-                        repoPath = searchDir + foundPath;
-                        warningMessage = String.Format(
-                            "{0}: Repo path '{1}' does not exist, will try using '{2}' instead.",
-                            sourceLocation, repoPath, foundPath);
-                    } else {
-                        warningMessage = String.Format(
-                            "{0}: Repo path '{1}' does not exist.", sourceLocation, repoPath);
-                    }
-                    PlayServicesResolver.Log(warningMessage, level: LogLevel.Warning);
-                }
 
-                repoPath = PlayServicesResolver.FILE_SCHEME +
-                    FileUtils.PosixPathSeparators(Path.GetFullPath(repoPath));
+            // If the directory isn't found, it is possible the user has moved the repository
+            // in the project, so try searching for it.
+            string searchDir = "Assets" + Path.DirectorySeparatorChar;
+            if (!Directory.Exists(repoPath) &&
+                FileUtils.NormalizePathSeparators(repoPath.ToLower()).StartsWith(
+                    searchDir.ToLower())) {
+                var foundPath = FileUtils.FindPathUnderDirectory(
+                    searchDir, repoPath.Substring(searchDir.Length));
+                string warningMessage;
+                if (!String.IsNullOrEmpty(foundPath)) {
+                    repoPath = searchDir + foundPath;
+                    warningMessage = String.Format(
+                        "{0}: Repo path '{1}' does not exist, will try using '{2}' instead.",
+                        sourceLocation, repoPath, foundPath);
+                } else {
+                    warningMessage = String.Format(
+                        "{0}: Repo path '{1}' does not exist.", sourceLocation, repoPath);
+                }
+                PlayServicesResolver.Log(warningMessage, level: LogLevel.Warning);
             }
-            // Escape the URI to handle special characters like spaces and percent escape
-            // all characters that are interpreted by gradle.
-            return GradleWrapper.EscapeGradlePropertyValue(
-                Uri.EscapeUriString(repoPath), escapeFunc: Uri.EscapeDataString,
-                charactersToExclude: GradleUriExcludeEscapeCharacters);
+            return GradleWrapper.EscapeUri(GradleWrapper.PathToFileUri(repoPath));
         }
 
         /// <summary>

source/PlayServicesResolver/src/GradleWrapper.cs

@@ -223,5 +223,37 @@ public static string GenerateGradleProperties(Dictionary<string, string> propert
             }
             return String.Join("\n", lines.ToArray());
         }
+
+        /// <summary>
+        /// File scheme that can be concatenated with an absolute path on the local filesystem.
+        /// </summary>
+        public const string FILE_SCHEME = "file:///";
+
+        /// <summary>
+        /// Convert a local filesystem path to a URI.
+        /// </summary>
+        /// <param name="localPath">Path to convert.</param>
+        /// <returns>File URI.</returns>
+        public static string PathToFileUri(string localPath) {
+            return FILE_SCHEME + FileUtils.PosixPathSeparators(Path.GetFullPath(localPath));
+        }
+
+        // Special characters that should not be escaped in URIs for Gradle property values.
+        private static HashSet<string> GradleUriExcludeEscapeCharacters = new HashSet<string> {
+            ":"
+        };
+
+        /// <summary>
+        /// Escape a URI so that it can be passed to Gradle.
+        /// </summary>
+        /// <param name="uri">URI to escape.</param>
+        /// <returns>Escaped URI.</returns>
+        public static string EscapeUri(string uri) {
+            // Escape the URI to handle special characters like spaces and percent escape
+            // all characters that are interpreted by gradle.
+            return GradleWrapper.EscapeGradlePropertyValue(
+                Uri.EscapeUriString(uri), escapeFunc: Uri.EscapeDataString,
+                charactersToExclude: GradleUriExcludeEscapeCharacters);
+        }
     }
 }

source/PlayServicesResolver/src/PlayServicesResolver.cs

@@ -1864,11 +1864,6 @@ public static IList<KeyValuePair<string, string>> GetRepos(
             return GradleResolver.DependenciesToRepoUris(GetOrReadDependencies(dependencies));
         }
 
-        /// <summary>
-        /// File scheme that can be concatenated with an absolute path on the local filesystem.
-        /// </summary>
-        internal const string FILE_SCHEME = "file:///";
-
         /// <summary>
         /// Get the included dependency repos as lines that can be included in a Gradle file.
         /// </summary>
@@ -1887,7 +1882,7 @@ internal static IList<string> GradleMavenReposLines(ICollection<Dependency> depe
                 lines.Add(String.Format(
                           "        def unityProjectPath = \"{0}\" + " +
                           "file(rootProject.projectDir.path + \"/../../\").absolutePath",
-                          FILE_SCHEME));
+                          GradleWrapper.FILE_SCHEME));
                 lines.Add("        maven {");
                 lines.Add("            url \"https://maven.google.com\"");
                 lines.Add("        }");