From 3f54bd1a04625d13fd700a932f1ad62a113cd4c2 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 25 Jan 2025 10:27:33 +0300 Subject: [PATCH] fixed bug --- README.txt | 2 +- config.h | 6 +++--- img.c | 20 ++++++++++---------- logo.png | Bin 4283 -> 784 bytes style.css | 32 ++++++++++++++------------------ 5 files changed, 28 insertions(+), 32 deletions(-) diff --git a/README.txt b/README.txt index cec4d0b..a67a9fa 100644 --- a/README.txt +++ b/README.txt @@ -4,7 +4,7 @@ Performance: 11 sec when processing a 564kb database containing - 1685 rows on orange pi 4 lts (cpu freq: 816Mhz) + 1685 files on orange pi 4 lts (cpu freq: 816Mhz) And 5sec at 1.8GHz diff --git a/config.h b/config.h index 867865e..36937fe 100644 --- a/config.h +++ b/config.h @@ -1,12 +1,12 @@ /* Absolute path to */ -#define ROOT "." +#define ROOT "8img_dir" #define DB ROOT"/db" /* Html generator */ #define CSS "style.css" -#define LOGO "logo.jpg" +#define LOGO "logo.png" -#define DESC "from outer space" +#define DESC "-> from outer space" #define TITLE "8img gallery" #define POST_PER_PAGE 5 diff --git a/img.c b/img.c index 3329311..8fc0f44 100644 --- a/img.c +++ b/img.c @@ -189,7 +189,7 @@ struct DB_STR *new_db_value(char *str) { *ptr = '\0'; for (size_t i = 0; i < strlen(tok); i++) - if (tok[i] == ',') + if (tok[i] == ',' && tok[i + 1]) db->size++; size_t allocated = 0; @@ -256,14 +256,14 @@ RDB_CLOSE: } struct DB_STR *build_html(FILE *fp, const char *file, const struct UNIQ_TAGS ut, struct DB_STR *db, const size_t page, const size_t pages) { - fprintf(fp, "\n\n\n%s\n\n\n

%s
%s/p%zu

\n
", CSS, TITLE, LOGO, DESC, file, page); + fprintf(fp, "\n\n\n%s\n\n\n

%s
%s/p%zu

\n", CSS, TITLE, LOGO, DESC, file, page); /* Tags */ - fputs("\nall", fp); + fputs("
\nall", fp); for (size_t i = 0; i < ut.size; i++) - fprintf(fp, " %s", ut.tags[i], ut.tags[i]); + fprintf(fp, " %s", ut.tags[i], ut.tags[i]); - fputs("\n


\n", fp); + fputs("\n


\n", fp); /* Images */ size_t images = 0; @@ -282,9 +282,9 @@ struct DB_STR *build_html(FILE *fp, const char *file, const struct UNIQ_TAGS ut, } } - fprintf(fp, "%s
", p->filename, p->filename, p->filename); + fprintf(fp, "\n%s
\n>", p->filename, p->filename, p->filename); for (size_t i = 0; i < p->size; i++) - fprintf(fp, " %s", p->tags[i], p->tags[i]); + fprintf(fp, " %s", p->tags[i], p->tags[i]); fputs("\n


