paul/isn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Errors to Error std output

Browse Source
This commit is contained in:
Paul Schneider
2022-04-18 20:58:46 +01:00
parent 8fa4c04367
commit 3e09afcbfe
9 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/isn/Program.cs
View File

@ -187,10 +187,9 @@ namespace isn
}
catch (OptionException e)
{
// output some error message
Console.Write("isn: ");
Console.WriteLine(e.Message);
Console.WriteLine("Try `isn --help' for more information.");
Console.Error.Write("isn: ");
Console.Error.WriteLine(e.Message);
Console.Error.WriteLine("Try `isn --help' for more information.");
return 2;
}

2
src/isnd/Controllers/Packages/ApiIndex.cs
View File

@ -24,7 +24,7 @@ namespace isnd.Controllers
[HttpGet(_pkgRootPrefix + ApiConfig.Base)]
public IActionResult ApiIndex()
{
return Ok(new ApiIndexViewModel{ Version = PackageManager.BASE_API_LEVEL, Resources = _resources });
return Ok(new ApiIndexViewModel{ Version = PackageManager.BASE_API_LEVEL, Resources = resources });
}
}

2
src/isnd/Controllers/Packages/AutoComplete.cs
View File

@ -20,7 +20,7 @@ namespace isnd.Controllers
CheckParams(take, semVerLevel);
if (ModelState.ErrorCount > 0) return BadRequest(ModelState);
return Ok(_packageManager.AutoComplete(id,skip,take,prerelease,packageType));
return Ok(packageManager.AutoComplete(id,skip,take,prerelease,packageType));
}
protected void CheckParams(int take,string semVerLevel)

4
src/isnd/Controllers/Packages/Catalog.cs
View File

@ -31,7 +31,7 @@ namespace isnd.Controllers
public async Task<IActionResult> CatalogLeafAsync(string id, string lower)
{
string pkgType = ParamHelpers.Optional(ref lower);
var pkgVersion = await _dbContext.PackageVersions
var pkgVersion = await dbContext.PackageVersions
.Include(v => v.LatestCommit)
.SingleOrDefaultAsync(
v => v.PackageId == id &&
@ -40,7 +40,7 @@ namespace isnd.Controllers
);
if (pkgVersion == null) return NotFound();
var pub = await _dbContext.Commits
var pub = await dbContext.Commits
.Include(c => c.Versions)
.OrderBy(c => c.CommitTimeStamp)
.SingleOrDefaultAsync

2
src/isnd/Controllers/Packages/Delete.cs
View File

@ -14,7 +14,7 @@ namespace isnd.Controllers
[FromRoute][SafeName][Required] string lower)
{
string pkgtype = ParamHelpers.Optional(ref lower);
var report = await _packageManager.DeletePackageAsync(id, lower, pkgtype);
var report = await packageManager.DeletePackageAsync(id, lower, pkgtype);
return Ok(report);
}
}

4
src/isnd/Controllers/Packages/Files.cs
View File

