colored

backend/config_parser.py

@@ -19,11 +19,13 @@ class Recorder:
         self.name = name
         self.index = index
         self.channels = 0
+        self.nvr_index = 0
 
     @property
     def nvr(self):
         client = DVRIPCam(self.address, port = self.port, user = self.username, password = self.password)
-        return NVR(client, self.loop)
+        self.nvr_index += 1
+        return NVR(client, self.loop, self.nvr_index)
 
     def __str__(self) -> str:
         if not self.name:

backend/nvr_core.py

@@ -19,18 +19,22 @@ def date_today(begin = True):
         return datetime.now().strftime("%Y-%m-%d 23:59:59")
 
 class NVR:
-    def __init__(self, client, loop) -> None:
+    def __init__(self, client, loop, index = 0) -> None:
         self.logger = create_logger(NVR.__name__)
         self.client:DVRIPCam = client
         self.loop = loop
+        self.index = index
 
     async def login(self):
+        self.logger.debug(f"[{self.index}] Login to {self.client}")
         await self.client.login(self.loop)
 
     def logout(self):
+        self.logger.debug(f"[{self.index}] Logout to {self.client}")
         self.client.close()
 
     async def channels(self):
+        self.logger.debug(f"[{self.index}] Get channels")
         return await self.client.get_command("ChannelTitle", 1048)
 
     async def files(self, channel, start = None, end = None, ftype = H264, stype = SECONDARY_STREAM, json = False):
@@ -38,7 +42,7 @@ class NVR:
             start = date_today()
         if not end:
             end = date_today(False)
-        self.logger.info(f"Search files from {start} to {end}")
+        self.logger.info(f"[{self.index}] Search files from {start} to {end}")
         for raw_file in await list_local_files(self.client, startTime=start, endTime=end, filetype=ftype, channel=channel, streamType=stype):
             if json:
                 yield NvrFile(raw_file, channel, stype).json
@@ -47,13 +51,13 @@ class NVR:
 
     async def stream_file(self, file: NvrFile) -> bytes:
         len_data = await file.generate_first_bytes(self.client)
-        self.logger.debug(f"len data = {len_data}")
+        self.logger.debug(f"[{self.index}] len data = {len_data}, streaming file content")
         if (len_data is None):
             yield b""
         else:
             async for chunk in file.get_file_stream(self.client, len_data):
                 if (chunk == None):
-                    self.logger.debug("end of file")
+                    self.logger.debug(f"[{self.index}] end of file")
                     break
                 yield chunk
 
@@ -63,4 +67,4 @@ class NVR:
             async for byte in file.generate_bytes(self.client):
                 f.write(byte)
                 downloaded_bytes += len(byte)
-                self.logger.debug(f"\r{downloaded_bytes}/{file.size}")
+                self.logger.debug(f"\r [{self.index}] Downloaded: {downloaded_bytes}/{file.size}")

frontend/ang_dvrip/src/app/components/history/history.component.css

@@ -9,3 +9,7 @@
 .raw {
   color: black;
 }
+
+.processing {
+  color: coral;
+}

frontend/ang_dvrip/src/app/components/history/history.component.html

@@ -38,7 +38,7 @@
     <ng-container matColumnDef="actions">
       <th mat-header-cell *matHeaderCellDef> Действия </th>
       <td mat-cell *matCellDef="let element">
-        <a style="padding-left: 4px; cursor: pointer" [class]="element.converted?'converted':'not-converted'" (click)="openTransCodeDialog(element.b64)"><mat-icon>{{element.converted?'cloud_done':'cloud_download'}}</mat-icon></a><!--<mat-icon>cloud_done</mat-icon>-->
+        <a style="padding-left: 4px; cursor: pointer" [class]="element.processing != null?'processing':element.converted?'converted':'not-converted'" (click)="openTransCodeDialog(element)"><mat-icon>{{element.converted?'cloud_done':'cloud_download'}}</mat-icon></a><!--<mat-icon>cloud_done</mat-icon>-->
         <a [href]="'api/dvrip/file/'+recorder_index+'?b64='+element.b64" [class]="'raw'"><mat-icon>attachment</mat-icon></a>
         </td>
     </ng-container>

frontend/ang_dvrip/src/app/components/history/history.component.ts

@@ -7,13 +7,7 @@ import {MatDatepickerInputEvent} from "@angular/material/datepicker";
 import {MatDialog} from "@angular/material/dialog";
 import {TranscodeModalComponent} from "../../modals/transcode-modal/transcode-modal.component";
 import {BaseUtils} from "../../utils/BaseUtils";
-
-export interface DVRFILE {
-  filename:string,
-  size:number,
-  b64:string,
-  converted:boolean
-}
+import DVRFILE from "../../entities/DVRFILE";
 
 @Component({
   selector: 'app-history',
@@ -63,7 +57,14 @@ export class HistoryComponent implements OnInit {
     this.getHistory();
   }
 
-  openTransCodeDialog(b64:string) {
-    const dialog = this.dialog.open(TranscodeModalComponent, {data:{b64:b64, recorder_index:this.route.snapshot.paramMap.get('recorderId')}});
+  openTransCodeDialog(dvrfile:DVRFILE) {
+    const dialog = this.dialog.open(TranscodeModalComponent, {data:{b64:dvrfile.b64, recorder_index:this.route.snapshot.paramMap.get('recorderId')}});
+    dialog.afterOpened().subscribe(() => dvrfile.processing = true);
+    dialog.afterClosed().subscribe((res:boolean) => {
+      dvrfile.converted = res;
+      if (res) {
+        dvrfile.processing = null;
+      }
+    });
   }
 }

frontend/ang_dvrip/src/app/entities/DVRFILE.ts

@@ -0,0 +1,7 @@
+export default interface DVRFILE {
+  filename:string,
+  size:number,
+  b64:string,
+  converted:boolean,
+  processing:boolean|null
+}

frontend/ang_dvrip/src/app/modals/transcode-modal/transcode-modal.component.ts

@@ -32,7 +32,7 @@ export class TranscodeModalComponent implements OnInit {
 
   close():void {
     clearInterval(this.interval);
-    this.dialogRef.close();
+    this.dialogRef.close(this.status.done);
   }
 
   getStatus() {