Print dashboard refinement #78

bbarni2020 · 2025-12-30T00:32:54Z

No description provided.

Copilot

Pull request overview

This PR refines the print dashboard by replacing manual filament usage input with automatic calculation from uploaded G-code files, and enhances project filtering to show only relevant projects based on status and user ownership.

Implemented automatic filament usage calculation by parsing G-code files
Changed print submission form to require G-code file upload instead of manual filament input
Refined project filtering to show only printing, approved, and user's own printed projects

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 12 comments.

Show a summary per file

File	Description
src/routes/dashboard/admin/print/utils.server.ts	Added `calculateFilamentUsage` function to parse G-code and compute filament weight from extrusion values
src/routes/dashboard/admin/print/[id]/+page.svelte	Updated form to accept G-code file upload instead of manual filament input field
src/routes/dashboard/admin/print/[id]/+page.server.ts	Modified to process uploaded G-code files and calculate filament usage automatically
src/routes/dashboard/admin/print/+page.svelte	Added client-side filtering for projects based on status and user ownership, updated status filter options
src/routes/dashboard/admin/print/+page.server.ts	Enhanced server-side queries to filter projects by status and ownership, added user filter override for printed status

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-05T20:23:33Z

src/routes/dashboard/admin/print/utils.server.ts

+				if (newE > currentE) {
+					totalExtruded += newE - currentE;
+				}
+				currentE = newE;


The G-code parser only accounts for positive extrusion differences when newE is greater than currentE. However, it doesn't handle retractions (negative E movements) properly. When newE is less than currentE (which happens during retraction), the currentE is still updated to newE, but the totalExtruded is not adjusted. This can lead to incorrect calculations if the G-code uses absolute extrusion positioning. Consider tracking retractions separately or handling all E value changes to maintain accurate state.

Copilot · 2026-01-05T20:23:33Z

src/routes/dashboard/admin/print/utils.server.ts

+			const eMatch = trimmed.match(/E([0-9.-]+)/);
+			if (eMatch) {
+				currentE = parseFloat(eMatch[1]);
+			}
+		} else if (trimmed.startsWith('G1')) {
+			const eMatch = trimmed.match(/E([0-9.-]+)/);


The regular expression pattern allows multiple dots in numbers (e.g., "1.2.3" would match). This could lead to parseFloat returning NaN for malformed numbers, though the validation at line 227 would catch it. Consider using a more restrictive pattern like /E(-?[0-9]+.?[0-9]*)/ to ensure only valid decimal numbers are matched.

Suggested change

const eMatch = trimmed.match(/E([0-9.-]+)/);

if (eMatch) {

currentE = parseFloat(eMatch[1]);

}

} else if (trimmed.startsWith('G1')) {

const eMatch = trimmed.match(/E([0-9.-]+)/);

const eMatch = trimmed.match(/E(-?\d+(?:\.\d+)?)/);

if (eMatch) {

currentE = parseFloat(eMatch[1]);

}

} else if (trimmed.startsWith('G1')) {

const eMatch = trimmed.match(/E(-?\d+(?:\.\d+)?)/);

Copilot · 2026-01-05T20:23:33Z

src/routes/dashboard/admin/print/utils.server.ts


 	return currentlyPrinting;
 }
+


The function lacks documentation explaining its purpose, parameters, return value, and the assumptions it makes about the G-code format. Consider adding a JSDoc comment that explains the calculation method, the assumed filament diameter and density values, and what G-code commands are supported (G1 for extrusion moves, G92 for position resets).

Suggested change

/**

* Estimates the amount of filament used in a print based on its G-code.

*

* The function parses the provided G-code text, tracking the extruder position (`E` value)

* on supported commands and summing only the positive increases in extrusion length.

*

* Assumptions and calculation details:

* - Filament diameter is assumed to be 1.75 mm.

* - Filament density is assumed to be 1.24 g/cm³ (typical for PLA).

* - G-code units are assumed to be millimeters.

* - Extrusion is assumed to be in absolute mode for the `E` axis.

* - Only the following commands are interpreted:

* - `G1` with an `E` parameter for extrusion moves; increases in `E` are treated as

* additional filament length extruded.

* - `G92` with an `E` parameter to reset the current extruder position.

* - All other commands and parameters are ignored for the purpose of this calculation.

*

* The total extruded filament length (in mm) is converted to volume using the

* cross-sectional area of a 1.75 mm filament, then converted to cm³ and multiplied

* by the assumed density to estimate the mass in grams.

*

* @param gcodeText - Full G-code content as a string, using millimeters and absolute `E`.

* @returns Estimated filament mass in grams.

*/

