Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/tui/components/ItemsEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const ItemsEditor: React.FC<ItemsEditorProps> = ({ widgets, onUpdate, onB
const [customEditorWidget, setCustomEditorWidget] = useState<CustomEditorWidgetState | null>(null);
const [widgetPicker, setWidgetPicker] = useState<WidgetPickerState | null>(null);
const [showClearConfirm, setShowClearConfirm] = useState(false);
const separatorChars = ['|', '-', ',', ' '];
const separatorChars = ['|', '-', ',', ' ', '·'];

const widgetCatalog = getWidgetCatalog(settings);
const widgetCategories = ['All', ...getWidgetCatalogCategories(widgetCatalog)];
Expand Down
2 changes: 2 additions & 0 deletions src/utils/renderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,8 @@ function formatSeparator(sep: string): string {
return ', ';
} else if (sep === '-') {
return ' - ';
} else if (sep === '·') {
return '·';
}
return sep;
}
Expand Down
1 change: 1 addition & 0 deletions src/utils/usage-prefetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { fetchUsageData } from './usage';
const USAGE_WIDGET_TYPES = new Set<string>([
'session-usage',
'weekly-usage',
'weekly-usage-projected',
'block-timer',
'reset-timer',
'weekly-reset-timer'
Expand Down
1 change: 1 addition & 0 deletions src/utils/widget-manifest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export const WIDGET_MANIFEST: WidgetManifestEntry[] = [
{ type: 'free-memory', create: () => new widgets.FreeMemoryWidget() },
{ type: 'session-usage', create: () => new widgets.SessionUsageWidget() },
{ type: 'weekly-usage', create: () => new widgets.WeeklyUsageWidget() },
{ type: 'weekly-usage-projected', create: () => new widgets.ProjectedWeeklyUsageWidget() },
{ type: 'reset-timer', create: () => new widgets.BlockResetTimerWidget() },
{ type: 'weekly-reset-timer', create: () => new widgets.WeeklyResetTimerWidget() },
{ type: 'context-bar', create: () => new widgets.ContextBarWidget() },
Expand Down
51 changes: 51 additions & 0 deletions src/widgets/ProjectedWeeklyUsage.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import type { RenderContext } from '../types/RenderContext';
import type { Settings } from '../types/Settings';
import type {
Widget,
WidgetEditorDisplay,
WidgetItem
} from '../types/Widget';
import {
getUsageErrorMessage,
getWeeklyUsageWindowFromResetAt
} from '../utils/usage-windows';

import { formatRawOrLabeledValue } from './shared/raw-or-labeled';

export class ProjectedWeeklyUsageWidget implements Widget {
getDefaultColor(): string { return 'yellow'; }
getDescription(): string { return 'Projects weekly usage percentage by end of 7-day window'; }
getDisplayName(): string { return 'Weekly Usage Projected'; }
getCategory(): string { return 'Usage'; }

getEditorDisplay(_item: WidgetItem): WidgetEditorDisplay {
return {
displayText: this.getDisplayName(),
modifierText: undefined
};
}

render(item: WidgetItem, context: RenderContext, _settings: Settings): string | null {
if (context.isPreview) {
return formatRawOrLabeledValue(item, 'Projected: ', '72%');
}

const data = context.usageData ?? {};
if (data.error)
return getUsageErrorMessage(data.error);
if (data.weeklyUsage === undefined)
return null;

const window = getWeeklyUsageWindowFromResetAt(data.weeklyResetAt);
if (!window || window.elapsedPercent < 1) {
return null;
}

const projected = data.weeklyUsage / (window.elapsedPercent / 100);

return formatRawOrLabeledValue(item, 'Projected: ', `${projected.toFixed(0)}%`);
}

supportsRawValue(): boolean { return true; }
supportsColors(_item: WidgetItem): boolean { return true; }
}
1 change: 1 addition & 0 deletions src/widgets/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export { FreeMemoryWidget } from './FreeMemory';
export { SessionNameWidget } from './SessionName';
export { SessionUsageWidget } from './SessionUsage';
export { WeeklyUsageWidget } from './WeeklyUsage';
export { ProjectedWeeklyUsageWidget } from './ProjectedWeeklyUsage';
export { BlockResetTimerWidget } from './BlockResetTimer';
export { WeeklyResetTimerWidget } from './WeeklyResetTimer';
export { ContextBarWidget } from './ContextBar';
Expand Down