Merge pull request #49 from HanaDigital/version-2.0.0

Version 2.0.1

main.ts

@@ -133,10 +133,16 @@ autoUpdater.on('update-not-available', (event) => {
 });
 
 autoUpdater.on('download-progress', (progressObj) => {
-	let log_message = "Download speed: " + progressObj.bytesPerSecond;
-	log_message = log_message + ' - Downloaded ' + progressObj.percent + '%';
-	log_message = log_message + ' (' + progressObj.transferred + "/" + progressObj.total + ')';
-	win.webContents.send('download_progress', log_message);
+	const downloadSpeed = Math.round((progressObj.bytesPerSecond / 1024) * 100) / 100;
+	const downloadPercentage = progressObj.percent;
+	const downloadTransferred = progressObj.transferred;
+	const downloadTotal = progressObj.total;
+	win.webContents.send('download_progress', {
+		downloadSpeed: downloadSpeed,
+		downloadPercentage: downloadPercentage,
+		downloadTransferred: downloadTransferred,
+		downloadTotal: downloadTotal
+	});
 })
 
 // Update has been downloaded

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "novelscraper",
-	"version": "2.0.0",
+	"version": "2.0.1",
 	"description": "App for downloading novels from pirate sites.",
 	"homepage": "https://github.com/HanaDigital/NovelScraper",
 	"author": {

src/app/app.component.html

@@ -81,7 +81,21 @@
 				display: isUpdating ? 'block' : 'none'
 			}"
 		>
-			UPDATING
+			<h3>{{ updateData.downloadPercentage }}%</h3>
+			<div
+				class="updatingBar"
+				[ngStyle]="{
+					width: updateData.downloadPercentage + '%'
+				}"
+			></div>
+		</div>
+		<div class="downloadInfo">
+			<p>
+				{{ updateData.downloadSpeed }} Kb/s - ({{
+					updateData.downloadTransferred
+				}}
+				/ {{ updateData.downloadTotal }})
+			</p>
 		</div>
 	</div>
 </div>

src/app/app.component.scss

@@ -178,18 +178,31 @@ body {
 		background: white;
 		position: relative;
 
+		.downloadInfo {
+			margin-top: 0.5em;
+			width: 100%;
+			text-align: center;
+		}
+
 		.promptWrapper {
 			display: flex;
+			flex-direction: column;
 			justify-content: center;
 			text-align: center;
 			bottom: 0px;
 			border-radius: 5px;
 			padding: 10px;
 			box-shadow: inset 0px 0px 12px -5px rgba(0, 0, 0, 0.25);
 			transition: all 1s;
+
+			span {
+				margin-top: 1em;
+			}
 		}
 
 		.updating {
+			position: relative;
+			overflow: hidden;
 			display: flex;
 			justify-content: center;
 			align-items: center;
@@ -199,21 +212,37 @@ body {
 			right: 0;
 			bottom: 0;
 			border-radius: 5px;
-			padding: 10px;
 			box-shadow: inset 0px 0px 12px -5px rgba(0, 0, 0, 0.25);
-			background: linear-gradient(
-				-45deg,
-				#74ccbc,
-				rgb(140, 255, 240),
-				#44beff,
-				#00a2ff
-			);
-			background-size: 400% 400%;
-			animation: load 5s ease infinite;
 			transition: all 1s;
 
-			color: white;
+			color: #505050;
 			font-weight: bolder;
+
+			h3 {
+				position: absolute;
+				top: 0;
+				left: 0;
+				bottom: 0;
+				right: 0;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			.updatingBar {
+				height: 40px;
+				background: linear-gradient(
+					-45deg,
+					#74ccbc,
+					#8cfff0,
+					#44beff,
+					#00a2ff
+				);
+				background-size: 400% 400%;
+				animation: load 5s ease infinite;
+				box-shadow: inset 0px 0px 12px -5px rgba(0, 0, 0, 0.25);
+				transition: all 1s;
+			}
 		}
 
 		p {

src/app/app.component.ts

@@ -14,6 +14,8 @@ export class AppComponent {
 
 	menuButtons: HTMLCollectionOf<Element> = document.getElementsByClassName("button");
 
+	updateData: any;
+
 	constructor(zone: NgZone) {
 		console.log('Production: ', AppConfig.production);
 
@@ -36,7 +38,7 @@ export class AppComponent {
 		});
 
 		ipcRenderer.on('download_progress', (event, arg) => {
-			console.log(arg);
+			this.updateData = arg;
 		});
 
 		ipcRenderer.on('update_downloaded', () => {
@@ -61,7 +63,7 @@ export class AppComponent {
 	}
 
 	toggleUpdatePrompt(): void {
-		this.isUpdate = false;
+		this.isUpdate = !this.isUpdate;
 	}
 
 	// Minimize Window

src/app/pages/novel/novel.component.ts

@@ -21,13 +21,13 @@ export class NovelComponent implements OnInit {
 	fromHome: boolean = history.state.fromHome
 	fromLibrary: boolean = history.state.fromLibrary
 
-	progress: number = 0;
+	progress = 0;
 
 	downloadID: number;
 	checkDownload: NodeJS.Timeout;
 
-	showModal: boolean = false;
-	loading: boolean = false;
+	showModal = false;
+	loading = false;
 
 	constructor(private router: Router, public database: DatabaseService, public sourceManager: SourceManagerService) {
 		if (!this.source) this.source = {
@@ -76,6 +76,7 @@ export class NovelComponent implements OnInit {
 
 	addToLibrary(): void {
 		this.novel = this.database.addNovel(this.novel);
+		this.refresh();
 	}
 
 	download(): void {

src/app/pages/source-page/source-page.component.ts

@@ -25,9 +25,9 @@ export class SourcePageComponent implements OnInit {
 
 	ngOnInit(): void {
 		if (!this.source) this.source = {
-			name: "BoxNovel",
-			link: "https://boxnovel.com",
-			icon: "assets/img/sources/boxnovel-logo.png"
+			name: "NovelFull",
+			link: "https://novelfull.com",
+			icon: "assets/img/sources/novelfull-logo.png"
 		};
 
 		this.service = this.sourceManager.getService(this.source.name);

src/app/resources/sourceList.ts

@@ -1,6 +1,7 @@
 import { sourcesList } from "./types"
 
 export const sources: sourcesList = [
+	{ name: "NovelFull", link: "https://novelfull.com", icon: "assets/img/sources/novelfull-logo.png" },
 	{ name: "BoxNovel", link: "https://boxnovel.com", icon: "assets/img/sources/boxnovel-logo.png" },
 	{ name: "ReadLightNovel", link: "https://www.readlightnovel.org", icon: "assets/img/sources/readlightnovel-logo.png" },
 ];

src/app/services/sources/novelfull.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { NovelfullService } from './novelfull.service';
+
+describe('NovelfullService', () => {
+  let service: NovelfullService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(NovelfullService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});