Copilot · 2026-01-05T20:23:34Z

src/routes/dashboard/admin/print/utils.server.ts

+	const FILAMENT_DIAMETER = 1.75;
+	const FILAMENT_DENSITY = 1.24;


The filament diameter (1.75mm) and density (1.24 g/cm³) are hardcoded. These values may vary depending on the filament type (PLA, ABS, PETG, etc.) and manufacturer. Consider making these configurable parameters or documenting which filament type these values represent. The density appears to be for PLA, but this should be explicitly documented.

Copilot · 2026-01-05T20:23:34Z

src/routes/dashboard/admin/print/[id]/+page.server.ts

-			parseFloat(filamentUsed.toString()) < 0
-		) {
-			return error(400, { message: 'invalid filament used' });
+		const gcodeText = await gcodeFile.text();


No file size validation is performed on the uploaded G-code file before reading its contents with .text(). Large G-code files could potentially cause memory issues or timeouts. Consider adding a file size check and rejecting files that exceed a reasonable limit (e.g., 10-50 MB) before processing.

Suggested change

const gcodeText = await gcodeFile.text();

const MAX_GCODE_SIZE_BYTES = 50 * 1024 * 1024; // 50 MB

const gcodeBlob = gcodeFile as Blob;

if (typeof (gcodeBlob as any).size === 'number' && (gcodeBlob as any).size > MAX_GCODE_SIZE_BYTES) {

return error(413, { message: 'G-code file is too large' });

}

const gcodeText = await gcodeBlob.text();

Copilot · 2026-01-05T20:23:35Z

src/routes/dashboard/admin/print/+page.svelte

+		allProjects
+			.filter((project) => {
+				if (project.status === 'printing') return true;
+				if (project.status === 'printed' && project.userId === currentUserId) return true;
+				return false;
+			})
+			.filter((project) => project.name?.toLowerCase().includes(projectSearch.toLowerCase()))


The filtering logic duplicates the server-side filtering in +page.server.ts. The allProjects data already has status and userId filtering applied on the server (lines 28-32 in +page.server.ts), but this client-side filter applies the same logic again. This duplication can lead to maintenance issues if the filtering rules need to change. Consider relying on the server-side filtering or documenting why both are necessary.

Suggested change

allProjects

.filter((project) => {

if (project.status === 'printing') return true;

if (project.status === 'printed' && project.userId === currentUserId) return true;

return false;

})

.filter((project) => project.name?.toLowerCase().includes(projectSearch.toLowerCase()))

allProjects.filter((project) =>

project.name?.toLowerCase().includes(projectSearch.toLowerCase())

)

Copilot · 2026-01-05T20:23:36Z

src/routes/dashboard/admin/print/+page.server.ts

 			return parseInt(userId.toString());
 		});

