157 lines
23 KiB
Plaintext
157 lines
23 KiB
Plaintext
|
+
|
|||
|
|
ë+…j)< ã óþ € R t ^ RIt^ RIt^ RIt^ RIt^ RIt^ RIt^ RIt^ RIt^ RI t ^ RI
|
|||
|
|
t ^ RI t ^ RI
|
|||
|
|
t ^ RIHtHt Rt]P" P% ]P& P) RR4 4 t]P" P- ]R4 tRtRtR tR
|
|||
|
|
tR t R"R lt R
|
|||
|
|
t R t RR/R lt R t!R t"R#R lt#R#R lt$R t%R t&R t'R t(R t)Rs*R t+R t,R t-R t.R$R lt/]0R!8X d ]Pb ! ]/! 4 4 R# R# )%av granthi-sync client daemon.
|
|||
|
|
|
|||
|
|
Commands:
|
|||
|
|
link [--server URL] [--token ZITADEL_TOKEN] [--device NAME]
|
|||
|
|
Zitadel OAuth device flow against https://id.shre.ai (or --token for
|
|||
|
|
the headless path), then POST /v1/link on the granthi-link service.
|
|||
|
|
Stores {server, gitea_base, login, token, token_name} in
|
|||
|
|
~/.granthi-sync/config.json (0600).
|
|||
|
|
add <folder> [--name N] [--private/--public]
|
|||
|
|
git init (branch main) if needed, create the cloud repo via
|
|||
|
|
/v1/repos, add remote 'granthi', initial commit + push. The token
|
|||
|
|
is supplied via a git credential helper (this script's hidden
|
|||
|
|
`git-credential` subcommand), never embedded in the remote URL.
|
|||
|
|
watch [--interval 30] [--once]
|
|||
|
|
Poll linked folders: autocommit local changes, fetch, ff-pull when
|
|||
|
|
the remote is strictly ahead, push when local is strictly ahead.
|
|||
|
|
DIVERGED branches are logged + recorded and SKIPPED -- never force,
|
|||
|
|
never merge (same policy as the estate's gitea_sync.py mesh).
|
|||
|
|
SIGTERM-clean.
|
|||
|
|
status
|
|||
|
|
Table of linked folders, last sync, divergence flags.
|
|||
|
|
|
|||
|
|
Stdlib + git CLI only.
|
|||
|
|
N)ÚdatetimeÚtimezonez1.0.0ÚGRANTHI_SYNC_HOMEz~/.granthi-syncz config.jsonzhttps://id.shre.aiÚ386909715541590022zhttp://100.111.127.127:3042zopenid profile emailc ó’ € \ P ! \ P 4 P R 4 p\ RV RV 2RR7 R# )z%Y-%m-%dT%H:%M:%SZÚ[z] T)ÚflushN)r Únowr ÚutcÚstrftimeÚprint)ÚmsgÚtss & Úˆ/private/tmp/claude-502/-Users-aibot/7c1e3ba6-d022-4b1b-8026-9f6da66762d2/scratchpad/granthi-sync/tests/../client/granthi_sync_client.pyÚlogr 6 s6 € Ü � Š ”h—l‘lÓ #× ,Ñ ,Ð-AÓ B€BÜ ˆAˆbˆT��C�5ˆ/ ×&ó c óÊ € Rp\ T;' g / 4 pVeA \ P P V4 P 4 pVP RR4 M:Ve7 \ P ! V4 P 4 pVP RR4 \ P P WWpR7 p \ P P W…R7 ;_uu_ 4 p V P 4 V P rºRRR4 X X
|
|||
|
|
' d \ P& ! T
|
|||
|
|
4 3# / 3# + ' g i L4; i \ P P d& p T P 4 T P rº Rp ? LvRp ? i\ P P \" 3 d p RR\% T 4 /3u Rp ? # Rp ? ii ; i \( d X R X
|
|||
|
|
P+ R
|
|||
|
|
R 7 /3u # i ; i) z/Returns (status, parsed-json-or-{'raw': text}).Nz Content-Typez!application/x-www-form-urlencodedzapplication/json)ÚdataÚheadersÚmethod)ÚtimeoutiW ÚerrorÚrawÚreplace)Úerrors)ÚdictÚurllibÚparseÚ urlencodeÚencodeÚ
|
|||
|
|
setdefaultÚjsonÚdumpsÚrequestÚRequestÚurlopenÚreadÚstatusr Ú HTTPErrorÚcodeÚURLErrorÚOSErrorÚstrÚloadsÚ
|
|||
|
|
ValueErrorÚdecode)
|
|||
|
|
r Úurlr ÚbodyÚformr r ÚhdrsÚreqÚrespr r' Úes
|
|||
|
|
&&&&&& r Ú http_jsonr7 ? so € à €DÜ �—
|
|||
|
|
�
|
|||
|
|
˜2Ó €DØ ÒÜ�|‰|×%Ñ% dÓ+×2Ñ2Ó4ˆØ �‰˜Ð(KÕLØ
|
|||
|
|
Ò Ü�zŠz˜$Ó ×&Ñ&Ó(ˆØ �‰˜Ð(:Ô;Ü
|
|||
|
|
�.‰.×
|
|||
|
|
Ñ
|
|||
|
|
¸Ð
|
|||
|
|
Ó
|
|||
|
|
M€Cð&Ü
|
|||
|
|
�^‰^×
|
|||
|
|
#Ñ
|
|||
|
|
# CÐ
|
|||
|
|
#×
|
|||
|
|
9Ô
|
|||
|
|
9¸TØ Ÿ)™)›+ t§{¡{�÷ :ð =د#”t—z’z #“Ð5Ð5°2Ð5Ð5÷ :×
|
|||
|
|
9ûä �<‰<× !Ñ !ô 'Ø—f‘f“h §¡�VûÜ �L‰L× !Ñ !¤7Ð +ô &Ø�Wœc !›fÐ%Ð%Õ%ûð&ûô ô =ؘ˜sŸz™z°˜zÓ ;Ð<Ð<Ò<ð=úsl Â8(D; à D(Ã<D; ÄF> ÄF> Ä%F> Ä( D8 Ä3D; Ä8D; Ä; F;ÅE:Å:&F;Æ!F;Æ"F6Æ0F;Æ6F;Æ>!G"Ç!G"c ó € \ \ 4 ;_uu_ 4 p \ P ! V 4 uuR R R 4 # + ' g i R # ; i \ d / u # i ; i©N)ÚopenÚ CONFIG_PATHr! ÚloadÚFileNotFoundError)Úfs r Ú load_configr? [ sA € ðÜ
|
|||
|
|
”+×
|
|||
|
|
Ô
|
|||
|
|
!Ü—9’9˜Q“<÷ ×
|
|||
|
|
×
|
|||
|
|
Ó
|
|||
|
|
ûä ô ØŠ ðús+ ‚A ™:¯
|
|||
|
|
A º A ÁA Á A Á
|
|||
|
|
A Á A c óN € \ P ! \ R RR7 \ R, p\ VR4 ;_uu_ 4 p\
|
|||
|
|
P ! W^R7 RRR4 \ P ! VR4 \ P ! V\ 4 R# + ' g i LD; i)iÀ T)ÚmodeÚexist_okz.tmpÚw)ÚindentNi€ ) ÚosÚmakedirsÚ
|
|||
|
|
CONFIG_DIRr; r: r! ÚdumpÚchmodr )ÚcfgÚtmpr> s & r Ú save_configrL c s` € ܇K‚K”
|
|||
|
|
°Õ6Ü
|
|||
|
|
˜Õ
|
|||
|
|
€CÜ
|
|||
|
|
ˆc�3� Œ ˜1Ü � Š �# Õ#÷
|
|||
|
|
ä‡H‚HˆS�%Ô܇J‚Jˆs”KÖ ÷
|
|||
|
|
� ús ¿BÂ B$ ÚcheckTc óN € \ P ! RRV .\ V4 , RRR7 pV' dM VP ^ 8w d< \ RRP V4 RV RVP P 4 24 hVP VP P 4 3# ) z<Run git in folder. Returns (rc, stdout). Never uses --force.Úgitz-CT)Úcapture_outputÚtextzgit Ú z failed in ú: ) Ú
|
|||
|
|
subprocessÚrunÚlistÚ
|
|||
|
|
returncodeÚ RuntimeErrorÚjoinÚstderrÚstripÚstdout)ÚfolderrM ÚargsÚprocs &$* r rO rO p s� € ä �>Š>˜5 $¨Ð/´$°t³*Õ<Ø)-°Dô :€Dç �— ‘ AÔ%ÜØ�3—8‘8˜D“>Ð" +¨f¨X°R¸¿ ¹ ×8IÑ8IÓ8KÐ7LÐ MóOð Oà �?‰?˜DŸK™K× -Ñ -Ó /Ð /Ð/r c óú € \ P P \ P P V R 4 4 ' d R# \ V RRRRR7 w rV^ 8w d \ V R4 \ V RRR 4 R# R# )
|
|||
|
|
ú.gitNÚinitz-bÚmainF©rM z symbolic-refÚHEADzrefs/heads/main)rE ÚpathÚisdirrY rO )r] ÚrcÚ_s & r Ú ensure_reporj z s` € Ü ‡w�w‡}�}”R—W‘W—\‘\ &¨&Ó1×2Ò2ÙÜ �˜ f°EÔ :�E€BØ ˆQ„wÜ ˆF�FÔÜ ˆF�N FÐ,=Ö>ñ r c óÜ € \ V RR4 w rV' g R# \ V RR4 \ P ! \ P 4 P RR7 p\ V RR R
|
|||
|
|
V 24 R # ) zPCommit all local changes as 'sync: <ISO ts>'. Returns True if a
|
|||
|
|
commit was made.r' z --porcelainFÚaddz-AÚseconds©ÚtimespecÚcommitz-mzsync: T)rO r r r r
|
|||
|
|
Ú isoformat)r] ri r' r s & r Ú
|
|||
|
|
autocommitrr ƒ s] € ô �F˜H mÓ4�I€Aß Ù܈��tÔ Ü � Š ”h—l‘lÓ #× -Ñ -°yÐ -Ó A€B܈�˜$ &¨¨
|
|||
|
|
Ô.Ù r c
|
|||
|
|
ó$ € \ V RRRRV RV 2RR7 w r4V^ 8w d R# \ V RV4 w rE\ V RRV RV 24 w rFWV8X d R # \ V R
|
|||
|
|
VRV RV 2RR7 w r7V^ 8w d R # VP 4 pWv8X d R # Wu8X d R
|
|||
|
|
# R # )z†Classify local vs remote after a fetch.
|
|||
|
|
|
|||
|
|
Returns one of: 'no-remote-branch', 'in-sync', 'local-ahead',
|
|||
|
|
'remote-ahead-ff', 'diverged'.
|
|||
|
|
z rev-parsez--verifyz--quietú
|
|||
|
|
refs/remotes/Ú/Frd úno-remote-branchúin-syncz
|
|||
|
|
merge-baseÚdivergedú local-aheadúremote-ahead-ff)rO r[ )r] ÚremoteÚbranchrh ri ÚlocalÚ
|
|||
|
|
remote_shaÚbases &&& r Ú
|
|||
|
|
sync_stater€ � s¹ € ô
|
|||
|
|
�˜ Z°Ø ˜x q¨¨Ð1¸ô
|
|||
|
|
@�E€Bà ˆQ„wÙ!Ü�6˜;¨Ó/�H€Aܘ ¨}¸V¸HÀAÀfÀXÐ-NÓO�M€AØ ÔÙÜ�6˜<¨Ø" 6 (¨!¨F¨8Ð4¸EôC�H€Bà ˆQ„wÙØ �:‰:‹<€DØ ÔÙ Ø „}Ù Ù r c ó^ € \ V 4 p\ V RV4 \ WV4 pRpVR8X d# \ V RRRV RV 24 Rp\ WV4 pVR 8X d R# VR9 d \ V R
|
|||
|
|
R W4 R V' d R
|
|||
|
|
3# R 3# V' d R# R# \ d pR\ T4 3u Rp?# Rp?ii ; i)zºOne sync pass for one folder. Returns (outcome, detail).
|
|||
|
|
|
|||
|
|
outcome in {'synced', 'pushed', 'clean', 'diverged', 'error'}.
|
|||
|
|
Policy: ff-only pulls, plain pushes. NEVER --force, NEVER merge.
|
|||
|
|
ÚfetchFrz Úmergez --ff-onlyrt ru Trx Úpushú-uÚpushedzcommitted+pushedr N)rx z=local and remote both advanced; skipping (no force, no merge))ry rv )Úsyncedz ff-pulled)Úcleanrw )rr rO r€ rX r, )r] r{ r| Ú committedÚstateÚ ff_pulledr6 s &&& r Ú sync_folderrŒ © sË € ð Ü ˜vÓ&ˆ Ü ˆF�G˜VÔ$ܘ6¨6Ó2ˆØˆ Ø Ð%Ô %Ü �˜ °
|
|||
|
|
¸f¸XÀQÀvÀhÐ.OÔ PØ ˆIÜ ˜v¨vÓ6ˆEØ �JÔ Ø^Ð ^Ø Ð7Ô 7Ü �˜ fÔ 5Ø·9Ð /ÐJÐ JÀ(ÐJÐ Jç Ø(Ð (Ø!Ð!øÜ ô Øœ˜A›ˆÕ ûð ús< ‚AB
|
|||
|
|
Á B
|
|||
|
|
Á;B
|
|||
|
|
Á>B
|
|||
|
|
ÂB
|
|||
|
|
ÂB
|
|||
|
|
Â
|
|||
|
|
B, B'Â!B,Â'B,c ó € V ' d
|
|||
|
|
V ^ , MRpVR8w d ^ # / p\ P F5 pVP 4 pV' g M VP R4 w rEpWbV& K7 \ 4 pVP RR4 p\ P P V4 p VP R4 V P 8X d= \ RVP RR4 24 \ RVP R R4 24 ^ # )
|
|||
|
|
é ÚgetÚ=Ú
|
|||
|
|
gitea_baseÚ Úhostz username=Úloginz password=Útoken) ÚsysÚstdinr[ Ú partitionr? r� r r ÚurlparseÚnetlocr )
|
|||
|
|
ÚargvÚopÚattrsÚlineÚkri ÚvrJ ÚgiteaÚwants
|
|||
|
|
& r Úcmd_git_credentialr£ É sÑ € ߈ˆaŽ˜e€BØ ˆU„{ÙØ €EÜ— ” ˆØ�z‰z‹|ˆßÙ Ø—.‘. Ó%‰ˆˆa؈a‹ñ ô ‹-€CØ �G‰G�L "Ó %€EÜ �<‰<× Ñ Ó '€DØ ‡y�y�Ó˜DŸK™KÔ'Ü
|
|||
|
|
� ˜#Ÿ'™' '¨2Ó.Ð/Ð0Ô1Ü
|
|||
|
|
� ˜#Ÿ'™' '¨2Ó.Ð/Ð0Ô1Ù r c ó’ € R \ P R\ P P \
|
|||
|
|
4 R2p\
|
|||
|
|
V RRV4 R# )Ú!rR z git-credentialÚconfigzcredential.helperN)r– Ú
|
|||
|
|
executablerE rf ÚabspathÚ__file__rO )r] Úhelpers & r Úinstall_credential_helperr« Ý s8 € Ø”— ‘ Ð ¤"§'¡'§/¡/´(Ó";Ð!<¸OÐ
|
|||
|
|
L€F܈�Ð-¨vÖ6r c
|
|||
|
|
ó € \ R\ R2R\ R\ /R7 w rV ^È8w d \ RV RV 24 h\ RVP
|
|||
|
|
R 4 ;' g VP
|
|||
|
|
R
|
|||
|
|
4 R 24 \ R VR
|
|||
|
|
, R 24 \ VP
|
|||
|
|
R^4 4 p\ P ! 4 \ VP
|
|||
|
|
RR4 4 , p\ P ! 4 V8 dŠ \ P ! V4 \ R\ R2RRRVR, R\ /R7 w rV ^È8X d
|
|||
|
|
VR, # VP
|
|||
|
|
RR4 pVR8X d Kƒ VR8X d V^,
|
|||
|
|
pK• \ RV 24 h\ R4 h) zCZitadel OAuth 2.0 device authorization grant. Returns access token.ÚPOSTz /oauth/v2/device_authorizationÚ client_idÚscope)r2 z"device authorization failed (HTTP ú): z
|
|||
|
|
To link this device, open:
|
|||
|
|
|
|||
|
|
Úverification_uri_completeÚverification_uriÚ
|
|||
|
|
zand enter code: Ú user_codeÚintervalÚ
|
|||
|
|
expires_ini, z/oauth/v2/tokenÚ
|
|||
|
|
grant_typez,urn:ietf:params:oauth:grant-type:device_codeÚ device_codeÚ access_tokenr r’ Úauthorization_pendingÚ slow_downzdevice flow failed: z$device flow timed out (code expired))
|
|||
|
|
r7 Ú ZITADEL_BASEÚDEVICE_CLIENT_IDÚ DEVICE_SCOPEÚ
|
|||
|
|
SystemExitr r� ÚintÚtimeÚsleep)r' r5 rµ ÚdeadlineÚtokÚerrs r Ú device_flowrÆ æ s{ € ä Ø”<�.Ð >Ð?ØÔ+¨W´lÐ
|
|||
|
|
CôE�L€Fð �„}ÜÐ=¸f¸XÀSÈÈÐOÓPÐPÜ Ð .¨t¯x©xÐ8SÓ/T×/tÐ/tÐX\×X`ÑX`ÐasÓXtÐ.uÐuwÐ
|
|||
|
|
xÔyÜ Ð ˜T +Õ .Ð /¨rÐ
|
|||
|
|
2Ô3Ü�4—8‘8˜J¨Ó*Ó+€HÜ�yŠy‹{œS §¡¨,¸Ó!<Ó =Õ=€HÜ
|
|||
|
|
�)Š)‹+˜Ô
|
|||
|
|
Ü �
|
|||
|
|
Š
|
|||
|
|
�8Ô Ü Ø ”|�n OÐ4Ø Ð NØ mÕ!4Ø Ô /ð1ô2‰ ˆð
|
|||
|
|
�SŒ=Ø�~Õ&Ð &Ø�g‰g�g˜rÓ"ˆØ Ð)Ô )Ù Ø �+Ô Ø ˜�MˆHÙ ÜÐ/°¨uÐ5Ó6Ð6Ü
|
|||
|
|
Ð;Ó
|
|||
|
|
<Ð<r c
|
|||
|
|
ó4 € V P ;' g \ 4 p\ R V P P R4 R2RVRV P
|
|||
|
|
/R7 w r#V^È8w d \
|
|||
|
|
RV RV 24 h\ 4 pVP RV P P R4 R VR , R
|
|||
|
|
VR
|
|||
|
|
, R VR , R VR , /4 VP R
|
|||
|
|
/ 4 \ V4 \ RVR
|
|||
|
|
, RVR , RVR , R\ 24 ^ # )r ru z/v1/linkÚzitadel_access_tokenÚ device_name©r1 zlink failed (HTTP r° Úserverr‘ r” r• Ú
|
|||
|
|
token_nameÚfoldersz
|
|||
|
|
linked as z on ú (token z ); config: )
|
|||
|
|
r• rÆ r7 rË ÚrstripÚdevicer¿ r? Úupdater rL r r; )r^ Ú
|
|||
|
|
zitadel_tokenr' r5 rJ s & r Úcmd_linkrÓ s € Ø—J‘J×/Ð/¤+£-€MÜ Ø�4—;‘;×%Ñ% cÓ*Ð+¨8Ð4Ø$ mؘTŸ[™[ð*ô+�L€Fð �„}ÜÐ-¨f¨X°S¸¸Ð?Ó@Ð@Ü
|
|||
|
|
‹-€C؇J�J�˜$Ÿ+™+×,Ñ,¨SÓ1Ø ˜d <Õ 0ؘ˜g� ؘ˜g� Ø ˜d <Õ 0ð 2ô 3ð
|
|||
|
|
‡N�N�9˜bÔ!Ü�Ô܈*�T˜'•]�O 4¨¨\Õ(:Ð';ð <Ø�|Õ$Ð% [´°
|
|||
|
|
ð ?ô @á r c
|
|||
|
|
ó4 € \ 4 pR V9 d \ R4 h\ P P V P
|