diff --git a/omnisharp.json b/omnisharp.json deleted file mode 100644 index 2c3209f..0000000 --- a/omnisharp.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "dotnet": { - "enabled": true - }, - "msbuild": { - "enabled": false - }, - "Dnx": { - "enabled": false - }, - "Script": { - "enabled": false - }, - "fileOptions": { - "systemExcludeSearchPatterns": [ - "**/bin/**/*", - "**/obj/**/*", - "**/node_modules/**/*" - ], - "userExcludeSearchPatterns": [] - } -} diff --git a/src/isnd/Controllers/Packages/PackagesController.GetPackage.cs b/src/isnd/Controllers/Packages/PackagesController.GetPackage.cs index 5cffd8f..1d03246 100644 --- a/src/isnd/Controllers/Packages/PackagesController.GetPackage.cs +++ b/src/isnd/Controllers/Packages/PackagesController.GetPackage.cs @@ -25,7 +25,7 @@ namespace isnd.Controllers if (!pkgFileInfo.Exists) { - return BadRequest("!pkgFileInfo.Exists"); + return BadRequest("Package does´nt exist in the file system."); } return File(pkgFileInfo.OpenRead(), "application/zip; charset=binary"); } @@ -45,7 +45,7 @@ namespace isnd.Controllers FileInfo pkgFileInfo = new FileInfo(pkgPath); if (!pkgFileInfo.Exists) { - return BadRequest("!pkgFileInfo.Exists"); + return BadRequest("Package info does´nt exist in the file system."); } return File(pkgFileInfo.OpenRead(), "text/xml; charset=utf-8"); diff --git a/src/isnd/Services/PackageManager.cs b/src/isnd/Services/PackageManager.cs index 26e5d85..abf0141 100644 --- a/src/isnd/Services/PackageManager.cs +++ b/src/isnd/Services/PackageManager.cs @@ -120,44 +120,53 @@ namespace isnd.Services public string[] GetVersions( string id, NuGetVersion parsedVersion = null, - bool prerelease = false, + bool prerelease = true, string packageType = null, int skip = 0, int take = 25) { - IQueryable results = - (parsedVersion != null)? - (packageType == null) ? - dbContext.PackageVersions.Where( - v => v.PackageId == id - && (prerelease || !v.IsPrerelease) - && (parsedVersion.CompareTo(new SemanticVersion(v.Major, v.Minor, v.Patch)) < 0) - ) - : - dbContext.PackageVersions.Where( - v => v.PackageId == id - && (prerelease || !v.IsPrerelease) - && (v.Type == packageType) - && (parsedVersion.CompareTo(new SemanticVersion(v.Major, v.Minor, v.Patch)) < 0) - ) - - : - (packageType == null) ? - dbContext.PackageVersions.Where( - v => v.PackageId == id - && (prerelease || !v.IsPrerelease) - ) - : - dbContext.PackageVersions.Where( - v => v.PackageId == id - && (prerelease || !v.IsPrerelease) - && (v.Type == packageType) - ) - ; + if (!String.IsNullOrWhiteSpace(id)) + { + id = id.ToLower(); + if (!String.IsNullOrWhiteSpace(packageType)) + { + packageType = packageType.ToLower(); + } + IQueryable results = + (parsedVersion != null) ? + (packageType == null) ? + dbContext.PackageVersions.Where( + v => v.PackageId.ToLower() == id + && (prerelease || !v.IsPrerelease) + && (parsedVersion.CompareTo(new SemanticVersion(v.Major, v.Minor, v.Patch)) < 0) + ) + : + dbContext.PackageVersions.Where( + v => v.PackageId.ToLower() == id + && (prerelease || !v.IsPrerelease) + && (v.Type == packageType) + && (parsedVersion.CompareTo(new SemanticVersion(v.Major, v.Minor, v.Patch)) < 0) + ) - return [.. results - .Select(v => v.FullString) - .Skip(skip).Take(take)]; + : + (packageType == null) ? + dbContext.PackageVersions.Where( + v => v.PackageId.ToLower() == id + && (prerelease || !v.IsPrerelease) + ) + : + dbContext.PackageVersions.Where( + v => v.PackageId.ToLower() == id + && (prerelease || !v.IsPrerelease) + && (v.Type == packageType) + ) + ; + var res = results.Select(v => v.FullString) + .Skip(skip).Take(take).ToArray(); + return res; + } + + return null; } public string CatalogBaseUrl => apiBase; diff --git a/test/data/packages/Yavsc.Abstract.1.0.8.nupkg b/test/data/packages/Yavsc.Abstract.1.0.8.nupkg new file mode 100644 index 0000000..0d97ff9 Binary files /dev/null and b/test/data/packages/Yavsc.Abstract.1.0.8.nupkg differ diff --git a/test/data/test-isn/NuGet.Config b/test/data/test-isn/NuGet.Config new file mode 100644 index 0000000..966fc61 --- /dev/null +++ b/test/data/test-isn/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/test/isn.tests/PushTest.cs b/test/isn.tests/PushTest.cs index c8a9884..304bfd9 100644 --- a/test/isn.tests/PushTest.cs +++ b/test/isn.tests/PushTest.cs @@ -30,7 +30,7 @@ namespace isn.tests public void TestPush() { Program.LoadConfig(); - var report = Program.PushPkg(new string[] { "./src/isn.abst/bin/Release/isn.abst.1.0.24.nupkg" }); + var report = Program.PushPkg(new string[] { "test/data/packages/Yavsc.Abstract.1.0.8.nupkg" }); } [Fact] diff --git a/test/isnd.tests/UnitTestWebHost.cs b/test/isnd.tests/UnitTestWebHost.cs index a6c61e4..eec9fb8 100644 --- a/test/isnd.tests/UnitTestWebHost.cs +++ b/test/isnd.tests/UnitTestWebHost.cs @@ -164,7 +164,7 @@ namespace isnd.host.tests sourceCacheContext.RefreshMemoryCache = true; CancellationTokenSource source = new CancellationTokenSource(); - var meta = await metadataResource.GetMetadataAsync( "isn.abst", true, false, sourceCacheContext, logger, source.Token); + var meta = await metadataResource.GetMetadataAsync( "Yavsc.Abstract", true, false, sourceCacheContext, logger, source.Token); foreach (IPackageSearchMetadata result in meta) {