From 9af8091eddd8aa3bc48ab06ea8314ac0e8815962 Mon Sep 17 00:00:00 2001 From: Grigoryev Ilya Alekseevich Date: Tue, 31 Mar 2026 23:34:37 +0500 Subject: [PATCH] fix structure error --- .DS_Store | Bin 0 -> 10244 bytes app/main.go | 5 +++-- internal/.DS_Store | Bin 0 -> 8196 bytes internal/cmd/render.go | 41 +++++++++++++++-------------------------- 4 files changed, 18 insertions(+), 28 deletions(-) create mode 100644 .DS_Store create mode 100644 internal/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5c5146962428e67854f5892387b17ff77db43b27 GIT binary patch literal 10244 zcmeHMU2GIp6u#fIlo>kE0g4pdi3^4BlLbmaTmH=UPx&vfE!~!%Wp-zz1JjvhXSOYr z#>T`K5R6Y6|9R4A9!R$1CJaA`7 zav9YT0uch^5%ACM6-;A!md_5|dVaS|*K26_8bU?oq^il{WU*S@m+E(hQl91&-Bzuz z$Je?X$I6!4T6VW-3}uwsHplif(>4l0fTyb!Vv6DcZUl#HM(MD2Y-=sT&z- zY*?9yH#RnpCgLM&8XFSv)vF#E9hJmc^()rx${e-^Z07`D0K$&|n_9M@lmDz{FjcTE z$393F-&pofSxOG|XU>m=MsYqq>d>6kd?V>cLTAr%*qUmgX5PmX$J(8Dy(* za|Oq;b~vu-57V3WjA7638`qWYbDe_M77Ug)X?*Ub6kTJNL4%ruMmr7d)|PE4q_fjz zKeS-+vc{(M$&O9ic3!Dbrq7sJE6aVvAKNpZFpWa@kg0q9y_%adY~8dE_6(Y?nYD~A zTN^N@BOyswYU<|9eK4k~cXCY^v*wYa=^a(-MKPEoK2MeR>hwviT0n_lU1IQL`J*XQQ=_KTZc+I{%qWU!51N$hw5>en#ro3L z)F+qnX8lFuV$ceJu1_{_vqb5pvPRa_Q5A(GL@c;9?lZFoNTF8Yl1!PT@43$18XZuj35f z!n-(!^LP&*;xazN=lBxW@I8LOkGPIM@fU6glZ4qqoiIn3FC>Iz!g8TWXcpEA>xAt> zr;rvj;gH}6!+Zfk=>xNm>!n&aO09`fF1+{@&Q6?ivBx)V+Pvl7Nx7@jc#_R}V0L`r z(iN+lH?-U&BWG`ku(zf`!2R1YCg6U+jWXU|;n^rZRLa!ywCtv&F@{Ayca_Q9d%nCt zq@+(@8 zQdpqG+F~6dC6yxnTWr6|uCbrkuj~e~eHvz>4vWx09DfuWv7K1%bG#e-k%5LRbPT{o z9!H4p$1#d0F@~pblK6fa&*C|}h?np(Ud0=DlQ{o2-XX@nj|=z!AK_zM!lxnkza{4X zg5S#6ysgAzF7f+BY%crZygek+A_O7?A_O7?A_O7??r{Vv`1{BG`~QwR|NnoFuQGc5 z2!RNJyCHze_EdW-d6Z7Q<<9R12( literal 0 HcmV?d00001 diff --git a/app/main.go b/app/main.go index 5144006..9814034 100644 --- a/app/main.go +++ b/app/main.go @@ -7,7 +7,8 @@ import ( func main() { program := cmd.NewCLI() - cmd := program.Run() + parsed := program.Run() - fmt.Printf("%+v\n", cmd) + fmt.Printf("%+v\n", parsed) + fmt.Printf("%#v\n", parsed) } diff --git a/internal/.DS_Store b/internal/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..e66f5c7bca4edadfefc25222ed96d9c27b943e9b GIT binary patch literal 8196 zcmeHMU2GIp6u#fIzziMe07Vw;goQ#7vd~h{mOr!oQ~nEVOSk1`ncW%b!0b%fncWsj zV`JhA2*xLk|2%0l@?b!TFOsN;J}R1Ej1NSO`htnRs62RP?kqnojW5P1&Q0c?d(J)Q z-Z^K!bMM}}j4`wp^_7gp7-J$mK2@ryx=Zo<{byVeLP;f2kUet;vX+x2?m~88oOUFL zA`nF&ia->BC<0Lg{tXeJJ=-th1p7Ykjp`@@Q3U>%5%AZCI6Xd1hIEwEVCkSLI06v$ zj{rfTw&FL4#zUG6=_sevLj~NFC^toT!~i!Zc|6ohhIEuuZq5)MJ`m1~@PvY3b{an( zs52xvjp`@@Q3S?Ez)znFmScIQX9sUTzgwp3H8gw)p`voqURcHp5_(Z zR;{qd=eiun%9h(&cDHE^W|W#X$M!VSHVT1(sT-uSx5u<~XRy^N+PWLqrg(=aiBd+1 z4G%XqtW3lk8=FTG@!>U%4T<>bRS%7fNaF0e`gOZ9hpoKroZt>1Tm;y(F%F%)<&EW* z+W2imMJhYMz4@x_jWo4No~HJsd;9jt8D(aPUb}O^GacLAZ4_Lh8Kv4K_crAmdq=_W z`+IVZRm|INMwyY*tX$F3Jfp?3Qsyy(WYuo2;8@lU$2I+7defdUo5U8as5{y(^acwwcFCNhNb8dpQm|^toD?6{FN=Ca6^r(rgKg{PcFKltff^|_xsas z)m*Q0z_96+E{AhJLVbO1zg93h2MK_obTdhVPfBv%s6#hBC+MVTY$q>z{oz`4J@8>( zY;LuhQoBXvGcltmrd=`#^z>Od_QksLr>RRWJo&1iCKSz{L`6YAS1F?QAPM zzzS@bonp_iGwdAuh+Se|uy5Fp>^l1mz+_06iYnA#9u^^i2hoIPtU)U}u@k$H!d~>l z#38sC!Z8fvIG)4_JcUy@jc4%^Ucsw4gE#Ot&fz@X!TY$3Pw*)|$2EM5@9;gY<9Gal z8^R=Ejt~>(3JZmVuv}OnGzrbZT49~AUFa0jf+idi9ASt%Ae0krALq-paFkl%vO$R! zUi%4W@1AJ2k8a$wdCPw%(XLMCsWtn)Iq}8I>Q^^!Xt@bNj@dFyZwG&X_&f3>Kzx9R zF=)NQb5NdN&d;&Q*iETo42gcmDpR=jLV1x$siI8c>=JpYNJ*kh=4_&Ng-B_s2mvdv ztX(Bh@+lRZP1H6?q5{sWmDfv@hDs%8RXHh13JaLpw%QJnQb`g2E{tDg*Vqs2XLf@y zJ{_|V!xA(QvLD7qY$t5{$nM5|WS}7n9eLOoz!5_Eag5+`jN%ELB$S`V(|88Y;|08k zm+=~2C#1iLw+QF&;sV~o2lx<|@NtOvuLNO-d090r}*_2hD)h}Z8`Qql9UmD zr}90?RdBCj{`tRS;`{%5()Y-zC<0Lgcmz<{o@#HU_C#x+f7XuEbATSd_mSQ6JPW_SPq literal 0 HcmV?d00001 diff --git a/internal/cmd/render.go b/internal/cmd/render.go index 009f8da..3be5c38 100644 --- a/internal/cmd/render.go +++ b/internal/cmd/render.go @@ -6,42 +6,31 @@ import ( "github.com/alecthomas/kong" ) -// Функция создания флагов и рагументов -func getNewCmd() *CMD { - return &CMD{} +// Структура CLI +type CLI struct { + parser *kong.Kong + cmd CMD } -// Функция создания парсера -func getNewParser() *kong.Kong { - return kong.Must( +// Создания экземпляра CLI +func NewCLI() *CLI { + c := &CLI{} + + c.parser = kong.Must( + &c.cmd, kong.Name("mftecmd"), kong.Description("Utility for processing $MFT, $J, $LogFile, $Boot, $SDS"), kong.UsageOnError(), ) + + return c } -// Структура CLI -type cli struct { - parser kong.Kong // Парсер - cmd CMD // Аргументы -} - -// Создания экземпляра CLI. -// Возвращает указатель на экземпляр CLI -func NewCLI() *cli { - return &cli{ - parser: *getNewParser(), - cmd: *getNewCmd(), - } -} - -// Метод запуска CLI. -// Возвращает cmd - экземпляр структуры аргументов и ошибку -func (c *cli) Run() *CMD { - var cmd CMD +// Метод запуска CLI +func (c *CLI) Run() *CMD { ctx, err := c.parser.Parse(os.Args[1:]) c.parser.FatalIfErrorf(err) _ = ctx - return &cmd + return &c.cmd }