\n", fp); @@ -294,7 +294,7 @@ struct DB_STR *build_html(FILE *fp, const char *file, const struct UNIQ_TAGS ut, break; } - fputs("\n
\n", fp); + fputs("
\n", fp); for (size_t i = 0; i <= pages; i++) { if (i == 0) { if (i == page) @@ -317,7 +317,7 @@ struct DB_STR *build_html(FILE *fp, const char *file, const struct UNIQ_TAGS ut, } - fprintf(fp, "\n
\n
\n\n\n"); + fprintf(fp, "\n\n\n\n"); return p; } @@ -331,7 +331,7 @@ void build(const char *file, const struct UNIQ_TAGS ut, struct DB_STR *db) { while (p != NULL) { struct DB_STR *i = p->next; - if (count == POST_PER_PAGE) { + if (count > POST_PER_PAGE) { count = 0; pages++; } diff --git a/logo.png b/logo.png index 93eecb4be7f4ecbaf97241adbbaee35343638a0f..fd18ed168d85594df4940624a10adfa501538eab 100644 GIT binary patch literal 784 zcmV+r1MmEaP)Px#1am@3R0s$N2z&@+hyVZrx=BPqRCt{2TfKS0Fc3ZRWd%lH0S2I>rJ;d315hyq z6$4Nw4Gk?_24De?;31Mqjx2Q2>BqkJ;k*tT$GUg_cVyN!w;!4?-n0*(jrWp=m+J$2 z?{Pnu{OQp!%W;8_;4aXKNFpFba2KdVhzalsZws|tAL#h8?LMC_*WmY2Ac_I5@F79= zyH)SAO~i72fFmJFK#K4-Y$A|JNJ@h_2jA~jJ=Z`(kN{izC0cVyC<&&uA+mrPCW~qb zECEAn3B?Mc7Em)_AzH!Ydx6Olz*d4|_$Wd>5G{nHhjdHf5PW5_7K++oAKX&d2P6X6 z7+^I2`Sm@>ixJG9NDu^1mupoLQ1ZV)kbt4Igra>SVH&Ju1!&qQN~i=&Nif1AX`d*u z8OkLARd}MznV`w{p>$@1MHZeYV=A2E$Ed;+6%IvHfk=cX2Gok)h*=WlW zHNo}*oba)O`+5N%87R|XaWj;9SSbELdnX?RpIpG0V~#23fD6916|~Lm z>6*E2u9@%np6Adux4s2vxk2ssrnpe`AXp2wc70mrVujCgxcfv*C0KhS%po=rYMYx^ z2y-t4>2qul9GZk0g;$IO38L-rkR)iQUZOw@c-+rDE!D~jXuHB-5Huv%m0AfAXu=Z- zexxQidw9-CzxHB-p|6B`qMON%{pBvwEIUzWVe4 O0000lr>AxtAE(uyKA>o z#8apBWbdk_?(3acmOdd?@Y-qJoTjFgEwAspMz=g`ISUi}67H-hUUcR0y(X0^;Q?r~ zxg9p!U_vO3hCSO`9zO1#v8nysM_d2-qG^lmSD(5(sfmX&?@d2Z)EV26nl`iU{@NWq zbN`)smz;l3XJN1~c)R_>&d&5FOnnPBhx>oLoPs};^l|Gt6)aFUUs+J{T=TVW=a#S? z+HbJ*TgR^M`6#+{O-s$O?`jHfbw7V#`bn_3W~aU8qZ0Z#nBP_~Kem_jju<9c~~yj(fXm(vs9x_?P#nsZZza-0;lP z4`;&6mo7g}tBw2fT-we1_vO9;-??<~mZh=gE2@5{ExSv6&n6l4h^5{YOdv{nrH2+C|W6QqvN>2QR=!&L!^i{gRs zLYX4YVFzJ81cMS31DMRodBh6Is?nfvY%o55(CHka4}=F)Kza~SE=W*XlJNV9ku$P-}_H|xm}bOj(3M*SvJQlyqI$;0knAxbnBoU{zNC}c>~FKjWkYrjRsUcFTg#3r*PT;1U*ga3|>!M)gkt<=#?T| z2xRz>jz}xior+f2V!426qeF?50l7LzFPt>u!+KEzdJzNp67r5Qn6QQTA4x0q0vrF|-v9NQT1wC4U2@_$6In*tnB1={qjhxLjjWU`*ig?i!bCObUz%Jl1>S>KD-n#O{iF03X zTz>xgk(&*l|GlsNRL<@n+-u%%rs!uYFETd~iSJh|J zH>Pdq?47Be55C{gUD9yLWnQuK$&U}Hk33MjEw5zFmd$5Bm@MR+`E}1Xv6|a?ceHJm y@27ow;B)n>!9Ul2SrO@fz3%FZo93nVzucd21G-_PY2qU&OO+$bWpB