Skip to content

Allow uploading multiple files #11687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 4 commits into from
Feb 14, 2022
Merged

Allow uploading multiple files #11687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a91977a
Allow uploading multiple files
balloob Feb 14, 2022
4c8bc58
Highlight upload button when no items
balloob Feb 14, 2022
e0e6ac5
Show spinner when uploading
balloob Feb 14, 2022
c117c68
Simplify for loop
balloob Feb 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 29 additions & 24 deletions src/components/media-player/ha-media-player-browse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import "@material/mwc-button/mwc-button";
import "@material/mwc-list/mwc-list";
import "@material/mwc-list/mwc-list-item";
import { mdiPlay, mdiPlus } from "@mdi/js";
import { mdiArrowUpRight, mdiPlay, mdiPlus } from "@mdi/js";
import "@polymer/paper-tooltip/paper-tooltip";
import {
css,
Expand Down Expand Up @@ -258,32 +258,25 @@ export class HaMediaPlayerBrowse extends LitElement {
: !currentItem.children?.length
? html`
<div class="container no-items">
${this.hass.localize(
"ui.components.media-browser.no_items"
)}
<br />
${currentItem.media_content_id ===
"media-source://media_source/local/."
? html`<br />${this.hass.localize(
"ui.components.media-browser.learn_adding_local_media",
"documentation",
html`<a
href=${documentationUrl(
this.hass,
"/more-info/local-media/add-media"
? html`
<div class="highlight-add-button">
<span>
<ha-svg-icon
.path=${mdiArrowUpRight}
></ha-svg-icon>
</span>
<span>
${this.hass.localize(
"ui.components.media-browser.file_management.highlight_button"
)}
target="_blank"
rel="noreferrer"
>${this.hass.localize(
"ui.components.media-browser.documentation"
)}</a
>`
)}
<br />
${this.hass.localize(
"ui.components.media-browser.local_media_files"
)}`
: ""}
</span>
</div>
`
: this.hass.localize(
"ui.components.media-browser.no_items"
)}
</div>
`
: childrenMediaClass.layout === "grid"
Expand Down Expand Up @@ -744,6 +737,18 @@ export class HaMediaPlayerBrowse extends LitElement {
padding-left: 32px;
}

.highlight-add-button {
display: flex;
flex-direction: row-reverse;
margin-right: 48px;
}

.highlight-add-button ha-svg-icon {
position: relative;
top: -0.5em;
margin-left: 8px;
}

.content {
overflow-y: auto;
box-sizing: border-box;
Expand Down
94 changes: 69 additions & 25 deletions src/panels/media-browser/ha-panel-media-browser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { LocalStorage } from "../../common/decorators/local-storage";
import { fireEvent, HASSDomEvent } from "../../common/dom/fire_event";
import { navigate } from "../../common/navigate";
import "../../components/ha-menu-button";
import "../../components/ha-circular-progress";
import "../../components/ha-icon-button";
import "../../components/ha-svg-icon";
import "../../components/media-player/ha-media-player-browse";
Expand Down Expand Up @@ -54,6 +55,8 @@ class PanelMediaBrowser extends LitElement {

@state() _currentItem?: MediaPlayerItem;

@state() _uploading = 0;

private _navigateIds: MediaPlayerItemId[] = [
{
media_content_id: undefined,
Expand Down Expand Up @@ -97,12 +100,34 @@ class PanelMediaBrowser extends LitElement {
)
? html`
<mwc-button
.label=${this.hass.localize(
"ui.components.media-browser.file_management.add_media"
)}
.label=${this._uploading > 0
? this.hass.localize(
"ui.components.media-browser.file_management.uploading",
{
count: this._uploading,
}
)
: this.hass.localize(
"ui.components.media-browser.file_management.add_media"
)}
.disabled=${this._uploading > 0}
@click=${this._startUpload}
>
<ha-svg-icon .path=${mdiUpload} slot="icon"></ha-svg-icon>
${this._uploading > 0
? html`
<ha-circular-progress
size="tiny"
active
alt=""
slot="icon"
></ha-circular-progress>
`
: html`
<ha-svg-icon
.path=${mdiUpload}
slot="icon"
></ha-svg-icon>
`}
</mwc-button>
`
: ""}
Expand Down Expand Up @@ -240,36 +265,54 @@ class PanelMediaBrowser extends LitElement {
}

private async _startUpload() {
if (this._uploading > 0) {
return;
}
const input = document.createElement("input");
input.type = "file";
input.accept = "audio/*,video/*,image/*";
input.addEventListener("change", async () => {
try {
await uploadLocalMedia(
this.hass,
this._currentItem!.media_content_id!,
input.files![0]
);
} catch (err: any) {
showAlertDialog(this, {
text: this.hass.localize(
"ui.components.media-browser.file_management.upload_failed",
{
reason: err.message || err,
}
),
});
return;
}
await this._browser.refresh();
});
input.multiple = true;
input.addEventListener(
"change",
async () => {
const files = input.files!;
const target = this._currentItem!.media_content_id!;

for (let i = 0; i < files.length; i++) {
this._uploading = files.length - i;
try {
// eslint-disable-next-line no-await-in-loop
await uploadLocalMedia(this.hass, target, files[i]);
} catch (err: any) {
showAlertDialog(this, {
text: this.hass.localize(
"ui.components.media-browser.file_management.upload_failed",
{
reason: err.message || err,
}
),
});
break;
}
}
this._uploading = 0;
await this._browser.refresh();
},
{ once: true }
);
input.click();
}

static get styles(): CSSResultGroup {
return [
haStyle,
css`
app-toolbar mwc-button {
--mdc-theme-primary: var(--app-header-text-color);
/* We use icon + text to show disabled state */
--mdc-button-disabled-ink-color: var(--app-header-text-color);
}

ha-media-player-browse {
height: calc(100vh - (100px + var(--header-height)));
}
Expand All @@ -285,7 +328,8 @@ class PanelMediaBrowser extends LitElement {
right: 0;
}

ha-svg-icon[slot="icon"] {
ha-svg-icon[slot="icon"],
ha-circular-progress[slot="icon"] {
vertical-align: middle;
}
`,
Expand Down
4 changes: 3 additions & 1 deletion src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,8 +525,10 @@
"no_media_folder": "It looks like you have not yet created a media directory.",
"setup_local_help": "Check the {documentation} on how to setup local media.",
"file_management": {
"highlight_button": "Click here to upload your first media",
"upload_failed": "Upload failed: {reason}",
"add_media": "Add Media"
"add_media": "Add Media",
"uploading": "Uploading {count} {count, plural,\n one {file}\n other {files}\n}"
},
"class": {
"album": "Album",
Expand Down