Merge pull request #202 from jessedp/cron

Make autoRebuild more useful fixes #48
jessedp · Apr 25, 2023 · 649fc3c · 649fc3c
2 parents 99e36b5 + 9ce4119
commit 649fc3c
Show file tree

Hide file tree

Showing 16 changed files with 193 additions and 148 deletions.
diff --git a/@types/global.d.ts b/@types/global.d.ts
@@ -9,7 +9,7 @@ declare var navigator: Navigator;
 
 declare var discoveredDevices: Array<any>;
 
-declare var CONNECTED: boolean;
+declare var isConnected: boolean;
 
 declare var EXPORTING: boolean;
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -281,6 +281,7 @@
     "check-disk-space": "^3.3.1",
     "compare-versions": "^5.0.3",
     "connected-react-router": "^6.9.2",
+    "croner": "^6.0.3",
     "date-fns": "^2.8.1",
     "debug": "^4.3.4",
     "deep-object-diff": "^1.1.9",

diff --git a/src/main/pre_Tablo.ts b/src/main/pre_Tablo.ts
@@ -58,11 +58,11 @@ ipcMain.on('tablo-setCurrentDevice', async (event: any, device: any) => {
   }
 });
 
-ipcMain.on('tablo-CONNECTED', async (event: any) => {
+ipcMain.on('tablo-isConnected', async (event: any) => {
   try {
-    event.returnValue = global.CONNECTED;
+    event.returnValue = global.isConnected;
   } catch (e) {
-    console.error('tablo-CONNECTED', e);
+    console.error('tablo-isConnected', e);
     event.returnValue = false;
   }
 });

diff --git a/src/main/preload.ts b/src/main/preload.ts
@@ -107,7 +107,7 @@ contextBridge.exposeInMainWorld('Tablo', {
   checkConnection: () => ipcRenderer.sendSync('tablo-checkConnection'),
   comskipAvailable: () => ipcRenderer.sendSync('tablo-comskipAvailable'),
   hasDevice: () => ipcRenderer.sendSync('tablo-has-device'),
-  CONNECTED: () => ipcRenderer.sendSync('tablo-CONNECTED'),
+  isConnected: () => ipcRenderer.sendSync('tablo-isConnected'),
   device: () => ipcRenderer.sendSync('tablo-device'),
   discoveredDevices: () => ipcRenderer.sendSync('tablo-discoveredDevices'),
   getRecordingsCount: () => ipcRenderer.sendSync('tablo-getRecordingsCount'),

diff --git a/src/main/utils/Tablo.ts b/src/main/utils/Tablo.ts
@@ -156,7 +156,7 @@ export async function checkConnection(): Promise<boolean> {
 
   return new Promise((resolve) => {
     client.on('close', () => {
-      global.CONNECTED = status;
+      global.isConnected = status;
       resolve(status);
     });
   });
@@ -165,7 +165,7 @@ export async function checkConnection(): Promise<boolean> {
 export const comskipAvailable = (): boolean => {
   const currentDevice: any = store.get('CurrentDevice');
 
-  if (!global.CONNECTED) return false;
+  if (!global.isConnected) return false;
   if (!currentDevice.server_version) return false;
   const testVersion = currentDevice.server_version.match(/[\d.]*/)[0];
   const supportedVersion = '2.2.26';
@@ -191,7 +191,7 @@ export const comskipAvailable = (): boolean => {
 export async function setupApi(): Promise<void> {
   debug('Calling setupApi');
   globalThis.Api = new Tablo();
-  global.CONNECTED = false;
+  global.isConnected = false;
   debug('Calling discover');
   await discover();
   debug('Discover finished');

diff --git a/src/renderer/components/Build.tsx b/src/renderer/components/Build.tsx
@@ -6,7 +6,7 @@ import { bindActionCreators } from 'redux';
 import { writeToFile } from '../utils/utils';
 import getConfig from '../utils/config';
 
-import { dbCreatedKey, recDbCreated } from '../utils/db';
+import { dbCreatedKey } from '../utils/db';
 
 import * as BuildActions from '../store/build';
 import { DbSliceState } from '../store/build';
@@ -49,35 +49,9 @@ class Build extends Component<BuildProps, State> {
     this.build = this.build.bind(this);
   }
 
-  async componentDidMount() {
-    let created = recDbCreated();
-
-    // TODO: some const export?
-    if (!created) {
-      let i = 0;
-
-      const autoBuild = async () => {
-        created = recDbCreated();
-
-        if (!window.Tablo.device() && !created) {
-          if (i > 0) return;
-          i += 1;
-          setTimeout(autoBuild, 5000);
-        }
-
-        if (window.Tablo.device() && !created) this.build();
-      };
-
-      autoBuild();
-    }
-  }
-
   componentDidUpdate(prevProps: BuildProps) {
     const { progress } = this.props;
-    if (
-      prevProps.progress.loading !== progress.loading &&
-      progress.loading === STATE_START
-    ) {
+    if (progress.loading === STATE_START) {
       this.build();
     }
   }
@@ -88,17 +62,18 @@ class Build extends Component<BuildProps, State> {
     if (!window.Tablo.device()) return;
 
     if (this.building) {
-      console.log('trying to double build');
+      console.warn('trying to double build');
       return;
     }
+    this.building = true;
 
-    if (!window.Tablo.CONNECTED()) {
-      console.log('Not connected, not bulding...');
+    if (!window.Tablo.isConnected()) {
+      console.warn('Not connected, not bulding...');
       return;
     }
 
     if (global.EXPORTING) {
-      console.log('Exporting, not bulding...');
+      console.warn('Exporting, not building...');
       return;
     }
 

diff --git a/src/renderer/components/DbStats.tsx b/src/renderer/components/DbStats.tsx
@@ -35,7 +35,6 @@ export default class DbStats extends Component<Props, State> {
   }
 
   async refresh() {
-    // const { RecDb } = global;
     const recTotal = window.db.countAsync('RecDb', {});
 
     /** Watched * */