Add stream categorization: Recommended/Alternative with Main/Sub/Other subgroups
- Split discovered streams into Recommended (FFMPEG, ONVIF) and Alternative groups - Add Main/Sub/Other classification within Recommended based on resolution: - Main: streams with width >= 720px (after clustering analysis) - Sub: streams with width < 720px or lower cluster - Other: streams without resolution info - Implement smart auto-collapse based on selection mode: - Main selection: shows Recommended/Main, collapses rest - Sub selection: shows Recommended/Sub, collapses rest - Falls back to showing all if target category is empty - Add collapsible groups/subgroups with chevron toggles - User manual expand/collapse preserved until mode change - Add stream count badges to all group headers
This commit is contained in:
eduard256
@@ -4,19 +4,277 @@ export class StreamList {
|
||||
this.streams = [];
|
||||
this.onUseCallback = null;
|
||||
this.expandedIndex = null;
|
||||
// Track collapsed state for groups and subgroups
|
||||
this.collapsedGroups = new Set();
|
||||
this.collapsedSubgroups = new Set();
|
||||
// Selection mode: 'main' or 'sub'
|
||||
this.selectionMode = 'main';
|
||||
// Flag to apply smart defaults on first render after reset
|
||||
this.needsSmartDefaults = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set selection mode and apply smart defaults for collapsed state
|
||||
* Only resets collapsed state when mode actually changes
|
||||
*/
|
||||
setSelectionMode(mode) {
|
||||
if (this.selectionMode === mode) return;
|
||||
|
||||
this.selectionMode = mode;
|
||||
this.applySmartDefaults();
|
||||
}
|
||||
|
||||
/**
|
||||
* Apply smart collapsed defaults based on current selection mode and available streams
|
||||
*/
|
||||
applySmartDefaults() {
|
||||
// Get current stream classification
|
||||
const recommended = this.streams.filter(s => this.isRecommended(s));
|
||||
const { main, sub, other } = this.classifyRecommendedStreams(
|
||||
recommended.map((stream, i) => ({ stream, index: i }))
|
||||
);
|
||||
|
||||
// Reset all collapsed states
|
||||
this.collapsedGroups.clear();
|
||||
this.collapsedSubgroups.clear();
|
||||
|
||||
if (this.selectionMode === 'main') {
|
||||
// Main mode: show Main, collapse Sub/Other/Alternative
|
||||
if (main.length > 0) {
|
||||
// Has main streams - collapse everything except Main
|
||||
this.collapsedGroups.add('alternative');
|
||||
this.collapsedSubgroups.add('recommended-sub');
|
||||
this.collapsedSubgroups.add('recommended-other');
|
||||
}
|
||||
// If no main streams - leave everything open
|
||||
} else {
|
||||
// Sub mode: show Sub, collapse Main/Other/Alternative
|
||||
if (sub.length > 0) {
|
||||
// Has sub streams - collapse everything except Sub
|
||||
this.collapsedGroups.add('alternative');
|
||||
this.collapsedSubgroups.add('recommended-main');
|
||||
this.collapsedSubgroups.add('recommended-other');
|
||||
}
|
||||
// If no sub streams - leave everything open
|
||||
}
|
||||
}
|
||||
|
||||
// Stream types considered "recommended" (standard video streams)
|
||||
static RECOMMENDED_TYPES = ['FFMPEG', 'ONVIF'];
|
||||
|
||||
// Minimum width threshold for Main streams (HD quality)
|
||||
static MIN_MAIN_WIDTH = 720;
|
||||
|
||||
// Minimum gap between resolutions to split Main/Sub
|
||||
static MIN_GAP_FOR_SPLIT = 400;
|
||||
|
||||
isRecommended(stream) {
|
||||
return StreamList.RECOMMENDED_TYPES.includes(stream.type);
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse resolution string "1920x1080" to width number
|
||||
* Returns null if resolution is missing or invalid
|
||||
*/
|
||||
parseResolutionWidth(resolution) {
|
||||
if (!resolution) return null;
|
||||
const match = resolution.match(/^(\d+)x(\d+)$/);
|
||||
if (!match) return null;
|
||||
return parseInt(match[1], 10);
|
||||
}
|
||||
|
||||
/**
|
||||
* Classify recommended streams into Main/Sub/Other using clustering algorithm
|
||||
*
|
||||
* Algorithm:
|
||||
* 1. Streams with width >= 720 are candidates for Main
|
||||
* 2. Streams with width < 720 go to Sub
|
||||
* 3. Streams without resolution go to Other
|
||||
* 4. Among Main candidates, find max gap between sorted resolutions
|
||||
* 5. If gap > 400px, split into Main (higher) and Sub (lower)
|
||||
*/
|
||||
classifyRecommendedStreams(items) {
|
||||
const main = [];
|
||||
const sub = [];
|
||||
const other = [];
|
||||
|
||||
// First pass: separate by resolution availability and threshold
|
||||
const mainCandidates = []; // width >= 720
|
||||
|
||||
items.forEach(item => {
|
||||
const width = this.parseResolutionWidth(item.stream.resolution);
|
||||
|
||||
if (width === null) {
|
||||
other.push(item);
|
||||
} else if (width < StreamList.MIN_MAIN_WIDTH) {
|
||||
sub.push(item);
|
||||
} else {
|
||||
mainCandidates.push({ ...item, width });
|
||||
}
|
||||
});
|
||||
|
||||
// If no main candidates or only one, no need to cluster
|
||||
if (mainCandidates.length <= 1) {
|
||||
mainCandidates.forEach(item => main.push({ stream: item.stream, index: item.index }));
|
||||
return { main, sub, other };
|
||||
}
|
||||
|
||||
// Sort candidates by width descending
|
||||
mainCandidates.sort((a, b) => b.width - a.width);
|
||||
|
||||
// Find the largest gap between adjacent resolutions
|
||||
let maxGap = 0;
|
||||
let splitIndex = -1;
|
||||
|
||||
for (let i = 0; i < mainCandidates.length - 1; i++) {
|
||||
const gap = mainCandidates[i].width - mainCandidates[i + 1].width;
|
||||
if (gap > maxGap) {
|
||||
maxGap = gap;
|
||||
splitIndex = i;
|
||||
}
|
||||
}
|
||||
|
||||
// If max gap is significant, split into Main and Sub
|
||||
if (maxGap > StreamList.MIN_GAP_FOR_SPLIT && splitIndex >= 0) {
|
||||
mainCandidates.forEach((item, i) => {
|
||||
const cleanItem = { stream: item.stream, index: item.index };
|
||||
if (i <= splitIndex) {
|
||||
main.push(cleanItem);
|
||||
} else {
|
||||
sub.push(cleanItem);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
// All candidates stay in Main
|
||||
mainCandidates.forEach(item => {
|
||||
main.push({ stream: item.stream, index: item.index });
|
||||
});
|
||||
}
|
||||
|
||||
return { main, sub, other };
|
||||
}
|
||||
|
||||
render(streams, onUseCallback) {
|
||||
this.streams = streams;
|
||||
this.onUseCallback = onUseCallback;
|
||||
|
||||
// Render stream items
|
||||
this.listContainer.innerHTML = streams.map((stream, index) => this.renderItem(stream, index)).join('');
|
||||
// Apply smart defaults on first render after reset
|
||||
if (this.needsSmartDefaults && streams.length > 0) {
|
||||
this.needsSmartDefaults = false;
|
||||
this.applySmartDefaults();
|
||||
}
|
||||
|
||||
// Split streams into groups while preserving original indices
|
||||
const recommended = [];
|
||||
const alternative = [];
|
||||
|
||||
streams.forEach((stream, index) => {
|
||||
if (this.isRecommended(stream)) {
|
||||
recommended.push({ stream, index });
|
||||
} else {
|
||||
alternative.push({ stream, index });
|
||||
}
|
||||
});
|
||||
|
||||
// Render only non-empty groups
|
||||
let html = '';
|
||||
if (recommended.length > 0) {
|
||||
html += this.renderRecommendedGroup(recommended);
|
||||
}
|
||||
if (alternative.length > 0) {
|
||||
html += this.renderGroup('Alternative', alternative, 'alternative');
|
||||
}
|
||||
this.listContainer.innerHTML = html;
|
||||
|
||||
// Attach event listeners
|
||||
this.attachEventListeners();
|
||||
}
|
||||
|
||||
/**
|
||||
* Render Recommended group with Main/Sub/Other subgroups
|
||||
*/
|
||||
renderRecommendedGroup(items) {
|
||||
const { main, sub, other } = this.classifyRecommendedStreams(items);
|
||||
const totalCount = items.length;
|
||||
const isCollapsed = this.collapsedGroups.has('recommended');
|
||||
|
||||
let subgroupsHtml = '';
|
||||
|
||||
if (main.length > 0) {
|
||||
subgroupsHtml += this.renderSubgroup('Main', main, 'recommended');
|
||||
}
|
||||
if (sub.length > 0) {
|
||||
subgroupsHtml += this.renderSubgroup('Sub', sub, 'recommended');
|
||||
}
|
||||
if (other.length > 0) {
|
||||
subgroupsHtml += this.renderSubgroup('Other', other, 'recommended');
|
||||
}
|
||||
|
||||
return `
|
||||
<div class="stream-group stream-group-recommended ${isCollapsed ? 'collapsed' : ''}">
|
||||
<div class="stream-group-header" data-group="recommended">
|
||||
<button class="stream-group-toggle" aria-label="Toggle group">
|
||||
<svg width="12" height="12" viewBox="0 0 12 12" fill="none" class="chevron">
|
||||
<path d="M3 4.5l3 3 3-3" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
|
||||
</svg>
|
||||
</button>
|
||||
<span class="stream-group-title">Recommended</span>
|
||||
<span class="stream-group-count">(${totalCount})</span>
|
||||
</div>
|
||||
<div class="stream-group-content">
|
||||
${subgroupsHtml}
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Render a subgroup (Main/Sub/Other) within Recommended
|
||||
*/
|
||||
renderSubgroup(title, items, parentGroup) {
|
||||
const subgroupKey = `${parentGroup}-${title.toLowerCase()}`;
|
||||
const isCollapsed = this.collapsedSubgroups.has(subgroupKey);
|
||||
|
||||
return `
|
||||
<div class="stream-subgroup ${isCollapsed ? 'collapsed' : ''}" data-subgroup="${subgroupKey}">
|
||||
<div class="stream-subgroup-header" data-subgroup="${subgroupKey}">
|
||||
<button class="stream-subgroup-toggle" aria-label="Toggle subgroup">
|
||||
<svg width="10" height="10" viewBox="0 0 10 10" fill="none" class="chevron">
|
||||
<path d="M2.5 3.75l2.5 2.5 2.5-2.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
|
||||
</svg>
|
||||
</button>
|
||||
<span class="stream-subgroup-title">${title}</span>
|
||||
<span class="stream-subgroup-count">(${items.length})</span>
|
||||
</div>
|
||||
<div class="stream-subgroup-content">
|
||||
${items.map(({ stream, index }) => this.renderItem(stream, index)).join('')}
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
renderGroup(title, items, groupClass) {
|
||||
const count = items.length;
|
||||
const isCollapsed = this.collapsedGroups.has(groupClass);
|
||||
|
||||
return `
|
||||
<div class="stream-group stream-group-${groupClass} ${isCollapsed ? 'collapsed' : ''}">
|
||||
<div class="stream-group-header" data-group="${groupClass}">
|
||||
<button class="stream-group-toggle" aria-label="Toggle group">
|
||||
<svg width="12" height="12" viewBox="0 0 12 12" fill="none" class="chevron">
|
||||
<path d="M3 4.5l3 3 3-3" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
|
||||
</svg>
|
||||
</button>
|
||||
<span class="stream-group-title">${title}</span>
|
||||
<span class="stream-group-count">(${count})</span>
|
||||
</div>
|
||||
<div class="stream-group-content">
|
||||
${items.map(({ stream, index }) => this.renderItem(stream, index)).join('')}
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
renderItem(stream, index) {
|
||||
const icon = this.getStreamIcon(stream.type);
|
||||
const isExpanded = this.expandedIndex === index;
|
||||
@@ -225,7 +483,28 @@ export class StreamList {
|
||||
}
|
||||
|
||||
attachEventListeners() {
|
||||
// Click on header to toggle
|
||||
// Group header toggle (Recommended, Alternative)
|
||||
this.listContainer.querySelectorAll('.stream-group-header').forEach(header => {
|
||||
header.addEventListener('click', (e) => {
|
||||
const groupKey = header.dataset.group;
|
||||
if (groupKey) {
|
||||
this.toggleGroup(groupKey);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// Subgroup header toggle (Main, Sub, Other)
|
||||
this.listContainer.querySelectorAll('.stream-subgroup-header').forEach(header => {
|
||||
header.addEventListener('click', (e) => {
|
||||
e.stopPropagation(); // Don't bubble to group header
|
||||
const subgroupKey = header.dataset.subgroup;
|
||||
if (subgroupKey) {
|
||||
this.toggleSubgroup(subgroupKey);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// Click on stream item header to toggle details
|
||||
this.listContainer.querySelectorAll('.stream-item-header').forEach(header => {
|
||||
header.addEventListener('click', (e) => {
|
||||
// Don't toggle if clicking "Use Stream" button
|
||||
@@ -250,6 +529,24 @@ export class StreamList {
|
||||
});
|
||||
}
|
||||
|
||||
toggleGroup(groupKey) {
|
||||
if (this.collapsedGroups.has(groupKey)) {
|
||||
this.collapsedGroups.delete(groupKey);
|
||||
} else {
|
||||
this.collapsedGroups.add(groupKey);
|
||||
}
|
||||
this.render(this.streams, this.onUseCallback);
|
||||
}
|
||||
|
||||
toggleSubgroup(subgroupKey) {
|
||||
if (this.collapsedSubgroups.has(subgroupKey)) {
|
||||
this.collapsedSubgroups.delete(subgroupKey);
|
||||
} else {
|
||||
this.collapsedSubgroups.add(subgroupKey);
|
||||
}
|
||||
this.render(this.streams, this.onUseCallback);
|
||||
}
|
||||
|
||||
toggleExpand(index) {
|
||||
if (this.expandedIndex === index) {
|
||||
// Collapse if already expanded
|
||||
|
||||
Reference in New Issue
Block a user