Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.
JavaScript apple-watchbodyweightdockerfitnessfitness-trackergymhealthiosmcpnodejspasskeysprogressive-web-applicationspwareactself-hostedself-hostingvitewebauthnweightliftingworkout-tracker
Custom exercises: an edit that does not touch the photo or video writes back the ref the exercise had
Duarte Santos85b5a4e85fa2
diff --git a/frontend/src/sheets.custom-media.test.jsx b/frontend/src/sheets.custom-media.test.jsxindex ad8d23274..5b2126d68 100644--- a/frontend/src/sheets.custom-media.test.jsx+++ b/frontend/src/sheets.custom-media.test.jsx@@ -146,6 +146,16 @@ describe('custom exercise photo, GIF or video, and link', () => {expect(S().customEx[0].url).toBeUndefined()})+ it('an edit that leaves the media alone keeps a ref this version cannot read (a newer app wrote it)', () => {+ const future = { ...REF, kind: 'video', mime: 'video/mp4', codec: 'vvc1', dur: 12 }+ seed(custom({ media: future }))+ customExSheet(S().customEx[0])+ const form = renderTop()+ act(() => type(form.querySelector('input.input'), 'Sandbag carry, renamed'))+ click(form, 'button', 'Save')+ expect(S().customEx[0]).toMatchObject({ n: 'Sandbag carry, renamed', media: future })+ })+it('a refused file becomes the sentence for it, and the draft stays as it was', async () => {h.ingest = vi.fn(async () => { throw Object.assign(new Error('too-large'), { code: 'too-large', mb: 40 }) })customExSheet(null)diff --git a/frontend/src/sheets.jsx b/frontend/src/sheets.jsxindex 304f99160..c5c0e392b 100644--- a/frontend/src/sheets.jsx+++ b/frontend/src/sheets.jsx@@ -923,9 +923,14 @@ function CustomExForm({ existing, prefill, onDone, close }) {const [eq, setEq] = useState(existing ? (existing.eq || '') : '')const [desc, setDesc] = useState(existing ? (existing.desc || '') : '')const [media, setMedia] = useState(() => mediaOf(existing))+ // Whether this form changed the media at all. An edit that did not touch it writes back what the+ // exercise had, byte for byte: a ref from a newer version of the app (a codec or type this one+ // does not know) reads as nothing here, and re-normalizing it on a rename would delete it on+ // every device.+ const [mediaTouched, setMediaTouched] = useState(false)const [url, setUrl] = useState(existing && typeof existing.url === 'string' ? existing.url : '')const onMedia = patch => {- if ('media' in patch) setMedia(patch.media)+ if ('media' in patch) { setMedia(patch.media); setMediaTouched(true) }if ('url' in patch) setUrl(patch.url)}const [primaries, setPrimaries] = useState(() => {@@ -960,7 +965,8 @@ function CustomExForm({ existing, prefill, onDone, close }) {// An empty field removes the link; anything else has to be a web address.const link = url.trim() ? cleanUrl(url) : nullif (url.trim() && !link) { toast(t('That link is not a web address')); return }- const ref = normalizeMediaRef(media)+ const keepMedia = !!existing && !mediaTouched+ const ref = keepMedia ? null : normalizeMediaRef(media)// Stored in the map's order, not the order the chips were tapped in — the tags on the exercise// used to shuffle with every edit.const prim = bp === 'cardio' ? ['cardiovascular system'] : inMuscleOrder(primaries)@@ -975,7 +981,7 @@ function CustomExForm({ existing, prefill, onDone, close }) {const tg = (existing && prim.includes(existing.tg)) ? existing.tg : (primaryTaps.find(m => prim.includes(m)) || prim[0] || '')let id = existing && existing.idconst extra = c => {- if (ref) c.media = ref; else delete c.media+ if (!keepMedia) { if (ref) c.media = ref; else delete c.media }if (link) c.url = link; else delete c.url}if (existing) update(s => { const c = (s.customEx || []).find(x => x.id === id); if (c) {