github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-14 18:47:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed build

Browse source
This commit is contained in:
tidusjar 2019-11-06 10:07:36 +00:00
commit 753111124f
6 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Ombi/ClientApp/package.json
View file

@ -48,7 +48,6 @@
"moment": "^2.23.0",
"ng2-cookies": "^1.0.12",
"ngx-bootstrap": "^3.1.4",
"ngx-chips": "^2.1.0",
"ngx-clipboard": "^12.1.0",
"ngx-infinite-scroll": "^7.1.0",
"ngx-moment": "^3.0.1",

22
src/Ombi/ClientApp/src/app/settings/about/about.component.html
View file

@ -68,7 +68,29 @@
<div class="mat-row">
<div class="mat-cell">Application Base Path</div>
<div class="mat-cell">{{about.applicationBasePath}}</div>
</div>
<div class="mat-row">
<div class="mat-cell">Storage Path</div>
<div class="mat-cell">{{about.storagePath}}</div>
</div>
<div class="mat-row">
<div class="mat-cell">Ombi Database</div>
<div class="mat-cell">{{about.ombiDatabaseType}} - {{about.ombiConnectionString}}</div>
</div>
<div class="mat-row">
<div class="mat-cell">External Database</div>
<div class="mat-cell">{{about.externalDatabaseType}} - {{about.externalConnectionString}}</div>
</div>
<div class="mat-row">
<div class="mat-cell">Settings Database</div>
<div class="mat-cell">{{about.settingsDatabaseType}} - {{about.settingsConnectionString}}</div>
</div>
</div>
</div>

4
src/Ombi/ClientApp/src/app/settings/settings.module.ts
View file

@ -3,7 +3,7 @@ import { NgModule } from "@angular/core";
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
import { RouterModule, Routes } from "@angular/router";
import { NgbAccordionModule, NgbModule } from "@ng-bootstrap/ng-bootstrap";
import { TagInputModule } from "ngx-chips";
// import { TagInputModule } from "ngx-chips";
import { ClipboardModule } from "ngx-clipboard";
import { AuthGuard } from "../auth/auth.guard";
@ -105,7 +105,7 @@ const routes: Routes = [
NgbAccordionModule,
AutoCompleteModule,
CalendarModule,
TagInputModule,
// TagInputModule,
ClipboardModule,
PipeModule,
RadioButtonModule,

4
src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.html
View file

@ -14,7 +14,7 @@
<label class="control-label" pTooltip="Prevent movies with certain keywords from being suggested. May require a restart to take effect.">
Excluded Keyword IDs for Movie Suggestions
</label>
<tag-input #input
<!-- <tag-input #input
[(ngModel)]="excludedKeywords"
[identifyBy]="'id'" [displayBy]="'name'"
[placeholder]="'Search by keyword'"
@ -38,7 +38,7 @@
[showDropdownIfEmpty]="false"
[keepOpen]="false">
</tag-input-dropdown>
</tag-input>
</tag-input> -->
</div>
<div class="form-group">

15
src/Ombi/ClientApp/yarn.lock
View file

@ -3917,25 +3917,10 @@ ng2-cookies@^1.0.12:
version "1.0.12"
resolved "https://registry.yarnpkg.com/ng2-cookies/-/ng2-cookies-1.0.12.tgz#3f3e613e0137b0649b705c678074b4bd08149ccc"
ng2-material-dropdown@0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/ng2-material-dropdown/-/ng2-material-dropdown-0.11.0.tgz#27a402ef3cbdcaf6791ef4cfd4b257e31db7546f"
integrity sha512-wptBo09qKecY0QPTProAThrc4A3ajJTcHE9LTpCG5XZZUhXLBzhnGK8OW33TN8A+K/jqcs7OB74ppYJiqs3nhQ==
dependencies:
tslib "^1.9.0"
ngx-bootstrap@^3.1.4:
version "3.1.4"
resolved "https://registry.yarnpkg.com/ngx-bootstrap/-/ngx-bootstrap-3.1.4.tgz#5105c0227da3b51a1972d04efa1504a79474fd57"
ngx-chips@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/ngx-chips/-/ngx-chips-2.1.0.tgz#aa299bcf40dc3e1f6288bf1d29e2fdfe9a132ed3"
integrity sha512-OQV4dTfD3nXm5d2mGKUSgwOtJOaMnZ4F+lwXOtd7DWRSUne0JQWwoZNHdOpuS6saBGhqCPDAwq6KxdR5XSgZUQ==
dependencies:
ng2-material-dropdown "0.11.0"
tslib "^1.9.0"
ngx-clipboard@^12.1.0:
version "12.1.0"
resolved "https://registry.yarnpkg.com/ngx-clipboard/-/ngx-clipboard-12.1.0.tgz#41d10c9d031d5d6e854f8c21c85460c96685b10b"

22
src/Ombi/Controllers/V2/SystemController.cs
View file

@ -1,9 +1,7 @@
using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Ombi.Attributes;
@ -13,9 +11,9 @@ namespace Ombi.Controllers.V2
[Admin]
public class SystemController : V2Controller
{
private readonly IHostingEnvironment _hosting;
private readonly IWebHostEnvironment _hosting;
public SystemController(IHostingEnvironment hosting)
public SystemController(IWebHostEnvironment hosting)
{
_hosting = hosting;
}
@ -35,22 +33,18 @@ namespace Ombi.Controllers.V2
public async Task<IActionResult> ReadLogFile(string logFileName, CancellationToken token)
{
var logFile = Path.Combine(_hosting.ContentRootPath, "Logs", logFileName);
using (var fs = new FileStream(logFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
using (StreamReader reader = new StreamReader(fs))
{
return Ok(await reader.ReadToEndAsync());
}
await using var fs = new FileStream(logFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
using StreamReader reader = new StreamReader(fs);
return Ok(await reader.ReadToEndAsync());
}
[HttpGet("logs/download/{logFileName}")]
public IActionResult Download(string logFileName, CancellationToken token)
{
var logFile = Path.Combine(_hosting.ContentRootPath, "Logs", logFileName);
using (var fs = new FileStream(logFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
using (StreamReader reader = new StreamReader(fs))
{
return File(reader.BaseStream, "application/octet-stream", logFileName);
}
using var fs = new FileStream(logFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
using StreamReader reader = new StreamReader(fs);
return File(reader.BaseStream, "application/octet-stream", logFileName);
}
}
}