wip: safe_name is back

.gitignore

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

config

@@ -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

config.example

@@ -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

status/index.html

@@ -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] =
+                        line_header =
-                            "<a href='../" + data[0] + "'>" + data[0] + "</a>";
+                            "<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='" +
+                            "<tr id='" + safe_name + "'>" +
-                                name +
+                                line_header + data.join("") +
-                                "'>" +
+                            "</tr>"
-                                data.join("") +
-                                "</tr>"
                         );
                         console.log(data);
                     });

sync.sh

@@ -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 syncing..." "$log_file"
-        sed -i "3c $(date +'%Y-%m-%d %H:%M:%S')" "$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"
+        presync "$safe_name"
-            mkdir -p "$(dirname "$dst")"
+        mkdir -p "$(dirname "$dst")"
-            rsync -avzthP --stats --delete --bwlimit=6000 "$src" "$dst"
+        rsync -avzthP --stats --delete --bwlimit=6000 "$src" "$dst"
-            postsync "$name" $? "$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