@ -15,7 +15,7 @@ namespace isnd.Controllers
[FromRoute][SafeName][Required] string lower,
[FromRoute] string idf, [FromRoute] string lowerf)
{
var pkgpath = Path.Combine(_isndSettings.PackagesRootDir,
var pkgpath = Path.Combine(isndSettings.PackagesRootDir,
id, lower, $"{id}-{lower}.nupkg"
);
@ -36,7 +36,7 @@ namespace isnd.Controllers
[FromRoute][SafeName][Required] string idf,
[FromRoute][SafeName][Required] string lowerf)
{
var pkgpath = Path.Combine(_isndSettings.PackagesRootDir,
var pkgpath = Path.Combine(isndSettings.PackagesRootDir,
id, lower, $"{id}.nuspec");
FileInfo pkgfi = new FileInfo(pkgpath);

2
src/isnd/Controllers/Packages/GetVersions.cs
View File

@ -30,7 +30,7 @@ namespace isnd.Controllers
}
return Ok(new
{
versions = _packageManager.GetVersions(
versions = packageManager.GetVersions(
id, parsedVersion, prerelease, packageType, skip, take)
});
}

41
src/isnd/Controllers/Packages/Put.cs
View File

@ -34,11 +34,11 @@ namespace isnd.Controllers
var files = new List<string>();
ViewData["files"] = files;
var clearkey = _protector.Unprotect(apiKey);
var apikey = _dbContext.ApiKeys.SingleOrDefault(k => k.Id == clearkey);
var clearkey = protector.Unprotect(apiKey);
var apikey = dbContext.ApiKeys.SingleOrDefault(k => k.Id == clearkey);
if (apikey == null)
{
_logger.LogError("403 : no api-key");
logger.LogError("403 : no api-key");
return Unauthorized();
}
Commit commit = new Commit
@ -46,7 +46,7 @@ namespace isnd.Controllers
Action = PackageAction.PublishPackage,
TimeStamp = DateTime.Now
};
_dbContext.Commits.Add(commit);
dbContext.Commits.Add(commit);
foreach (IFormFile file in Request.Form.Files)
{
@ -79,14 +79,14 @@ namespace isnd.Controllers
pkgid = reader.GetId();
version = reader.GetVersion();
string pkgidpath = Path.Combine(_isndSettings.PackagesRootDir,
string pkgidpath = Path.Combine(isndSettings.PackagesRootDir,
pkgid);
pkgpath = Path.Combine(pkgidpath, version.ToFullString());
string name = $"{pkgid}-{version}.nupkg";
fullpath = Path.Combine(pkgpath, name);
var destpkgiddir = new DirectoryInfo(pkgidpath);
Package package = _dbContext.Packages.SingleOrDefault(p => p.Id == pkgid);
Package package = dbContext.Packages.SingleOrDefault(p => p.Id == pkgid);
if (package != null)
{
if (package.OwnerId != apikey.UserId)
@ -104,7 +104,7 @@ namespace isnd.Controllers
OwnerId = apikey.UserId,
LatestVersion = commit
};
_dbContext.Packages.Add(package);
dbContext.Packages.Add(package);
}
if (!destpkgiddir.Exists) destpkgiddir.Create();
@ -116,7 +116,7 @@ namespace isnd.Controllers
// La version existe sur le disque,
// mais si elle ne l'est pas en base de donnéés,
// on remplace la version sur disque.
var pkgv = _dbContext.PackageVersions.Where(
var pkgv = dbContext.PackageVersions.Where(
v => v.PackageId == package.Id
);
@ -125,10 +125,9 @@ namespace isnd.Controllers
dest.Delete();
}
else {
ViewData["msg"] = "existant";
ViewData["ecode"] = 1;
_logger.LogWarning("400 : existant");
return base.BadRequest(new { error = ModelState });
logger.LogWarning("400 : pkgversion:existant");
ModelState.AddModelError("pkgversion", "existant" );
return BadRequest(ModelState);
}
}
{
@ -136,16 +135,16 @@ namespace isnd.Controllers
source.MoveTo(fullpath);
files.Add(name);
string fullstringversion = version.ToFullString();
var pkgvers = _dbContext.PackageVersions.Where
var pkgvers = dbContext.PackageVersions.Where
(v => v.PackageId == package.Id && v.FullString == fullstringversion);
if (pkgvers.Count() > 0)
{
foreach (var v in pkgvers.ToArray())
_dbContext.PackageVersions.Remove(v);
dbContext.PackageVersions.Remove(v);
}
// FIXME default type or null
if (types==null || types.Count==0)
_dbContext.PackageVersions.Add
dbContext.PackageVersions.Add
(new PackageVersion{
Package = package,
@ -171,13 +170,13 @@ namespace isnd.Controllers
Type = type.Name,
LatestCommit = commit
};
_dbContext.PackageVersions.Add(pkgver);
dbContext.PackageVersions.Add(pkgver);
}
await _dbContext.SaveChangesAsync();
_packageManager.ÛpdateCatalogFor(commit);
await dbContext.SaveChangesAsync();
packageManager.ÛpdateCatalogFor(commit);
_logger.LogInformation($"new package : {nuspec.Name}");
logger.LogInformation($"new package : {nuspec.Name}");
}
}
using (var shacrypto = System.Security.Cryptography.SHA512.Create())
@ -208,8 +207,8 @@ namespace isnd.Controllers
}
catch (Exception ex)
{
_logger.LogError(ex.Message);
_logger.LogError("Stack Trace: " + ex.StackTrace);
logger.LogError(ex.Message);
logger.LogError("Stack Trace: " + ex.StackTrace);
return new ObjectResult(new { ViewData, ex.Message })
{ StatusCode = 500 };
}

4
src/isnd/Controllers/Packages/WebViews.cs
View File

@ -13,7 +13,7 @@ namespace isnd.Controllers
// Web search
public async Task<IActionResult> Index(PackageIndexViewModel model)
{
var applicationDbContext = _dbContext.Packages.Include(p => p.Versions).Where(
var applicationDbContext = dbContext.Packages.Include(p => p.Versions).Where(
p => ( model.Prerelease || p.Versions.Any(v => !v.IsPrerelease))
&& ((model.Query == null) || p.Id.StartsWith(model.Query)));
model.Data = await applicationDbContext.ToArrayAsync();
@ -27,7 +27,7 @@ namespace isnd.Controllers
return NotFound();
}
var packageVersion = _dbContext.PackageVersions
var packageVersion = dbContext.PackageVersions
.Include(p => p.Package)
.Where(m => m.PackageId == pkgid)
.OrderByDescending(p => p)