Bertomlab/HA-Web-Screensaver
1
0
Fork 0
mirror of https://github.com/jorisbertomeu/web-screensaver.git synced 2026-04-19 16:27:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add collection ID from HA feat

Browse Source
This commit is contained in:
Joris Bertomeu
2024-11-19 17:11:05 +01:00
parent e8d68d0b7e
commit ca5f121d35
3 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
api/src/controllers/PhotoController.js
View File

@@ -1,3 +1,5 @@
import fetch from "node-fetch";
export class PhotoController {
constructor(db, photoService) {
this.db = db;
@@ -13,12 +15,27 @@ export class PhotoController {
return res.status(400).json({ error: 'Invalid settings' });
}
let collections = settings.unsplash.collectionsId;
let collections = settings.unsplash?.HACollectionsId;
if (collections && collections.length > 0) {
const resp = await fetch(`${settings.hass.endpoint}/api/states/${collections}`, {
headers: {
Authorization: `Bearer ${settings.hass.token}`
}
});
const data = await resp?.json();
collections = data.state;
if (collections.includes(',')) {
collections = collections.split(',');
}
} else {
collections = settings.unsplash.collectionsId;
}
if (collections) {
collections = Array.isArray(collections) ? collections : [collections];
}
const photo = await this.photoService.pickPictureFromFile(collections, false, settings.unsplash);
const photo = await this.photoService.pickPictureFromFile(collections, true, settings.unsplash);
if (!photo) {
return res.status(500).json({ error: 'Failed to fetch photo' });

8
src/app/pages/admin/admin.component.html
View File

@@ -55,6 +55,14 @@
<span class="input-group-text"><i class="fa fa-layer-group"></i></span>
<input [(ngModel)]="settings.unsplash.collectionsId" type="text" class="form-control" placeholder="ex: 1806988,1427155">
</div>
<label class="form-label">Unsplash Collections ID from HA Entity</label>
<div class="input-group mb-3">
<span class="input-group-text"><i class="fa fa-layer-group"></i></span>
<input [(ngModel)]="settings.unsplash.HACollectionsId" type="text" class="form-control" placeholder="ex: input_text.unsplash_collections">
</div>
<div class="alert alert-primary">
You can <b>specify a Home Assistant entity</b> that contains the Unsplash Collections ID. This way you can <b>change the collections directly</b> from Home Assistant.<br>For example, you can use an <b>input_text entity</b> with the collections ID as the value separated by commas.<br><br>If you use this option, the collections ID field <b>will be ignored</b>.
</div>
</ng-container>
<button [disabled]="isSaving" (click)="saveSettings()" class="btn btn-primary float-end"><i class="fa fa-save me-2"></i>Save</button>
</div>

6
src/app/pages/admin/admin.component.ts
View File

@@ -19,7 +19,8 @@ export class AdminComponent implements OnInit {
enabled: false,
accessKey: '',
secretKey: '',
collectionsId: ''
collectionsId: '',
HACollectionsId: ''
},
hass: {
endpoint: '',
@@ -49,7 +50,8 @@ export class AdminComponent implements OnInit {
enabled: respJson?.unsplash?.enabled || false,
accessKey: respJson?.unsplash?.accessKey || '',
secretKey: respJson?.unsplash?.secretKey || '',
collectionsId: respJson?.unsplash?.collectionsId ? respJson?.unsplash?.collectionsId.join(',') : ''
collectionsId: respJson?.unsplash?.collectionsId ? respJson?.unsplash?.collectionsId.join(',') : '',
HACollectionsId: respJson?.unsplash?.HACollectionsId || ''
},
hass: {
endpoint: respJson?.hass?.endpoint || '',