From 809f1e4004d480e7cc1d05f4eeacc2b38fbe0782 Mon Sep 17 00:00:00 2001 From: mpabi Date: Fri, 24 May 2024 16:12:13 +0000 Subject: [PATCH 1/4] alg need be fixed !!! --- cpp/_rvmain.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp/_rvmain.cpp b/cpp/_rvmain.cpp index 375bdbd..20795b1 100644 --- a/cpp/_rvmain.cpp +++ b/cpp/_rvmain.cpp @@ -62,7 +62,7 @@ bool is_delim(char c, const char *delims) { // Najprostsza implementacja funkcji strtok char *simple_strtok(char *str, const char *delims) { - static char *static_str = (char *) NULL; // Przechowuje wskaźnik do bieżącej pozycji w ciągu + char *static_str = (char *) NULL; // Przechowuje wskaźnik do bieżącej pozycji w ciągu // Jeśli przekazano nowy ciąg, zaktualizuj static_str if (str == NULL) { @@ -117,7 +117,7 @@ int alg (char * ptr) { int pos = 0; - while (char *token = simple_strtok(ptr, delims)) { + while (char *token = simple_strtok(ptr+strlen(ptr), delims)) { p[pos].ptr = token; //p[pos].len = strlen(token); @@ -152,7 +152,7 @@ int main() { } } */ - alg(str); + int w = alg(str); asm ("nop"); return 1; From 8190fc9684cec488e53f19280141f0002a38758b Mon Sep 17 00:00:00 2001 From: mpabi Date: Sat, 25 May 2024 08:38:43 +0000 Subject: [PATCH 2/4] update --- cpp/_rvmain.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cpp/_rvmain.cpp b/cpp/_rvmain.cpp index 20795b1..bca60c5 100644 --- a/cpp/_rvmain.cpp +++ b/cpp/_rvmain.cpp @@ -117,11 +117,13 @@ int alg (char * ptr) { int pos = 0; - while (char *token = simple_strtok(ptr+strlen(ptr), delims)) { + while (char *token = simple_strtok(ptr, delims)) { p[pos].ptr = token; //p[pos].len = strlen(token); p[pos].len = pos; + + token = token + strlen(token) + 1; ++pos; } From a7089d248ff6e5d791e5bcfd1924ea6ef1ceb708 Mon Sep 17 00:00:00 2001 From: mpabi Date: Sat, 25 May 2024 16:39:06 +0000 Subject: [PATCH 3/4] retire #define, first step :) c++ approach --- cpp/_rvmain.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cpp/_rvmain.cpp b/cpp/_rvmain.cpp index bca60c5..bd83114 100644 --- a/cpp/_rvmain.cpp +++ b/cpp/_rvmain.cpp @@ -11,6 +11,16 @@ void strcpy(char *s, char *t) { while (*s++ = *t++); } + +class GamePlayer { + + private: + + static const int NUM_TURNS = 5; + int scores[NUM_TURNS]; + +} c; + #define ALLOCSIZE 10000 static char allocbuf[ALLOCSIZE]; @@ -105,7 +115,6 @@ char *simple_strtok(char *str, const char *delims) { char buf[1000]; struct model * p = (struct model *) buf; //p[1] - // ////func alg From 10c1866b333b0316b4bdba439674607d1ab7d3bf Mon Sep 17 00:00:00 2001 From: mpabi Date: Sat, 25 May 2024 16:50:41 +0000 Subject: [PATCH 4/4] remove extra files from 'tracked files' --- conf.json | 16 ------ cpp/._rvmain.cpp.swl | Bin 12288 -> 0 bytes cpp/._rvmain.cpp.swm | Bin 12288 -> 0 bytes cpp/._rvmain.cpp.swn | Bin 12288 -> 0 bytes cpp/._rvmain.cpp.swo | Bin 12288 -> 0 bytes cpp/Make.rules-kopia | 81 -------------------------- cpp/_crt0.S-k0 | 42 -------------- cpp/_crt0.S-k1 | 39 ------------- cpp/murax_128k_ram-sp.ld | 43 -------------- cpp/murax_128k_ram.ld | 67 ---------------------- cpp/murax_128k_ram.ld-kopia | 13 ----- igit-borys.py | 111 ------------------------------------ 12 files changed, 412 deletions(-) delete mode 100644 conf.json delete mode 100644 cpp/._rvmain.cpp.swl delete mode 100644 cpp/._rvmain.cpp.swm delete mode 100644 cpp/._rvmain.cpp.swn delete mode 100644 cpp/._rvmain.cpp.swo delete mode 100644 cpp/Make.rules-kopia delete mode 100644 cpp/_crt0.S-k0 delete mode 100644 cpp/_crt0.S-k1 delete mode 100644 cpp/murax_128k_ram-sp.ld delete mode 100644 cpp/murax_128k_ram.ld delete mode 100644 cpp/murax_128k_ram.ld-kopia delete mode 100644 igit-borys.py diff --git a/conf.json b/conf.json deleted file mode 100644 index a059d03..0000000 --- a/conf.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "user": "borysr", - "email": "borysr@gmail.com", - "remotes": [ - { - "name": "r", - "protocol": "http", - "domain": "qstack.pl", - "port": "3000", - "token_name": "t", - "token": "8ee3f1b7980197aeceadee3cf4d980f817d44f06", - "group": "1i-2023", - "project": "homework" - } - ] -} \ No newline at end of file diff --git a/cpp/._rvmain.cpp.swl b/cpp/._rvmain.cpp.swl deleted file mode 100644 index 1080c395311c7737c4867a39fcbc7f858bcef4c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2U2Ggz8HP{zcYi2Qgs4Q(@dlc;*X(YbgrspDgrXD$Od1JVq{P9DXUFmE&dv-o zvsrd6LoXT?@l&p71u3W!2!R9=kPD)Ms6_3HqM}HF3UUS9Py|K2fZT9Xp6{HQ?An9` zDOZIV>se>coS*l+-#6zRE4$o$=;%lFz4fNzdW%w*+YhX?(?zxGR;7BWmq_uAuKlx~ zGu!m`+`D&q-}UN#Ryu6-qomVtO0@|;LUeg_E0)dI#4=LI#4=LI#4=LI#4=LI`FD-Ad7dX&!P4;x#F+pzjti=o!^$f zN(V{@N(V{@N(V{@N(V{@N(V{@N(V{@N(V{@UWE=gEv0_UAOG)uJ>vQQ|Kjiem+nyN zukZqFzz^UlcnrP-UxWyj;6rc(4nrN@0dI#p;mVtp`a4{P-@-HSb9fTgU||bfZt3oZ@2*G zVGS1H5FCL0@J{&0o0NJPF2UpQFbrV;Rd_30d81Olhs*FgxBySVH{l!bBzzf8!ErbM zcY}gg-oSj|m+%~X8@>f!fycmsPr-dK2Y12CP zSueS9#sA?N;=%g5x~UoFK8AYt9C^&;q+MODgi&0XnzIGL>1vuK+?iW<)k*X;1$tgr zj;`pw6J}oGwRGYIPUc6U4kMlRk~r~GPe&`-34#i3{V>z=O{nUWUeijgUme(udSOO| z35q7nO|51}7CBke@j`}5{caq1ON>iNwQ5yN9eZ$LVMe#S!0)CAoR}~YrJY>yNz>h_ zdSJWA68=#&J?3+>^~P%2d6_EteEX|@;Az`RPtNP{p_vN0t(I#GUGA-T$(TYlfe#0k zGOdj?Cf1axyHS{C+ID1TBkt;%`s4==&Mk(EnK(FsI5!?t^F9k9v5AdUVIH0Q;KITK zhd*}o#F10965pNRG`h#e(9#I;jfQ!P!h;xL1rad5zt&25M%fmbtVOzDZxX}30?)}1KyJ-4t$rlI6xEGw<07%*~UF|d3<`F7#PRomTO)K@h^?6KaZfPq@hk?I&t~=1J2-Ta9xQ=%HjkBkF7@LP#`Ze;+ z$MwQ{ZTJ3L^NvSdpE%}O)rtDvSe(t+6~O5sj7*b?x!7x)G-+~Y&lXiIXP+imNb=Wcq+#HyQgt7^l0snreV|{SUV+6|8quK zy?J_U5x+IKBJnugyQ@)O)QQZ^r$fIZ(Oc#%_}Ru;*K1?paNxFm-Opob-|^|K>$Ocr zrZU4avwf+PX))L_ryVCznx#WWo5jBCg_+~F9nEsnks)Z$D!XmbSaE{X+itpDL&sNw zQ9v|TvEU@Vyr~q5+pc&$ZJQT%7nwFHU5=taUrjYLIrlm9>fT@6dKQkTs{n%ECs_-#o{v*BYhdv*-I*q}0xqx8jGM$p&4mo{9X{^ptK+arAG9 zhsMCI_W5F;Th~K^wj9(ku_Yf#)S)(`_6VQf)B1Fr?Wymh6Is{s*jn0S``9xp`<2$R zi`r5fPAQXxmz3vYwC1mkbS@k@rmF{Pvs2T2DU&@Q@kFBQrD?<$uMy0A>iPCT>JQx2 zBDzJ0*dEO=>)IpEc4;e~ak7ZqSiet)bNPe3q&82HZ6`rBrR+Mormt>|w8|?VqB5c8 zOk!G$5+&61vzLn1P`_92&5sPyp}CjCK+`r{%ah*pSd|@@9y#Wl%_o1=^3mq)ux3-- zQlStzzI)S05%H05w$5fV-#B%Vn`y1a@-v;)YRFtuk{A*hIWFYy9yw-CZW+m9=hz>} z+bp|+oQqg#>MsT9alKtE3 zZr$xAaA_VTLL3)wYcZu*43;f>%EZMAkP`-t#9}MEn4Y|>YNsE%L9gZM`^a+Y)K?Fw Fe*yJzWu*WB diff --git a/cpp/._rvmain.cpp.swm b/cpp/._rvmain.cpp.swm deleted file mode 100644 index ee08e76f78961876ed0fed3da5cfdf4038170c34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2zfTlF6vqcEe<4II)L0Bh47<1d*gfDP;*k(SL4vU$U=)QcdwXHw*xT&x0p|s+ zETr&nFn0bZv`|WkwT-d#M}x7^!a`%Bg??vljynj!f{OSy`LMTdXWqQ`ncd=Y%$O4+ zmv~>N#c(t;Hq@HTrB}b5Y(B_XF>*r@{?}od*`99Kae7U+cek;(M8dA6LO9>$1c78a zTwJg{zZ2KH&7^x|fDG*2K;w9K$}&Zs)fDDiUGVuQySYaGT z=*Gp+=T<+Hmm;JkgE$=1J4+cJ#bMs{xfWQup)Rx_rPmF%qXjMD7lH(WVzM~I^p1g2 z##~OB+oQ{fT6IyZP;_D*6g)rX$;w=w;o8=?&h31@;AoL|(=FsQIa=5Id9CP`+CriP zWV6!KF)!^LUap0=EL5%~+^I2)b%GLfq}oN3LWEdM9L}sA%KB5NUKK0lX>#C}T6axt z$<)?PsjVGSTNMq$p7@t(P3Ig7 zUXE)rI#bMXgAb05ULG17xi*YhYVZIC>%5HpkTcZsNau6p>A^tF=jV8j>PjS(*Ssae z&C0|wt0 zFRVvOabOtgQ#ErS+_YUc+jJ(IsH6+98s?Ol5QK&Bc2*Zc{>_IF&n5;Y<_k-9KAQKu iM1TD~@f;=QY~P(noV9wslP_jneld!(NZUC(!2SZ9@K1IC diff --git a/cpp/._rvmain.cpp.swn b/cpp/._rvmain.cpp.swn deleted file mode 100644 index d0b40fbbb6019a04fa7498f224d80ed3cebe972b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2!B5jr9LFD+=s{4U-qi5eFtjVMbJA?p z(HX`m#H$=kps_QSMP0x#%_g9t; z+Zn<6emiN743L3?8|Y=1vU*13NhbRFnbY?Uo{}<<0Wv@a$N(8217v^0i(=V-*LvS^q_eB z{y!mm_;r%8pWrii2i}60;01UJ>c9naU=}<81uzEszy)v~oC8NdH~4;nu@B%qcnw~G z=U@wXU=f(01hRmGW8iNuY608e2lxuUfH&Y7*aRD328@CMkOV#85BmBBK7o(m38;a2 za2wnLQ{X1J3Pyo&kq0!$02v?yWPl8i0Wv@a$N(9L4XiVc;ag$Nceq{wVjZs;=R1cmECcb8`Y|7DuMmj zaw|%-T2%|YRmXbkLZS?0)AREouXhfwwZgkD)MzE_)EL&9UY#pmc1SdtZR^=wF#M?g zEUK5qhJMv@lxX3uTK7$@N2&Ersr3%2^;mR zi%RwQFn3@xnvfB#h)^7{D_n`9rCNn+{QC6t-5WDgvy<2*7ms7H${X^2q|(toSpO$O|EV{4IJt!~>RCa#xLN iuw*9+?Nj0bNh}%;qAY1UX0=wf__ZJ`Bj?D%IQs_$gEi&= diff --git a/cpp/._rvmain.cpp.swo b/cpp/._rvmain.cpp.swo deleted file mode 100644 index afb7b4f5d5178c0e319ad1b35eda4e5ab73a16e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2&u`mg7{}jo07mHwlt18U3agWBNt{w>6;d&+MHGg1n8tx_4A*g}6UR2TQ#Xyu zkk~Y7hm8p|Y2pBvapJ}#*mhipgtT2a@FyU|&vN6yf$wWORR~=Z6$xq5^GcuEexDzH z{Cyr*t&-)!8;h^gY_1@%o)F^4`Be36YwPJhzj|0SeZ!O6{nopFpy~B~UP8Pl6Xrw5 ztLJq!ue)xYZmnRX7>{Zp_9E5HiuMS*5eJv1|NVydV{ulhu4oW`Cyv6oC7!wRqh ztN<&(3a|pK04u->umTUL0)aau&Y<>(lKP)Zjzc}iumY?AE5Hh{0;~Wl zzzVPetN<(U04ktWgiwa@(f{Kp9-ser{{R1FREVF!H{f${4O|A7zy>hD5_ko?3>Ls7 zcoqzUec(~>2>5-!5Wj)zU=4)eB`^p68WG|runDe#E8t`B5jY3Vf)Bu3U>3}PNw9@_ ze*m9>3*c=~1{v@S7zbnENg$u?J3QmJ;1;+Ez5t(s%iu%sKB$3tkOJf2*T;mo0lo&8 zz(w#HcomF-KlY&x@IAN(?gCz{04u->umY?AE5Hi;zY1&!BF_k#qI2Teq?Yj4n8@d8 zIyWt=xvz<^cDMSW=AL!~kCX$AwS#n^(Mp$OW-LGKlX=%z%_T)<96ZP1o?Vsh<>>~v z(O_wJ_Uhg3yf?g~me^2V*8^sz|uklq#dQZG{rH z3h~wk8J2HQK10i%R;Pw()O=l|OkPlNHg=I?iHw?MIl4=S$Sz5Dd~?_{$c;T`V$Z}S zTZRwfUx;_jDk+g=xml$w9X@*W*pcIlZ!REJ5-^8=G__?~6maJg-6Y@Kyc*|z9tJF- zuV@}+q6o#b0~rDT_0ZE$Z|K*xJ2!2!P8El2TDP_O?JvV90nt*Zz2m^97EcyV34vsB zE^>=hj%y&r4?N4TNx@4}OsBh@)E%8vI0+#Ok>7z<(nRgJ6G)#ZCUur;7mcO4zrNDz zpW4cu|D8V!Z diff --git a/cpp/Make.rules-kopia b/cpp/Make.rules-kopia deleted file mode 100644 index 2bd12e9..0000000 --- a/cpp/Make.rules-kopia +++ /dev/null @@ -1,81 +0,0 @@ - -ARCH=riscv64-unknown-elf -GNU_DIR=$(HOME)/riscv/riscv/ -GNU_BIN=$(GNU_DIR)/bin - - -CC=$(GNU_BIN)/$(ARCH)-gcc -CXX=$(GNU_BIN)/$(ARCH)-g++ -AS=$(GNU_BIN)/$(ARCH)-as -LD=$(GNU_BIN)/$(ARCH)-ld -OBJCOPY=$(GNU_BIN)/$(ARCH)-objcopy -OBJDUMP=$(GNU_BIN)/$(ARCH)-objdump -SIZE=$(GNU_BIN)/$(ARCH)-size -AR=$(GNU_BIN)/$(ARCH)-ar -RANLIB=$(GNU_BIN)/$(ARCH)-ranlib - - -CFLAGS+=-ffreestanding -CFLAGS+=-fno-pic -CFLAGS+=-march=rv32i -mabi=ilp32 -CFLAGS+= -g - - -LDFLAGS+=-nostdlib -LDFLAGS+=-Wl,-Ttext=0x00000000 - -# see: https://github.com/riscv/riscv-gcc/issues/120 -#LDFLAGS+=-Wl,--no-relax - - - -ASFLAGS+=$(CFLAGS) -CXXFLAGS+=$(CFLAGS) - -CLEAN_DIRS=$(SUBDIRS:%=clean-%) -ALL_DIRS=$(SUBDIRS:%=all-%) - -OBJDUMPFLAGS+=-Mnumeric,no-aliases - -.PHONY: all clean world $(CLEAN_DIRS) $(ALL_DIRS) - - -%.bin : % - $(OBJCOPY) $< -O binary $@ - -%.lst : % - $(OBJDUMP) $(OBJDUMPFLAGS) -dr --disassemble-all $< > $<.lst - -% : %.o - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(LDLIBS) - $(SIZE) -x -A $@ - -%.s: %.c - $(COMPILE.c) -S -o $@ $< - -%.s: %.cc - $(COMPILE.cc) -S -o $@ $< - -%.o: %.c - $(COMPILE.c) -o $@ $< - -%.o: %.cc - $(COMPILE.cc) -o $@ $< - -%.srec: % - $(OBJCOPY) $< -O srec $@ - - - - -all:: $(ALL_DIRS) - -clean:: $(CLEAN_DIRS) - -$(ALL_DIRS):: - $(MAKE) -C $(@:all-%=%) all - -$(CLEAN_DIRS):: - $(MAKE) -C $(@:clean-%=%) clean - -world:: clean all diff --git a/cpp/_crt0.S-k0 b/cpp/_crt0.S-k0 deleted file mode 100644 index dbe07d9..0000000 --- a/cpp/_crt0.S-k0 +++ /dev/null @@ -1,42 +0,0 @@ - .text - .global _start - .type _start, @function - -_start: - # Initialize global pointer - .option push - .option norelax - la gp, __global_pointer$ - .option pop - - li sp, 0x1fff0 - - # Clear the bss segment - la a0, __bss_start - la a1, __BSS_END__ - -clear_bss: - bgeu a0, a1, finish_bss - sb x0, 0(a0) - addi a0, a0, 1 - beq x0, x0, clear_bss -finish_bss: - - nop //! - - call main - - nop //! - - # abort execution here - ebreak - - .section .rodata -alfabet: - .string "abcdefghijklmnopqrstuwxyz" -slowo: - - .section .data -wynik: - .string "mpabi" - .space 26 # rezerwuje 26 bajtów dla wyniku, zainicjowane na 0 \ No newline at end of file diff --git a/cpp/_crt0.S-k1 b/cpp/_crt0.S-k1 deleted file mode 100644 index 09af34b..0000000 --- a/cpp/_crt0.S-k1 +++ /dev/null @@ -1,39 +0,0 @@ - .text - .global _start - .type _start, @function - -_start: - # Initialize global pointer - .option push - .option norelax - la gp, __global_pointer$ - .option pop - - # Initialize stack pointer from linker script symbol - la sp, __stack_top - - # Clear the BSS segment - la a0, __bss_start - la a1, __bss_end - -clear_bss: - bgeu a0, a1, finish_bss - sb x0, 0(a0) - addi a0, a0, 1 - j clear_bss -finish_bss: - - call main - - ebreak - -.section .rodata - -alfabet: - .string "abcdefghijklmnopqrstuwxyz" -slowo: - - .section .data -wynik: - .string "mpabi" - .space 26 # rezerwuje 26 bajtów dla wyniku, zainicjowane na 0 diff --git a/cpp/murax_128k_ram-sp.ld b/cpp/murax_128k_ram-sp.ld deleted file mode 100644 index b3ac278..0000000 --- a/cpp/murax_128k_ram-sp.ld +++ /dev/null @@ -1,43 +0,0 @@ -MEMORY -{ - RAM (wx) : ORIGIN = 0x0, LENGTH = 128K -} - -SECTIONS -{ - .text : - { - *(.text*) - *(.rodata*) - } > RAM - - .data : - { - *(.data*) - } > RAM - - .bss : - { - *(.bss*) - *(COMMON) - } > RAM - - /* Add stack at the end of RAM */ - . = ALIGN(4); - _end = .; - PROVIDE(end = .); - - /* Define stack size and location */ - _stack_size = 0x4000; /* Example stack size: 16KB */ - _stack_end = ORIGIN(RAM) + LENGTH(RAM); /* End of RAM */ - _stack_start = _stack_end - _stack_size; /* Calculate start of the stack */ - .stack (NOLOAD) : - { - . = ALIGN(4); - . = . + _stack_size; - . = ALIGN(4); - _sp = .; - } > RAM - - PROVIDE(__stack = _sp); -} diff --git a/cpp/murax_128k_ram.ld b/cpp/murax_128k_ram.ld deleted file mode 100644 index 244668e..0000000 --- a/cpp/murax_128k_ram.ld +++ /dev/null @@ -1,67 +0,0 @@ -/* Linker script for a system with 128KB RAM starting at 0x10000 */ -MEMORY -{ - RAM (wx) : ORIGIN = 0x0000, LENGTH = 128K -} - -SECTIONS -{ - /* Place code and readonly data at the beginning of RAM */ - .text : - { - *(.text*) - *(.rodata*) - } > RAM - - /* Place initialized data right after the .text section */ - .data : - { - . = ALIGN(4); - *(.data*) - } > RAM - - /* Uninitialized data (BSS) follows initialized data */ - .bss : - { - . = ALIGN(4); - __bss_start = .; - *(.bss*) - *(COMMON) - . = ALIGN(4); - __bss_end = .; - } > RAM - - /* Define heap start right after bss */ - . = ALIGN(4); - __heap_start = .; - PROVIDE(heap_start = __heap_start); - - /* Leave space for the heap by not explicitly defining its end */ - /* The heap grows towards the stack */ - - /* Reserve space for the stack at the end of RAM */ - /* Let's say we want a 16KB stack */ - . = ALIGN(4); - __stack_size = 16K; /* Size of the stack */ - __stack_top = ORIGIN(RAM) + LENGTH(RAM); /* Top of the stack */ - __stack_start = __stack_top - __stack_size; /* Start of the stack */ - .stack (NOLOAD) : - { - . = __stack_start; - . += __stack_size; /* Allocate space for the stack */ - . = ALIGN(4); - } > RAM - - PROVIDE(__stack = __stack_top); - PROVIDE(stack_top = __stack_top); - PROVIDE(stack_start = __stack_start); - - /* Heap end is dynamically located at the start of the stack */ - __heap_end = __stack_start; - PROVIDE(heap_end = __heap_end); - - /* End of RAM usage */ - . = ALIGN(4); - _end = .; - PROVIDE(end = _end); -} diff --git a/cpp/murax_128k_ram.ld-kopia b/cpp/murax_128k_ram.ld-kopia deleted file mode 100644 index 6488ff3..0000000 --- a/cpp/murax_128k_ram.ld-kopia +++ /dev/null @@ -1,13 +0,0 @@ -MEMORY -{ - RAM (wx) : ORIGIN = 0x10000, LENGTH = 128K -} - -SECTIONS -{ - .text : { *(.text*) } > RAM - .rodata : { *(.rodata*) } > RAM - .data : { *(.data*) } > RAM - .bss : { *(.bss*) } > RAM - _end = .; /* Definiuje koniec sekcji danych, może być używane do określenia rozmiaru sterty */ -} diff --git a/igit-borys.py b/igit-borys.py deleted file mode 100644 index 8c226d8..0000000 --- a/igit-borys.py +++ /dev/null @@ -1,111 +0,0 @@ -import argparse -import json -import sys -import subprocess -import os -from datetime import datetime - -DEFAULT_CONFIG = { - "user": "borysr", - "email": "borysr@gmail.com", - "remotes": [{ - "name": "r", # Zaktualizowano z "default" na "mpabi" - "protocol": "http", - "domain": "qstack.pl", - "port": "3000", - "token_name": "t", - "token": "8ee3f1b7980197aeceadee3cf4d980f817d44f06", - "group": "1i-2023", - "project": "homework" - }] -} - -def load_or_create_config(config_file, args): - config_exists = os.path.exists(config_file) and os.stat(config_file).st_size != 0 - if config_exists: - with open(config_file, 'r') as file: - config = json.load(file) - else: - config = DEFAULT_CONFIG.copy() - - # Znajdź istniejące zdalne repozytorium o podanej nazwie - remote = next((remote for remote in config['remotes'] if remote['name'] == args.remote), None) - - # Jeśli istnieje zdalne repozytorium i podano argumenty związane z konfiguracją zdalnego repozytorium - if remote: - for field in ['protocol', 'domain', 'port', 'token_name', 'token', 'group', 'project']: - # Aktualizuj tylko, jeśli argument został jawnie podany - if getattr(args, field, None) is not None: - remote[field] = getattr(args, field) - - # Jeśli zdalne repozytorium nie istnieje, ale podano nazwę, tworzymy nowe zdalne repozytorium - elif args.remote: - new_remote = {'name': args.remote} - for field in ['protocol', 'domain', 'port', 'token_name', 'token', 'group', 'project']: - new_remote[field] = getattr(args, field, DEFAULT_CONFIG['remotes'][0].get(field, '')) - if new_remote[field] == None: - new_remote[field] = DEFAULT_CONFIG['remotes'][0].get(field, '') - config['remotes'].append(new_remote) - - # Aktualizuj informacje o użytkowniku i email, tylko jeśli zostały podane - if getattr(args, 'user', None): - config['user'] = args.user - if getattr(args, 'email_domain', None): - config['email'] = f"{args.user}@{args.email_domain}" - - # Zapisz zmodyfikowaną konfigurację - with open(config_file, 'w') as file: - json.dump(config, file, indent=4) - - return config - - -def init_git_repo(config): - user_name = config['user'] - user_email = config['email'] - branch_name = f"{user_name}-{datetime.now().strftime('%Y-%m-%d')}" - - if subprocess.run(["git", "rev-parse", "--git-dir"], stderr=subprocess.DEVNULL).returncode != 0: - subprocess.run(["git", "init"]) - subprocess.run(["git", "config", "user.name", user_name]) - subprocess.run(["git", "config", "user.email", user_email]) - subprocess.run(["git", "checkout", "-b", branch_name]) - print("Git repository initialized.") - else: - print("Already inside a Git repository. Skipping initialization.") - - remotesFromList = str(subprocess.run(["git", "remote", "-v"], capture_output=True).stdout) - remotesFromList = remotesFromList.replace('b\'', "").replace('\'', "").split('\\n') - for rm in remotesFromList: - name = rm.split("\\t")[0] - subprocess.run(["git", "remote", "remove", name], stderr=subprocess.DEVNULL) - - for remote in config['remotes']: - remote_url = f"{remote['protocol']}://{remote['token_name']}:{remote['token']}@{remote['domain']}:{remote['port']}/{remote['group']}/{remote['project']}" - # Usunięcie i ponowne dodanie zdalnego repozytorium, jeśli jest zaktualizowane - #subprocess.run(["git", "remote", "remove", remote['name']], stderr=subprocess.DEVNULL) - subprocess.run(["git", "remote", "add", remote['name'], remote_url]) - print(f"Remote '{remote['name']}' added or updated.") - -def main(): - parser = argparse.ArgumentParser(description="Git repository initializer with custom configuration.") - parser.add_argument("--user", help="User name") - parser.add_argument("--email_domain", help="Email domain") - parser.add_argument("--config", help="Path to the JSON config file", default="conf.json") - parser.add_argument("--remote", help="Name of the remote to add or update") - parser.add_argument("--protocol", help="Remote protocol") - parser.add_argument("--domain", help="Remote domain") - parser.add_argument("--port", help="Remote port") - parser.add_argument("--token_name", help="Remote token name") - parser.add_argument("--token", help="Remote token") - parser.add_argument("--group", help="Group name") - parser.add_argument("--project", help="Project name") - - args = parser.parse_args() - - config = load_or_create_config(args.config, args) - init_git_repo(config) - print("Git repository initialized and configured based on the provided configuration.") - -if __name__ == "__main__": - main()