fergalmoran/podnoms
1
0
Fork 0
mirror of https://github.com/fergalmoran/podnoms.git synced 2026-02-12 02:34:01 +00:00
Code Issues 4 Packages Projects Releases Wiki Activity

Merge branch 'release/v0.14'

Browse Source
This commit is contained in:
Fergal Moran
2018-03-08 19:24:47 +00:00
parent ced5715df9 493c45ca04
commit cd938ea021
9 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/package-lock.json generated
View File

@@ -522,6 +522,14 @@
"moment": "2.21.0"
}
},
"angulartics2": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/angulartics2/-/angulartics2-5.1.2.tgz",
"integrity": "sha512-ZTmSXH6t7Set8TT4oY6HcCLr7bIbK56oJnUVlDJNXSnCTS2DeZW0lP/4pcGpdELCTAF5xfosjar+DM+7kqWiPQ==",
"requires": {
"tslib": "1.9.0"
}
},
"ansi-html": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",

2
client/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "pod-noms.web",
"version": "0.13.0",
"version": "0.14.0",
"license": "MIT",
"scripts": {
"ng": "ng",

5
client/src/app/app.component.ts
View File

@@ -2,6 +2,7 @@ import { GlobalsService } from './services/globals.service';
import { Component, HostBinding } from '@angular/core';
import { Store } from '@ngrx/store';
import { AuthService } from 'app/services/auth.service';
import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
@Component({
selector: 'app-root',
@@ -9,12 +10,10 @@ import { AuthService } from 'app/services/auth.service';
styleUrls: ['./app.component.css']
})
export class AppComponent {
constructor(private _authService: AuthService, _globals: GlobalsService) {
constructor(private _authService: AuthService) {
_authService.handleAuthentication();
_authService.scheduleRenewal();
}
loggedIn() {
return this._authService.isAuthenticated();
}

7
client/src/app/app.module.ts
View File

@@ -97,9 +97,14 @@ export function authHttpServiceFactory(http: Http, options: RequestOptions) {
ToastyModule.forRoot(),
DropzoneModule,
ClipboardModule,
StoreModule.forRoot(reducers),
EffectsModule.forRoot([PodcastsEffects, EntriesEffects, ProfileEffects]),
EffectsModule.forRoot([
PodcastsEffects,
EntriesEffects,
ProfileEffects
]),
StoreDevtoolsModule.instrument({
maxAge: 25 // Retains last 25 states
})

13
client/src/index.html
View File

@@ -2,6 +2,19 @@
<html lang="en">
<head>
<!-- Google Analytics -->
<script>
(function (i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
(i[r].q = i[r].q || []).push(arguments)
}, i[r].l = 1 * new Date(); a = s.createElement(o),
m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
ga('create', 'UA-115328404-1', 'auto');
ga('send', 'pageview');
</script>
<!-- End Google Analytics -->
<meta charset="utf-8">
<title>PodNoms.Web</title>
<base href="/">

6
server/PodNoms.Api.csproj
View File

@@ -10,16 +10,16 @@
<EmbeddedResource Include="Resources/*.xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Hangfire" Version="1.6.17" />
<PackageReference Include="Hangfire.MemoryStorage" Version="1.5.2" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0-preview1-final" />
<PackageReference Include="AutoMapper" Version="6.2.2" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="3.2.0" />
<PackageReference Include="Handlebars.NetStandard" Version="1.8.1" />
<PackageReference Include="Hangfire" Version="1.6.14" />
<PackageReference Include="Hangfire.MemoryStorage" Version="1.5.2" />
<PackageReference Include="NYoutubeDl" Version="0.6.3" />
<PackageReference Include="Polly" Version="5.2.0" />
<PackageReference Include="ImageSharp" Version="1.0.0-*" />
<PackageReference Include="RestSharp" Version="106.1.0" />
<PackageReference Include="ImageSharp" Version="1.0.0-*" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0-preview1-26216-02" />
<PackageReference Include="WindowsAzure.Storage" Version="8.2.1" />
</ItemGroup>

4
server/Services/Downloader/AudioDownloader.cs
View File

@@ -54,12 +54,12 @@ namespace PodNoms.Api.Services.Downloader {
await Task.Run(() => {
var youtubeDl = new YoutubeDL();
youtubeDl.VideoUrl = this._url;
this.Properties = youtubeDl.GetDownloadInfo() as VideoDownloadInfo;
var info = youtubeDl.GetDownloadInfo();
var info = youtubeDl.GetDownloadInfo() as VideoDownloadInfo;
ret = (
info != null &&
info is VideoDownloadInfo && //make sure it's not a playlist
(info.Errors.Count == 0 || info.VideoSize != null));
if (ret) this.Properties = info;
});
return ret;
}

2
server/Services/Processor/AudioUploadProcessService.cs
View File

@@ -36,7 +36,7 @@ namespace PodNoms.Api.Services.Processor {
entry.ProcessingStatus = ProcessingStatus.Uploading;
await _unitOfWork.CompleteAsync ();
try {
// bit messy but can't figure how to p ass youtube-dl job result to this job
// bit messy but can't figure how to pass youtube-dl job result to this job
// so using AudioUrl as a proxy
if (string.IsNullOrEmpty (localFile))
localFile = entry.AudioUrl;

2
server/appsettings.json
View File

@@ -8,7 +8,7 @@
}
},
"App": {
"Version": "0.13.0"
"Version": "0.14.0"
},
"ConnectionStrings": {
"DefaultConnection": "server=localhost;database=PodNoms;user id=sa;password=cTXu1nJLCpC/c"