search

CroatianMeteorNetwork / RMS

RPi Meteor Station
https://globalmeteornetwork.org/
GNU General Public License v3.0
169 stars 47 forks source link

Eventmonitor #196

Closed g7gpr closed 10 months ago

g7gpr commented 10 months ago

The folder creation would be a lot neater as an optional parameter to uploadSFTP - what do you think?

g7gpr commented 10 months ago

Tested on Py3 linux, and rpi3 Py2, ready for testing by others.

dvida commented 10 months ago

Thanks! I'd love to merge it, but the diff for StartCapture is the whole file. I'd like to preserve git blame for this file so I don't want to merge it like this. Do you know what happened that made it change the whole file?

g7gpr commented 10 months ago

Probably a CRLF problem. Some of the files are LF at the end of the line, some are CRLF.

I'll fix it up - sorry. Should not take too long.

Dave

From: Denis Vida @.> Sent: Friday, September 1, 2023 10:26 PM To: CroatianMeteorNetwork/RMS @.> Cc: David Rollinson @.>; Author @.> Subject: Re: [CroatianMeteorNetwork/RMS] Eventmonitor (PR #196)

Thanks! I'd love to merge it, but the diff for StartCapture is the whole file. I'd like to preserve git blame for this file so I don't want to merge it like this. Do you know what happened that made it change the whole file?

— Reply to this email directly, view it on GitHubhttps://github.com/CroatianMeteorNetwork/RMS/pull/196#issuecomment-1702835305, or unsubscribehttps://github.com/notifications/unsubscribe-auth/ASMOVH7VGRDVYB3BZHI4TF3XYHWBTANCNFSM6AAAAAA4GVE3RQ. You are receiving this because you authored the thread.Message ID: @.***>

dvida commented 10 months ago

Thanks - could you purge StartCapture from the PR (or remove the offending commit)? It's still reporting that the whole file has been changed when you look at the PR diff.

g7gpr commented 10 months ago

CRLF fixed

dvida commented 10 months ago

I'm sorry to nitpick - the diff is fine but the blame is gone, see: https://github.com/CroatianMeteorNetwork/RMS/blame/6f2f88c8d8b5fd77f6d4d2ba4f3c3d36eb23a2f5/RMS/StartCapture.py The actual offending commit that first introduced this problem will have to be removed.

g7gpr commented 10 months ago

I'll find it.

g7gpr commented 10 months ago

Closing this until I've fixed the commit.

g7gpr commented 10 months ago

Corrected blame for StartCapture, but I want to check all the other files I've touched.

g7gpr commented 10 months ago

Corrected blame for StartCapture, but I want to check all the other files I've touched.