Fix 6 functional bugs

[richstokes]

Summary

Six functional bug fixes.

Bugs Fixed

1. NameError crash in getDeviceModel() and getBatteryLevel()
The error handlers on lines 37 and 52 referenced an undefined variable photoDict instead of the correct props. This causes a NameError crash whenever the camera returns errCode != 200, hiding the actual error message.

2. File regex rejects .DNG files
The -f argument validator accepted .RAW but the GR III/IIIx cameras produce .DNG files (Adobe DNG format). Confirmed by firmware analysis: the webapid binary uses the format identifier rawdng and serves these files with Content-Type: image/x-adobe-dng. This prevented users from starting a sync from a DNG file. As far as I can tell, Ricoh never used a .RAW file

3. Socket timeout too short for large file downloads (2s → 30s)
The 2-second global socket timeout caused downloads to fail for large files. The camera's WiFi AP is 2.4 GHz only, delivering ~3-6 MB/s real-world throughput. Full JPEGs are 15-30 MB and DNG raws are 30-40 MB, meaning individual file transfers can take 5-10+ seconds. Increased to 30 seconds.

4. Post-sync action powers off camera instead of disconnecting WiFi
shutdownGR() called POST /v1/device/finish which powers off the entire camera. Firmware analysis confirmed this endpoint triggers a full shutdown via sysmgrd. Changed to POST /v1/device/wlan/finish which only disconnects WiFi, allowing the user to continue shooting.

5. --last counter decrements on already-downloaded files
The download_last_n_pictures counter decremented for every file encountered, including files that were skipped because they already existed locally. With --last 5, if 3 of those 5 files already existed, only 2 new files would be downloaded. Fixed to only decrement on files that were actually new.

6. Float division in Python 3 progress display
count/2 produces a float in Python 3 (showing e.g. 2.5/10 in progress output). Changed to count//2 for integer division.

[Copilot]

Pull request overview

This PR updates the GRsync script to improve correctness of error reporting, make post-sync behavior less destructive, and improve reliability/UX for large transfers from the camera over Wi‑Fi.

Changes:

• Fix incorrect variables used in /v1/props error logging.
• Replace camera power-off call with a Wi‑Fi disconnect endpoint after sync completion.
• Improve download behavior and UX (integer progress formatting, --last logic, longer socket timeout, .DNG validation).

---

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

[Copilot]

Pull request overview

Updates the GRsync script’s post-sync behavior and download limiting logic, aiming to improve usability when syncing from Ricoh GR cameras over Wi‑Fi.

Changes:

• Fix incorrect error reporting in getDeviceModel() / getBatteryLevel() when the props API returns a non-200 errCode.
• Replace camera power-off behavior with a “graceful Wi‑Fi disconnect” call after downloads complete.
• Adjust --last handling, progress counting, socket timeout, and update raw filename matching from .RAW to .DNG.

---

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

[Copilot]

Pull request overview

Updates GRsync.py to improve reliability and usability when syncing photos from Ricoh GR cameras over Wi‑Fi, including safer post-sync behavior and better Python 3 compatibility.

Changes:

• Fixes incorrect error reporting in device property fetches (getDeviceModel, getBatteryLevel).
• Replaces camera power-off behavior with a Wi‑Fi disconnect call (disconnectGR) after downloads complete.
• Improves Python 3 behavior and user options: integer progress math, --last handling, longer socket timeout, and .DNG start-file validation.

Comments suppressed due to low confidence (1)

GRsync.py:258

• Now that .DNG is accepted as a valid start file, the validation failure message below still says the filename should look like R0999999.JPG only. Update the error message (and/or argparse help text) to mention .DNG as well so users aren’t misled.

            match = re.match(r"^R0\d{6}\.DNG$", args.file)
        if match:
            STARTFILE = args.file
        else :
            print("Incorrect file name. It should be something like R0999999.JPG. (all in CAPITAL)")

---

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