From 4fd9341cea577a2d7f689dff963a3816eeb44298 Mon Sep 17 00:00:00 2001 From: Brandon Watson Date: Tue, 28 Dec 2021 18:03:51 -0500 Subject: [PATCH] Update files --- .../{ControlUnit.ts => controlUnit.ts} | 12 +++++------ .../{DeviceButton.ts => deviceButton.ts} | 6 +++--- src/Accessories/{Sequence.ts => sequence.ts} | 8 ++++---- ...DataProvider.ts => harmonyDataProvider.ts} | 18 ++++++++--------- src/DataProviders/harmonyDataProvider2.ts | 10 +++++----- src/DataProviders/stateDataProvider.ts | 4 ++-- src/Models/HarmonyDevice.ts | 2 +- src/Models/activityState.ts | 2 +- src/Services/activityService.ts | 10 +++++----- src/Services/commandService.ts | 10 +++++----- src/Services/volumeService.ts | 8 ++++---- src/Util/{Callbackify.ts => callbackify.ts} | 0 src/platform.ts | 20 +++++++++---------- 13 files changed, 55 insertions(+), 55 deletions(-) rename src/Accessories/{ControlUnit.ts => controlUnit.ts} (95%) rename src/Accessories/{DeviceButton.ts => deviceButton.ts} (95%) rename src/Accessories/{Sequence.ts => sequence.ts} (93%) rename src/DataProviders/{HarmonyDataProvider.ts => harmonyDataProvider.ts} (96%) rename src/Util/{Callbackify.ts => callbackify.ts} (100%) diff --git a/src/Accessories/ControlUnit.ts b/src/Accessories/controlUnit.ts similarity index 95% rename from src/Accessories/ControlUnit.ts rename to src/Accessories/controlUnit.ts index 9dba6ac..4c69b33 100644 --- a/src/Accessories/ControlUnit.ts +++ b/src/Accessories/controlUnit.ts @@ -1,11 +1,11 @@ import { PlatformAccessory, RemoteController, Service } from "homebridge"; -import HarmonyDataProvider from "../DataProviders/harmonyDataProvider"; -import { IActivity } from "../Models/Config"; +import HarmonyDataProvider from "../dataProviders/harmonyDataProvider"; +import { IActivity } from "../models/config"; import { Platform } from "../platform"; -import { ActivityService } from "../Services/activityService"; -import { CommandService } from "../Services/commandService"; -import { VolumeService } from "../Services/volumeService"; -import callbackify from "../Util/callbackify"; +import { ActivityService } from "../services/activityService"; +import { CommandService } from "../services/commandService"; +import { VolumeService } from "../services/volumeService"; +import callbackify from "../util/callbackify"; /** * Enum describing remote key presses from homebridge. diff --git a/src/Accessories/DeviceButton.ts b/src/Accessories/deviceButton.ts similarity index 95% rename from src/Accessories/DeviceButton.ts rename to src/Accessories/deviceButton.ts index bbd7171..1c363d2 100644 --- a/src/Accessories/DeviceButton.ts +++ b/src/Accessories/deviceButton.ts @@ -1,7 +1,7 @@ import { PlatformAccessory, Service } from "homebridge"; -import HarmonyDataProvider from "../DataProviders/harmonyDataProvider"; -import { IDeviceButton } from "../Models/Config"; -import { HarmonyDevice } from "../Models/harmonyDevice"; +import HarmonyDataProvider from "../dataProviders/harmonyDataProvider"; +import { IDeviceButton } from "../models/config"; +import { HarmonyDevice } from "../models/harmonyDevice"; import { Platform } from "../platform"; export class DeviceButton { diff --git a/src/Accessories/Sequence.ts b/src/Accessories/sequence.ts similarity index 93% rename from src/Accessories/Sequence.ts rename to src/Accessories/sequence.ts index c7b391d..7b05620 100644 --- a/src/Accessories/Sequence.ts +++ b/src/Accessories/sequence.ts @@ -5,11 +5,11 @@ import { PlatformAccessory, Service, } from "homebridge"; -import HarmonyDataProvider from "../DataProviders/harmonyDataProvider"; -import { ISequence } from "../Models/Config/sequence"; -import { HarmonyDevice } from "../Models/harmonyDevice"; +import HarmonyDataProvider from "../dataProviders/harmonyDataProvider"; +import { ISequence } from "../models/config/sequence"; +import { HarmonyDevice } from "../models/harmonyDevice"; import { Platform } from "../platform"; -import { sleep } from "../Util"; +import { sleep } from "../util"; export class Sequence { private _devices: { [deviceName: string]: HarmonyDevice }; diff --git a/src/DataProviders/HarmonyDataProvider.ts b/src/DataProviders/harmonyDataProvider.ts similarity index 96% rename from src/DataProviders/HarmonyDataProvider.ts rename to src/DataProviders/harmonyDataProvider.ts index 2dbdd55..63ff8ac 100644 --- a/src/DataProviders/HarmonyDataProvider.ts +++ b/src/DataProviders/harmonyDataProvider.ts @@ -1,13 +1,13 @@ -import { IActivity } from "../Models/Config/activity"; -import { IDeviceSetupItem } from "../Models/Config/deviceSetupItem"; -import { IInput, IMatrix, IOutput } from "../Models/Config/matrix"; -import { RemoteKey } from "../Accessories/controlUnit"; +import { IActivity } from "../models/config/activity"; +import { IDeviceSetupItem } from "../models/config/deviceSetupItem"; +import { IInput, IMatrix, IOutput } from "../models/config/matrix"; +import { RemoteKey } from "../accessories/controlUnit"; import { EventEmitter } from "events"; -import { IHub } from "../Models/Config/hub"; -import { IDeviceConfig } from "../Models/Config/deviceConfig"; -import { HarmonyDevice } from "../Models/harmonyDevice"; -import { HarmonyHub } from "../Models/harmonyHub"; -import { IConfig } from "../Models/Config"; +import { IHub } from "../models/config/hub"; +import { IDeviceConfig } from "../models/config/deviceConfig"; +import { HarmonyDevice } from "../models/harmonyDevice"; +import { HarmonyHub } from "../models/harmonyHub"; +import { IConfig } from "../models/config"; import { inject, injectable } from "tsyringe"; import { Logger, Logging } from "homebridge"; diff --git a/src/DataProviders/harmonyDataProvider2.ts b/src/DataProviders/harmonyDataProvider2.ts index 5defa49..c6705cf 100644 --- a/src/DataProviders/harmonyDataProvider2.ts +++ b/src/DataProviders/harmonyDataProvider2.ts @@ -1,10 +1,10 @@ import { Logging } from "homebridge"; import { inject } from "tsyringe"; -import { IConfig, IMatrix } from "../Models/Config"; -import { IDeviceConfig } from "../Models/Config/deviceConfig"; -import { IHub } from "../Models/Config/hub"; -import { HarmonyDevice } from "../Models/harmonyDevice"; -import { HarmonyHub } from "../Models/harmonyHub"; +import { IConfig, IMatrix } from "../models/config"; +import { IDeviceConfig } from "../models/config/deviceConfig"; +import { IHub } from "../models/config/hub"; +import { HarmonyDevice } from "../models/harmonyDevice"; +import { HarmonyHub } from "../models/harmonyHub"; export class HarmonyDataProvider2 { private _matrix: IMatrix; diff --git a/src/DataProviders/stateDataProvider.ts b/src/DataProviders/stateDataProvider.ts index 0e9bc13..e00860b 100644 --- a/src/DataProviders/stateDataProvider.ts +++ b/src/DataProviders/stateDataProvider.ts @@ -1,6 +1,6 @@ import { inject, injectable } from "tsyringe"; -import { IActivityState } from "../Models/activityState"; -import { IActivity } from "../Models/Config"; +import { IActivityState } from "../models/activityState"; +import { IActivity } from "../models/config"; @injectable() export class StateDataProvider { diff --git a/src/Models/HarmonyDevice.ts b/src/Models/HarmonyDevice.ts index 7fed46d..1b6c394 100644 --- a/src/Models/HarmonyDevice.ts +++ b/src/Models/HarmonyDevice.ts @@ -1,5 +1,5 @@ import { ICommand } from "./device"; -import { sleep } from "../Util/sleep"; +import { sleep } from "../util/sleep"; export interface IHarmonyDeviceProps { id: string; diff --git a/src/Models/activityState.ts b/src/Models/activityState.ts index 4887ea1..96db22e 100644 --- a/src/Models/activityState.ts +++ b/src/Models/activityState.ts @@ -1,4 +1,4 @@ -import { IActivity } from "./Config"; +import { IActivity } from "./config"; export interface IActivityState { currentActivity: IActivity; diff --git a/src/Services/activityService.ts b/src/Services/activityService.ts index afb50ea..adf6910 100644 --- a/src/Services/activityService.ts +++ b/src/Services/activityService.ts @@ -1,16 +1,16 @@ import { Logging } from "homebridge"; import { inject, injectable } from "tsyringe"; -import { HarmonyDataProvider2 } from "../DataProviders/harmonyDataProvider2"; -import { StateDataProvider } from "../DataProviders/stateDataProvider"; -import { IActivityState } from "../Models/activityState"; +import { HarmonyDataProvider2 } from "../dataProviders/harmonyDataProvider2"; +import { StateDataProvider } from "../dataProviders/stateDataProvider"; +import { IActivityState } from "../models/activityState"; import { IActivity, IConfig, IDeviceSetupItem, IInput, IOutput, -} from "../Models/Config"; -import { HarmonyDevice } from "../Models/harmonyDevice"; +} from "../models/config"; +import { HarmonyDevice } from "../models/harmonyDevice"; @injectable() export class ActivityService { diff --git a/src/Services/commandService.ts b/src/Services/commandService.ts index 183d4f4..d1fc2fd 100644 --- a/src/Services/commandService.ts +++ b/src/Services/commandService.ts @@ -1,9 +1,9 @@ import { inject } from "tsyringe"; -import { RemoteKey } from "../Accessories/controlUnit"; -import { HarmonyDataProvider2 } from "../DataProviders/harmonyDataProvider2"; -import { StateDataProvider } from "../DataProviders/stateDataProvider"; -import { IConfig } from "../Models/Config"; -import { HarmonyDevice } from "../Models/harmonyDevice"; +import { RemoteKey } from "../accessories/controlUnit"; +import { HarmonyDataProvider2 } from "../dataProviders/harmonyDataProvider2"; +import { StateDataProvider } from "../dataProviders/stateDataProvider"; +import { IConfig } from "../models/config"; +import { HarmonyDevice } from "../models/harmonyDevice"; export class CommandService { constructor( diff --git a/src/Services/volumeService.ts b/src/Services/volumeService.ts index 8b66b2f..917d404 100644 --- a/src/Services/volumeService.ts +++ b/src/Services/volumeService.ts @@ -1,9 +1,9 @@ import { Logging } from "homebridge"; import { inject } from "tsyringe"; -import { HarmonyDataProvider2 } from "../DataProviders/harmonyDataProvider2"; -import { StateDataProvider } from "../DataProviders/stateDataProvider"; -import { IConfig } from "../Models/Config"; -import { HarmonyDevice } from "../Models/harmonyDevice"; +import { HarmonyDataProvider2 } from "../dataProviders/harmonyDataProvider2"; +import { StateDataProvider } from "../dataProviders/stateDataProvider"; +import { IConfig } from "../models/config"; +import { HarmonyDevice } from "../models/harmonyDevice"; export class VolumeService { constructor( diff --git a/src/Util/Callbackify.ts b/src/Util/callbackify.ts similarity index 100% rename from src/Util/Callbackify.ts rename to src/Util/callbackify.ts diff --git a/src/platform.ts b/src/platform.ts index a747284..52e3942 100644 --- a/src/platform.ts +++ b/src/platform.ts @@ -8,18 +8,18 @@ import { PlatformConfig, Service, } from "homebridge"; -import { ControlUnit, DeviceButton } from "./Accessories"; -import { Sequence } from "./Accessories/sequence"; -import HarmonyDataProvider from "./DataProviders/harmonyDataProvider"; -import { IConfig, IControlUnit, IDeviceButton } from "./Models/Config"; -import { ISequence } from "./Models/Config/sequence"; +import { ControlUnit, DeviceButton } from "./accessories"; +import { Sequence } from "./accessories/sequence"; +import HarmonyDataProvider from "./dataProviders/harmonyDataProvider"; +import { IConfig, IControlUnit, IDeviceButton } from "./models/config"; +import { ISequence } from "./models/config/sequence"; import { PLATFORM_NAME, PLUGIN_NAME } from "./settings"; import { container } from "tsyringe"; -import { HarmonyDataProvider2 } from "./DataProviders/harmonyDataProvider2"; -import { StateDataProvider } from "./DataProviders/stateDataProvider"; -import { CommandService } from "./Services/commandService"; -import { ActivityService } from "./Services/activityService"; -import { VolumeService } from "./Services/volumeService"; +import { HarmonyDataProvider2 } from "./dataProviders/harmonyDataProvider2"; +import { StateDataProvider } from "./dataProviders/stateDataProvider"; +import { CommandService } from "./services/commandService"; +import { ActivityService } from "./services/activityService"; +import { VolumeService } from "./services/volumeService"; export class Platform implements DynamicPlatformPlugin { constructor(