aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md1
-rw-r--r--auth/config/gelbooru.zsh11
-rw-r--r--auth/gelbooru.zsh8
-rwxr-xr-xbot.zsh2
-rw-r--r--config/gelbooru.zsh72
-rw-r--r--files/help.txt.default1
-rw-r--r--operators/callback_tags.zsh17
-rw-r--r--operators/command_source.zsh1
-rw-r--r--operators/inline_search.zsh26
-rw-r--r--operators/url_parser.zsh33
-rw-r--r--units/ib_auth.zsh3
-rw-r--r--units/ib_authconfig.zsh3
-rw-r--r--units/ib_cache.zsh9
-rw-r--r--units/ib_config.zsh3
-rw-r--r--units/ib_date.zsh5
-rw-r--r--units/ib_file.zsh8
-rw-r--r--units/ib_hash.zsh10
-rw-r--r--units/ib_original.zsh14
-rw-r--r--units/ib_post.zsh29
-rw-r--r--units/ib_search.zsh5
-rw-r--r--units/ib_size.zsh29
-rw-r--r--units/ib_token.zsh4
-rw-r--r--units/sn_search.zsh1
23 files changed, 68 insertions, 227 deletions
diff --git a/README.md b/README.md
index ca94817..04cb558 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,6 @@ Cache modes:
* [Safebooru](https://safebooru.donmai.us/)
* [Danbooru](https://danbooru.donmai.us/)
-* [Gelbooru](https://gelbooru.com/)
* [Idol Complex](https://www.idolcomplex.com/)
* [Konachan.com](https://konachan.com/)
* [Sankaku Channel](https://www.sankakucomplex.com/)
diff --git a/auth/config/gelbooru.zsh b/auth/config/gelbooru.zsh
deleted file mode 100644
index 6637c67..0000000
--- a/auth/config/gelbooru.zsh
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2024-2026 Maria Lisina
-# Copyright (C) 2024-2026 Danil Lisin
-# SPDX-License-Identifier: Apache-2.0
-
-ib_auth=0
-ib_raw=0
-ib_config="gelbooru"
-ib_login_file="user_id"
-ib_key_file="api_key"
-ib_login_word="user ID"
-ib_key_word="API key"
diff --git a/auth/gelbooru.zsh b/auth/gelbooru.zsh
deleted file mode 100644
index d4d6f73..0000000
--- a/auth/gelbooru.zsh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (C) 2024-2026 Maria Lisina
-# Copyright (C) 2024-2026 Danil Lisin
-# SPDX-License-Identifier: Apache-2.0
-
-output_text="Authorization cannot be verified, make sure you provided correct credentials"
-
-printf "%s\n" "${ib_login}" > "${login_file}"
-printf "%s\n" "${ib_key}" > "${key_file}"
diff --git a/bot.zsh b/bot.zsh
index ce1b9ef..6675161 100755
--- a/bot.zsh
+++ b/bot.zsh
@@ -36,7 +36,6 @@ offset=-1
data_table=(
safebooru "Safebooru"
danbooru "Danbooru"
- gelbooru "Gelbooru"
idolcomplex "Idol Complex"
konachan "Konachan.com"
sankakuchannel "Sankaku Channel"
@@ -177,7 +176,6 @@ then
"\n\nSupported Image Boards:" \
"\n Safebooru\t\t(https://safebooru.donmai.us/)" \
"\n Danbooru\t\t(https://danbooru.donmai.us/)" \
- "\n Gelbooru\t\t(https://gelbooru.com/)" \
"\n Idol Complex\t\t(https://www.idolcomplex.com/)" \
"\n Konachan.com\t\t(https://konachan.com/)" \
"\n Sankaku Channel\t(https://www.sankakucomplex.com/)" \
diff --git a/config/gelbooru.zsh b/config/gelbooru.zsh
deleted file mode 100644
index 129996c..0000000
--- a/config/gelbooru.zsh
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (C) 2024-2026 Maria Lisina
-# Copyright (C) 2024-2026 Danil Lisin
-# SPDX-License-Identifier: Apache-2.0
-
-ib_cname="gelbooru"
-
-ib_name="Gelbooru"
-ib_api="https://gelbooru.com"
-ib_url="https://gelbooru.com"
-
-ib_ratings=(
- safe safe
- general general
- sensitive sensitive
- questionable questionable
- explicit explicit
-)
-
-ib_groups=(
- tags Tags
-)
-
-case "${ib_mode}" in
- (p)
- ib_data_url="${ib_api}/index.php"
- ib_dfield1="page=dapi"
- ib_dfield2="s=post"
- ib_dfield3="q=index"
- ib_dfield4="json=1"
- ib_dlimit="limit"
- ib_dpage="pid"
- ib_dquery="tags"
- ib_iarray="post"
- ib_iid="id"
- ib_icreated="created_at"
- ib_isize="deprecated"
- ib_ifile="file_url"
- ib_isample="sample_url"
- ib_ipreview="preview_url"
- ib_iwidth="width"
- ib_iheight="height"
- ib_irating="rating"
- ib_iparent="parent_id"
- ib_ichildren="has_children"
- ib_imd5="md5"
- ib_isource="source"
- ib_itags="tags"
- ib_ioffset=-1
- ib_itzfield="-4,6-"
- ib_idate="%a %b %d %X %Y"
- ib_ifilename="cut -d '/' -f 7"
- ib_url="${ib_url}/index.php?page=post&s=view&id="
- ;;
- (t)
- ib_data_url="${ib_api}/index.php"
- ib_dfield1="page=dapi"
- ib_dfield2="s=tag"
- ib_dfield3="q=index"
- ib_dfield4="json=1"
- ib_dlimit="limit"
- ib_dpage="pid"
- ib_dquery="name_pattern"
- ib_iarray="tag"
- ib_iid="id"
- ib_itag="name"
- ib_icount="count"
- ib_iwildcard="%"
- ib_ioffset=-1
- ib_irecode="HTML"
- ib_url="${ib_url}/index.php?page=wiki&s=list&search="
- ;;
-esac
diff --git a/files/help.txt.default b/files/help.txt.default
index 765457a..c42b43a 100644
--- a/files/help.txt.default
+++ b/files/help.txt.default
@@ -137,7 +137,6 @@ List of currently supported booru-like Image Boards
<code>a</code> - <a href="https://safebooru.donmai.us/">Safebooru</a>
<code>d</code> - <a href="https://danbooru.donmai.us/">Danbooru</a>
-<code>g</code> - <a href="https://gelbooru.com/">Gelbooru</a>
<code>i</code> - <a href="https://www.idolcomplex.com/">Idol Complex</a>
<code>k</code> - <a href="https://konachan.com/">Konachan.com</a>
<code>s</code> - <a href="https://www.sankakucomplex.com/">Sankaku Channel</a>
diff --git a/operators/callback_tags.zsh b/operators/callback_tags.zsh
index 803c0dd..a2cda2c 100644
--- a/operators/callback_tags.zsh
+++ b/operators/callback_tags.zsh
@@ -26,17 +26,16 @@ then
return
fi
-ib_file_size="$(jq -r ".${ib_iarray}[0].${ib_isize}" "${ib_file}")"
-ib_file_url="$(jq -r ".${ib_iarray}[0].${ib_ifile}" "${ib_file}")"
-ib_sample_url="$(jq -r ".${ib_iarray}[0].${ib_isample}" "${ib_file}")"
-ib_preview_url="$(jq -r ".${ib_iarray}[0].${ib_ipreview}" "${ib_file}")"
-ib_width="$(jq -r ".${ib_iarray}[0].${ib_iwidth}" "${ib_file}")"
-ib_height="$(jq -r ".${ib_iarray}[0].${ib_iheight}" "${ib_file}")"
-ib_tags=($(jq -r ".${ib_iarray}[0].${ib_itags}" "${ib_file}"))
+ib_file_size="$(jq -r ".[0].${ib_isize}" "${ib_file}")"
+ib_file_url="$(jq -r ".[0].${ib_ifile}" "${ib_file}")"
+ib_sample_url="$(jq -r ".[0].${ib_isample}" "${ib_file}")"
+ib_preview_url="$(jq -r ".[0].${ib_ipreview}" "${ib_file}")"
+ib_width="$(jq -r ".[0].${ib_iwidth}" "${ib_file}")"
+ib_height="$(jq -r ".[0].${ib_iheight}" "${ib_file}")"
+ib_tags=($(jq -r ".[0].${ib_itags}" "${ib_file}"))
ib_groups_offset=${1:-0}
ib_tags_offset=${1:-0}
-source "${units}/ib_size.zsh"
source "${units}/ib_meta.zsh"
if [[ -z "${ib_tags}" || "${ib_tags}" == "null" ]]
@@ -49,7 +48,7 @@ fi
while [[ ${#ib_groups} -ge 2 ]]
do
- ib_group_tags=($(jq -r ".${ib_iarray}[0].${ib_groups[1]}" "${ib_file}" | htmlescape))
+ ib_group_tags=($(jq -r ".[0].${ib_groups[1]}" "${ib_file}" | htmlescape))
ib_group_name="${ib_groups[2]}"
if [[ -z "${ib_group_tags}" || "${ib_group_tags}" == "null" ]]
diff --git a/operators/command_source.zsh b/operators/command_source.zsh
index e22b6aa..347fe28 100644
--- a/operators/command_source.zsh
+++ b/operators/command_source.zsh
@@ -40,7 +40,6 @@ fi
booru_table=(
danbooru_id d "Danbooru"
- gelbooru_id g "Gelbooru"
idol_id i "Idol Complex"
konachan_id k "Konachan.com"
sankaku_id s "Sankaku Channel"
diff --git a/operators/inline_search.zsh b/operators/inline_search.zsh
index 5c3a755..f32f456 100644
--- a/operators/inline_search.zsh
+++ b/operators/inline_search.zsh
@@ -94,26 +94,26 @@ then
return
fi
-ib_ids=("${(@f)$(jq -r ".${ib_iarray}[].${ib_iid}" "${ib_file}")}")
+ib_ids=("${(@f)$(jq -r ".[].${ib_iid}" "${ib_file}")}")
case "${ib_mode}" in
(l)
- ib_created_ats=("${(@f)$(jq -r ".${ib_iarray}[].${ib_icreated}" "${ib_file}")}")
- ib_pools=("${(@f)$(jq -r ".${ib_iarray}[].${ib_ipool}" "${ib_file}")}")
- ib_counts=("${(@f)$(jq -r ".${ib_iarray}[].${ib_icount}" "${ib_file}")}")
+ ib_created_ats=("${(@f)$(jq -r ".[].${ib_icreated}" "${ib_file}")}")
+ ib_pools=("${(@f)$(jq -r ".[].${ib_ipool}" "${ib_file}")}")
+ ib_counts=("${(@f)$(jq -r ".[].${ib_icount}" "${ib_file}")}")
;;
(p)
- ib_created_ats=("${(@f)$(jq -r ".${ib_iarray}[].${ib_icreated}" "${ib_file}")}")
- ib_file_sizes=("${(@f)$(jq -r ".${ib_iarray}[].${ib_isize}" "${ib_file}")}")
- ib_file_urls=("${(@f)$(jq -r ".${ib_iarray}[].${ib_ifile}" "${ib_file}")}")
- ib_sample_urls=("${(@f)$(jq -r ".${ib_iarray}[].${ib_isample}" "${ib_file}")}")
- ib_preview_urls=("${(@f)$(jq -r ".${ib_iarray}[].${ib_ipreview}" "${ib_file}")}")
- ib_widths=("${(@f)$(jq -r ".${ib_iarray}[].${ib_iwidth}" "${ib_file}")}")
- ib_heights=("${(@f)$(jq -r ".${ib_iarray}[].${ib_iheight}" "${ib_file}")}")
+ ib_created_ats=("${(@f)$(jq -r ".[].${ib_icreated}" "${ib_file}")}")
+ ib_file_sizes=("${(@f)$(jq -r ".[].${ib_isize}" "${ib_file}")}")
+ ib_file_urls=("${(@f)$(jq -r ".[].${ib_ifile}" "${ib_file}")}")
+ ib_sample_urls=("${(@f)$(jq -r ".[].${ib_isample}" "${ib_file}")}")
+ ib_preview_urls=("${(@f)$(jq -r ".[].${ib_ipreview}" "${ib_file}")}")
+ ib_widths=("${(@f)$(jq -r ".[].${ib_iwidth}" "${ib_file}")}")
+ ib_heights=("${(@f)$(jq -r ".[].${ib_iheight}" "${ib_file}")}")
;;
(t)
- ib_tags=("${(@f)$(jq -r ".${ib_iarray}[].${ib_itag}" "${ib_file}")}")
- ib_counts=("${(@f)$(jq -r ".${ib_iarray}[].${ib_icount}" "${ib_file}")}")
+ ib_tags=("${(@f)$(jq -r ".[].${ib_itag}" "${ib_file}")}")
+ ib_counts=("${(@f)$(jq -r ".[].${ib_icount}" "${ib_file}")}")
;;
esac
diff --git a/operators/url_parser.zsh b/operators/url_parser.zsh
index 187af40..050ce21 100644
--- a/operators/url_parser.zsh
+++ b/operators/url_parser.zsh
@@ -3,36 +3,35 @@
# SPDX-License-Identifier: Apache-2.0
url_table=(
- a / 3 "safebooru.donmai.us/posts/"
- d / 3 "danbooru.donmai.us/posts/"
- g = 4 "gelbooru.com/index.php?page=post&s=view&id="
- i / 4 "www.idolcomplex.com/.*/posts/"
- i / 4 "idolcomplex.com/.*/posts/"
- i / 3 "www.idolcomplex.com/posts/"
- i / 3 "idolcomplex.com/posts/"
- k / 4 "konachan.com/post/show/"
- s / 4 "www.sankakucomplex.com/.*/posts/"
- i / 4 "sankakucomplex.com/.*/posts/"
- s / 3 "www.sankakucomplex.com/posts/"
- i / 3 "sankakucomplex.com/posts/"
- y / 4 "yande.re/post/show/"
+ a 3 "safebooru.donmai.us/posts/"
+ d 3 "danbooru.donmai.us/posts/"
+ i 4 "www.idolcomplex.com/.*/posts/"
+ i 4 "idolcomplex.com/.*/posts/"
+ i 3 "www.idolcomplex.com/posts/"
+ i 3 "idolcomplex.com/posts/"
+ k 4 "konachan.com/post/show/"
+ s 4 "www.sankakucomplex.com/.*/posts/"
+ i 4 "sankakucomplex.com/.*/posts/"
+ s 3 "www.sankakucomplex.com/posts/"
+ i 3 "sankakucomplex.com/posts/"
+ y 4 "yande.re/post/show/"
)
ib_mode="p"
-while [[ ${#url_table} -ge 4 ]]
+while [[ ${#url_table} -ge 3 ]]
do
- if url_line="$(grep -o "https://\?${url_table[4]}.*" <<< "${command} ${@}")"
+ if url_line="$(grep -o "https://\?${url_table[3]}.*" <<< "${command} ${@}")"
then
url_line="$(sed -e 's/https:\/\///' -e 's/ .*//' <<< "${url_line}")"
ib_board="${url_table[1]}"
- ib_post_id="$(cut -d ${url_table[2]} -f ${url_table[3]} <<< "${url_line}" | cut -d '?' -f 1)"
+ ib_post_id="$(cut -d '/' -f ${url_table[2]} <<< "${url_line}" | cut -d '?' -f 1)"
break
fi
- shift 4 url_table
+ shift 3 url_table
done
if [[ -z "${ib_post_id}" ]]
diff --git a/units/ib_auth.zsh b/units/ib_auth.zsh
index aafd7a2..422c7a8 100644
--- a/units/ib_auth.zsh
+++ b/units/ib_auth.zsh
@@ -38,9 +38,6 @@ case "${ib_board}" in
(a|d)
source "${auth}/donmai.zsh"
;;
- (g)
- source "${auth}/gelbooru.zsh"
- ;;
(i|s)
source "${auth}/sankakucomplex.zsh"
;;
diff --git a/units/ib_authconfig.zsh b/units/ib_authconfig.zsh
index c94206d..60b41ca 100644
--- a/units/ib_authconfig.zsh
+++ b/units/ib_authconfig.zsh
@@ -6,9 +6,6 @@ case "${ib_board}" in
(a|d)
source "${auth}/config/donmai.zsh"
;;
- (g)
- source "${auth}/config/gelbooru.zsh"
- ;;
(i|s)
source "${auth}/config/sankakucomplex.zsh"
;;
diff --git a/units/ib_cache.zsh b/units/ib_cache.zsh
index e091207..ac8b706 100644
--- a/units/ib_cache.zsh
+++ b/units/ib_cache.zsh
@@ -2,7 +2,7 @@
# Copyright (C) 2024-2026 Danil Lisin
# SPDX-License-Identifier: Apache-2.0
-ib_post="$(jq -c ".${ib_iarray}[$((idx - 1))]" "${ib_file}")"
+ib_post="$(jq -c ".[$((idx - 1))]" "${ib_file}")"
ib_query="id:${ib_id}"
ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -d ' ' -f 1)"
@@ -13,11 +13,6 @@ do
sleep 1
done
-if [[ -n "${ib_iarray}" ]]
-then
- printf '{"%s":[%s]}' "${ib_iarray}" "${ib_post}" | jq -c > "${ib_file}"
-else
- printf '[%s]' "${ib_post}" | jq -c > "${ib_file}"
-fi
+printf '[%s]' "${ib_post}" | jq -c > "${ib_file}"
rmdir "${cache}/${ib_hash}.lock"
diff --git a/units/ib_config.zsh b/units/ib_config.zsh
index 6ec29c7..8270fb5 100644
--- a/units/ib_config.zsh
+++ b/units/ib_config.zsh
@@ -10,9 +10,6 @@ case "${ib_board}" in
(a|d)
source "${config}/donmai.zsh"
;;
- (g)
- source "${config}/gelbooru.zsh"
- ;;
(i|s)
source "${config}/sankakucomplex.zsh"
;;
diff --git a/units/ib_date.zsh b/units/ib_date.zsh
index 3c0a2f4..6f0c6b6 100644
--- a/units/ib_date.zsh
+++ b/units/ib_date.zsh
@@ -4,11 +4,6 @@
if [[ -n "${ib_created_at}" && "${ib_created_at}" != "null" ]]
then
- if [[ -n "${ib_itzfield}" ]]
- then
- ib_created_at="$(cut -d ' ' -f ${ib_itzfield} <<< "${ib_created_at}")"
- fi
-
if [[ -n "${ib_idate}" ]]
then
ib_created_at="$(strftime -r "${ib_idate}" "${ib_created_at}")"
diff --git a/units/ib_file.zsh b/units/ib_file.zsh
index 57fe98a..f37fedb 100644
--- a/units/ib_file.zsh
+++ b/units/ib_file.zsh
@@ -30,7 +30,7 @@ fi
if [[ -n "${ib_page}" ]]
then
- ib_page="${ib_dpage}=$((ib_page + ib_ioffset))"
+ ib_page="${ib_dpage}=${ib_page}"
fi
if [[ -n "${ib_query}" ]]
@@ -43,10 +43,6 @@ rm -f "${ib_file}"
if ! curl --connect-timeout ${connrefused_timeout} \
--data-urlencode "${ib_dfield1}" \
--data-urlencode "${ib_dfield2}" \
- --data-urlencode "${ib_dfield3}" \
- --data-urlencode "${ib_dfield4}" \
- --data-urlencode "${ib_dfield5}" \
- --data-urlencode "${ib_dfield6}" \
--data-urlencode "${ib_limit}" \
--data-urlencode "${ib_page}" \
--data-urlencode "${ib_query}" \
@@ -88,7 +84,7 @@ then
return
fi
-if ! jq -e ".${ib_iarray}[0]|has(\"${ib_iid}\")" "${ib_file}" > /dev/null
+if ! jq -e ".[0]|has(\"${ib_iid}\")" "${ib_file}" > /dev/null
then
if [[ -n "${inline_options}" && -n "${offset}" ]]
then
diff --git a/units/ib_hash.zsh b/units/ib_hash.zsh
index e75c95d..aed087c 100644
--- a/units/ib_hash.zsh
+++ b/units/ib_hash.zsh
@@ -33,14 +33,14 @@ fi
if [[ -z "${output_text}" ]]
then
- ib_id="$(jq -r ".${ib_iarray}[0].${ib_iid}" "${ib_file}")"
+ ib_id="$(jq -r ".[0].${ib_iid}" "${ib_file}")"
if ! [[ -f "${ib_sample}" ]]
then
- ib_file_size="$(jq -r ".${ib_iarray}[0].${ib_isize}" "${ib_file}")"
- ib_file_url="$(jq -r ".${ib_iarray}[0].${ib_ifile}" "${ib_file}")"
- ib_sample_url="$(jq -r ".${ib_iarray}[0].${ib_isample}" "${ib_file}")"
- ib_preview_url="$(jq -r ".${ib_iarray}[0].${ib_ipreview}" "${ib_file}")"
+ ib_file_size="$(jq -r ".[0].${ib_isize}" "${ib_file}")"
+ ib_file_url="$(jq -r ".[0].${ib_ifile}" "${ib_file}")"
+ ib_sample_url="$(jq -r ".[0].${ib_isample}" "${ib_file}")"
+ ib_preview_url="$(jq -r ".[0].${ib_ipreview}" "${ib_file}")"
source "${units}/ib_meta.zsh"
diff --git a/units/ib_original.zsh b/units/ib_original.zsh
index d04e613..4adf00d 100644
--- a/units/ib_original.zsh
+++ b/units/ib_original.zsh
@@ -2,17 +2,15 @@
# Copyright (C) 2024-2026 Danil Lisin
# SPDX-License-Identifier: Apache-2.0
-ib_file_size="$(jq -r ".${ib_iarray}[0].${ib_isize}" "${ib_file}")"
-ib_file_url="$(jq -r ".${ib_iarray}[0].${ib_ifile}" "${ib_file}")"
-
-source "${units}/ib_size.zsh"
+ib_file_size="$(jq -r ".[0].${ib_isize}" "${ib_file}")"
+ib_file_url="$(jq -r ".[0].${ib_ifile}" "${ib_file}")"
if [[ -n "${ib_file_url}" && "${ib_file_url}" != "null" ]]
then
- ib_sample_url="$(jq -r ".${ib_iarray}[0].${ib_isample}" "${ib_file}")"
- ib_preview_url="$(jq -r ".${ib_iarray}[0].${ib_ipreview}" "${ib_file}")"
- ib_width="$(jq -r ".${ib_iarray}[0].${ib_iwidth}" "${ib_file}")"
- ib_height="$(jq -r ".${ib_iarray}[0].${ib_iheight}" "${ib_file}")"
+ ib_sample_url="$(jq -r ".[0].${ib_isample}" "${ib_file}")"
+ ib_preview_url="$(jq -r ".[0].${ib_ipreview}" "${ib_file}")"
+ ib_width="$(jq -r ".[0].${ib_iwidth}" "${ib_file}")"
+ ib_height="$(jq -r ".[0].${ib_iheight}" "${ib_file}")"
source "${units}/ib_meta.zsh"
else
diff --git a/units/ib_post.zsh b/units/ib_post.zsh
index a5c5c3d..7580bde 100644
--- a/units/ib_post.zsh
+++ b/units/ib_post.zsh
@@ -2,23 +2,22 @@
# Copyright (C) 2024-2026 Danil Lisin
# SPDX-License-Identifier: Apache-2.0
-ib_id="$(jq -r ".${ib_iarray}[0].${ib_iid}" "${ib_file}")"
-ib_created_at="$(jq -r ".${ib_iarray}[${array_count}].${ib_icreated}" "${ib_file}")"
-ib_file_size="$(jq -r ".${ib_iarray}[0].${ib_isize}" "${ib_file}")"
-ib_file_url="$(jq -r ".${ib_iarray}[0].${ib_ifile}" "${ib_file}")"
-ib_sample_url="$(jq -r ".${ib_iarray}[0].${ib_isample}" "${ib_file}")"
-ib_preview_url="$(jq -r ".${ib_iarray}[0].${ib_ipreview}" "${ib_file}")"
-ib_width="$(jq -r ".${ib_iarray}[0].${ib_iwidth}" "${ib_file}")"
-ib_height="$(jq -r ".${ib_iarray}[0].${ib_iheight}" "${ib_file}")"
-ib_rating="$(jq -r ".${ib_iarray}[0].${ib_irating}" "${ib_file}")"
-ib_parent_id="$(jq -r ".${ib_iarray}[0].${ib_iparent}" "${ib_file}")"
-ib_has_children="$(jq -r ".${ib_iarray}[0].${ib_ichildren}" "${ib_file}")"
-ib_md5="$(jq -r ".${ib_iarray}[0].${ib_imd5}" "${ib_file}")"
-ib_source="$(jq -r ".${ib_iarray}[0].${ib_isource}" "${ib_file}" | htmlescape)"
-ib_tags=($(jq -r ".${ib_iarray}[0].${ib_itags}" "${ib_file}"))
+ib_id="$(jq -r ".[0].${ib_iid}" "${ib_file}")"
+ib_created_at="$(jq -r ".[${array_count}].${ib_icreated}" "${ib_file}")"
+ib_file_size="$(jq -r ".[0].${ib_isize}" "${ib_file}")"
+ib_file_url="$(jq -r ".[0].${ib_ifile}" "${ib_file}")"
+ib_sample_url="$(jq -r ".[0].${ib_isample}" "${ib_file}")"
+ib_preview_url="$(jq -r ".[0].${ib_ipreview}" "${ib_file}")"
+ib_width="$(jq -r ".[0].${ib_iwidth}" "${ib_file}")"
+ib_height="$(jq -r ".[0].${ib_iheight}" "${ib_file}")"
+ib_rating="$(jq -r ".[0].${ib_irating}" "${ib_file}")"
+ib_parent_id="$(jq -r ".[0].${ib_iparent}" "${ib_file}")"
+ib_has_children="$(jq -r ".[0].${ib_ichildren}" "${ib_file}")"
+ib_md5="$(jq -r ".[0].${ib_imd5}" "${ib_file}")"
+ib_source="$(jq -r ".[0].${ib_isource}" "${ib_file}" | htmlescape)"
+ib_tags=($(jq -r ".[0].${ib_itags}" "${ib_file}"))
source "${units}/ib_date.zsh"
-source "${units}/ib_size.zsh"
source "${units}/ib_meta.zsh"
output_text="$(printf "<b>%s</b>\n<b>ID:</b> <code>%s</code>" "${ib_name}" "${ib_id}")"
diff --git a/units/ib_search.zsh b/units/ib_search.zsh
index 6dac4d3..af6ec74 100644
--- a/units/ib_search.zsh
+++ b/units/ib_search.zsh
@@ -64,8 +64,3 @@ fi
ib_limit=${inline_limit}
ib_page=${inline_page}
-
-if [[ -n "${ib_iwildcard}" ]]
-then
- ib_query="$(sed "s/${ib_iwildcard}/\\\\${ib_iwildcard}/g" <<< "${ib_query}" | tr '*' "${ib_iwildcard}")"
-fi
diff --git a/units/ib_size.zsh b/units/ib_size.zsh
deleted file mode 100644
index 317ffe8..0000000
--- a/units/ib_size.zsh
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 2024-2026 Maria Lisina
-# Copyright (C) 2024-2026 Danil Lisin
-# SPDX-License-Identifier: Apache-2.0
-
-if [[ -n "${ib_file_size}" && "${ib_file_size}" != "null" ]]
-then
- return
-fi
-
-if [[ -z "${ib_file_url}" || "${ib_file_url}" == "null" ]]
-then
- return
-fi
-
-ib_file_size="$(
- curl --connect-timeout ${connrefused_timeout} \
- --head \
- --max-time ${head_timeout} \
- --proxy "${external_proxy}" \
- --retry 1 \
- --retry-connrefused \
- --retry-max-time $((external_timeout - connrefused_timeout)) \
- --silent \
- --user-agent "${useragent}" \
- "${ib_file_url}" |
- grep -i "content-length" |
- cut -d ' ' -f 2 |
- tr -d '\r'
-)"
diff --git a/units/ib_token.zsh b/units/ib_token.zsh
index 7ff05e1..95e289e 100644
--- a/units/ib_token.zsh
+++ b/units/ib_token.zsh
@@ -9,8 +9,8 @@ done
if [[ -n "${ib_raw}" ]]
then
- ib_dfield5="${ib_login_file}=$(< "${login_file}")"
- ib_dfield6="${ib_key_file}=$(< "${key_file}")"
+ ib_dfield1="${ib_login_file}=$(< "${login_file}")"
+ ib_dfield2="${ib_key_file}=$(< "${key_file}")"
fi
if [[ -f "${timestamp_file}" ]]
diff --git a/units/sn_search.zsh b/units/sn_search.zsh
index e692b66..64f52e6 100644
--- a/units/sn_search.zsh
+++ b/units/sn_search.zsh
@@ -9,7 +9,6 @@ if ! sn_data="$(
--form "dbs[]=5" \
--form "dbs[]=9" \
--form "dbs[]=12" \
- --form "dbs[]=25" \
--form "dbs[]=26" \
--form "dbs[]=27" \
--form "dbs[]=30" \
generated by cgit v1.2.3 (git 2.46.0) at 2026-08-22 21:05:16 +0000