wip: safe_name is back

This commit is contained in:
xiongdian.me 2023-05-12 18:04:25 +08:00
parent 460c7c0b3b
commit 66a1fdf2a9
5 changed files with 32 additions and 23 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
status/*
config

2
config
View File

@ -1,2 +0,0 @@
putty rsync://mirrors4.tuna.tsinghua.edu.cn/putty /tmp/putty
github-raw rsync://mirrors4.tuna.tsinghua.edu.cn/github-raw /tmp/github-raw

2
config.example Normal file
View File

@ -0,0 +1,2 @@
putty rsync://mirrors4.tuna.tsinghua.edu.cn/putty /tmp/putty
github-raw/subfolder rsync://mirrors4.tuna.tsinghua.edu.cn/github-raw /tmp/github-raw

View File

@ -77,21 +77,20 @@
if (name.length == 0) {
continue;
}
$.get(name + ".log", function (data) {
safe_name = name.replace(/\//g, "_");
$.get(safe_name + ".log", function (data) {
var data = data.split("\n");
data[0] =
"<a href='../" + data[0] + "'>" + data[0] + "</a>";
line_header =
"<td><a href='../" + name + "'>" + name + "</a></td>";
for (j in data) {
if (data[j] != "") {
data[j] = "<td>" + data[j] + "</td>";
}
}
$("#mirror_list").append(
"<tr id='" +
name +
"'>" +
data.join("") +
"</tr>"
"<tr id='" + safe_name + "'>" +
line_header + data.join("") +
"</tr>"
);
console.log(data);
});

33
sync.sh
View File

@ -9,12 +9,11 @@ touch "$STATUS_INDEX"
presync() {
local name="$1"
local log_file="$STATUS_FOLDER"/$name.log
grep -qxF -- "$name" "$STATUS_INDEX" || echo "$name" >> "$STATUS_INDEX"
if [[ -f "$log_file" ]]; then
sed -i "4c syncing..." "$log_file"
sed -i "3c $(date +'%Y-%m-%d %H:%M:%S')" "$log_file"
sed -i "3c syncing..." "$log_file"
sed -i "2c $(date +'%Y-%m-%d %H:%M:%S')" "$log_file"
else
echo -e "${name}\n0\n0\niniting..." > "$log_file"
echo -e "0\n0\niniting..." > "$log_file"
fi
}
@ -22,33 +21,43 @@ postsync() {
local name="$1"
local status="$2"
local dst="$3"
echo -e "${name}\n$(du -h --max-depth=0 "$dst" | awk '{print $1}')\n$(date +'%Y-%m-%d %H:%M:%S')\n${status}" > "$STATUS_FOLDER"/$name.log
echo -e "$(du -h --max-depth=0 "$dst" | awk '{print $1}')\n$(date +'%Y-%m-%d %H:%M:%S')\n${status}" > "$STATUS_FOLDER"/$name.log
}
locked() {
local name="$1"
sed -i '4 s/$/?/' "$STATUS_FOLDER"/$name.log
sed -i '3 s/$/?/' "$STATUS_FOLDER"/$name.log
}
do_sync() {
local name="$1"
local safe_name="${name//\//_}"
local src="$2"
local dst="$3"
local lock_file="/tmp/mirror-$name.lock"
local lock_file="/tmp/mirror-$safe_name.lock"
if [ ! -f "$lock_file" ];
then
touch "$lock_file"
presync "$name"
mkdir -p "$(dirname "$dst")"
rsync -avzthP --stats --delete --bwlimit=6000 "$src" "$dst"
postsync "$name" $? "$dst"
presync "$safe_name"
mkdir -p "$(dirname "$dst")"
rsync -avzthP --stats --delete --bwlimit=6000 "$src" "$dst"
postsync "$safe_name" $? "$dst"
rm "$lock_file"
else
locked "$name"
locked "$safe_name"
fi
}
append_index() {
echo "$1" >> "$STATUS_INDEX"
}
echo > "$STATUS_INDEX"
while read p || [[ -n $p ]]; do
append_index $p
done < "$THIS_DIR"/config
while read p || [[ -n $p ]]; do
do_sync $p
done < "$THIS_DIR"/config