+		if (statusFilter.length === 1 && statusFilter[0] === 'printed') {


The userFilter override on lines 80-82 silently discards any user selections when the status filter is 'printed'. This behavior is not obvious from the UI and could be confusing to users who selected specific users in the filter. Consider either making this restriction clear in the UI or preventing users from selecting user filters when 'printed' is the only status selected.

Suggested change

if (statusFilter.length === 1 && statusFilter[0] === 'printed') {

if (statusFilter.length === 1 && statusFilter[0] === 'printed' && userFilter.length === 0) {

Copilot · 2026-01-05T20:23:36Z

src/routes/dashboard/admin/print/+page.svelte

-							{/each}
+						<option value="t1_approved" class="truncate">{projectStatuses['t1_approved'] ?? 'On Print Queue'}</option>
+						<option value="printing" class="truncate">{projectStatuses['printing'] ?? 'Being printed'}</option>
+							<option value="printed" class="truncate">{projectStatuses['printed'] ?? 'Printed'}</option>


Inconsistent indentation: lines 75-76 use tabs while line 77 uses a tab plus spaces. All three option elements should have the same indentation level for consistency.

Suggested change

<option value="printed" class="truncate">{projectStatuses['printed'] ?? 'Printed'}</option>

<option value="printed" class="truncate">{projectStatuses['printed'] ?? 'Printed'}</option>

Copilot · 2026-01-05T20:23:36Z

src/routes/dashboard/admin/print/[id]/+page.svelte

 							<input
-								name="filament"
-								type="number"
+								name="gcode"
+								type="file"
 								class="themed-input-on-box"
-								placeholder="50"
-								step="0.1"
-								min="0"
+								accept=".gcode"
 								required
 							/>


The file input lacks client-side validation for file size. Users could attempt to upload very large files, which would only fail after upload and processing. Consider adding a maxlength or size attribute, or using JavaScript to validate file size before submission to provide better user experience.

Copilot · 2026-01-05T20:23:36Z

src/routes/dashboard/admin/print/utils.server.ts

+	for (const line of lines) {
+		const trimmed = line.trim().toUpperCase();
+		if (trimmed.startsWith('G92')) {
+			const eMatch = trimmed.match(/E([0-9.-]+)/);
+			if (eMatch) {
+				currentE = parseFloat(eMatch[1]);
+			}
+		} else if (trimmed.startsWith('G1')) {
+			const eMatch = trimmed.match(/E([0-9.-]+)/);
+			if (eMatch) {
+				const newE = parseFloat(eMatch[1]);
+				if (newE > currentE) {
+					totalExtruded += newE - currentE;
+				}
+				currentE = newE;
+			}
+		}


The function processes every line in the G-code file even if most lines don't contain E (extrusion) commands. For large G-code files, this could impact performance. Consider optimizing by checking for the presence of 'E' in the line before running the regex match, or filtering lines that contain 'E' first before processing.

bbarni2020 added 2 commits December 30, 2025 01:23

Refactor print admin to use G-code for filament usage

0bb5f9f

Refactor filament usage calculation

28026f8

bbarni2020 requested a review from ArcaEge December 30, 2025 00:33

Merge branch 'staging' into print-dashboard-refinement

107395e

Copilot AI review requested due to automatic review settings January 5, 2026 20:17

Copilot started reviewing on behalf of bbarni2020 January 5, 2026 20:18 View session

Copilot AI reviewed Jan 5, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Print dashboard refinement #78

Print dashboard refinement #78

Uh oh!

bbarni2020 commented Dec 30, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

+/**
+ * Estimates the amount of filament used in a print based on its G-code.
+ *
+ * The function parses the provided G-code text, tracking the extruder position (`E` value)
+ * on supported commands and summing only the positive increases in extrusion length.
+ *
+ * Assumptions and calculation details:
+ * - Filament diameter is assumed to be 1.75 mm.
+ * - Filament density is assumed to be 1.24 g/cm³ (typical for PLA).
+ * - G-code units are assumed to be millimeters.
+ * - Extrusion is assumed to be in absolute mode for the `E` axis.
+ * - Only the following commands are interpreted:
+ *   - `G1` with an `E` parameter for extrusion moves; increases in `E` are treated as
+ *     additional filament length extruded.
+ *   - `G92` with an `E` parameter to reset the current extruder position.
+ * - All other commands and parameters are ignored for the purpose of this calculation.
+ *
+ * The total extruded filament length (in mm) is converted to volume using the
+ * cross-sectional area of a 1.75 mm filament, then converted to cm³ and multiplied
+ * by the assumed density to estimate the mass in grams.
+ *
+ * @param gcodeText - Full G-code content as a string, using millimeters and absolute `E`.
+ * @returns Estimated filament mass in grams.
+ */

		const FILAMENT_DIAMETER = 1.75;
		const FILAMENT_DENSITY = 1.24;

-		const gcodeText = await gcodeFile.text();
+		const MAX_GCODE_SIZE_BYTES = 50 * 1024 * 1024; // 50 MB
+		const gcodeBlob = gcodeFile as Blob;
+		if (typeof (gcodeBlob as any).size === 'number' && (gcodeBlob as any).size > MAX_GCODE_SIZE_BYTES) {
+			return error(413, { message: 'G-code file is too large' });
+		}
+		const gcodeText = await gcodeBlob.text();

	if (statusFilter.length === 1 && statusFilter[0] === 'printed') {
	if (statusFilter.length === 1 && statusFilter[0] === 'printed' && userFilter.length === 0) {

	<option value="printed" class="truncate">{projectStatuses['printed'] ?? 'Printed'}</option>
	<option value="printed" class="truncate">{projectStatuses['printed'] ?? 'Printed'}</option>

Print dashboard refinement #78

Are you sure you want to change the base?

Print dashboard refinement #78

Uh oh!

Conversation

bbarni2020 commented Dec 30, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant