Merge remote-tracking branch 'parent/master'

# Conflicts:
#	tracker-add-auto.sh

Author: Limych

README.md

@@ -20,8 +20,11 @@ A: Yes, host=host:port or host=http(s?)://host:port/transmission/
 
 <details>
   <summary>Changelog</summary>
-   
+
 ```
+Mar 10, 2020
+avoid add trackers for private torrents
+
 Mar 27, 2019
 add tracker-add-auto-router.sh script for routers
 now tracker file saved in tmp directory until update web source
@@ -59,9 +62,9 @@ Take image `docker pull andrewmhub/transmission-tracker-add`
 
 ```docker run --net=host -d -e HOSTPORT=localhost:9091 -e TR_AUTH=user:password --name=transmission-tracker-add andrewmhub/transmission-tracker-add:latest```
 
-if you need another torrent tracker list then use docker run env 
+if you need another torrent tracker list then use docker run env
 
-`-e TORRENTLIST=https://raw.githubusercontent.com/user/trackerslist/master/mylist.txt` 
+`-e TORRENTLIST=https://raw.githubusercontent.com/user/trackerslist/master/mylist.txt`
 
 you have transmission daemon in docker then read [Docker Documentation Network](https://docs.docker.com/network/)
 
@@ -91,7 +94,7 @@ systemctl status transmission-tracker-add.service
    CGroup: /system.slice/transmission-tracker-add.service
            ├─19102 /bin/bash /opt/bin/add-trackers-auto.sh
            └─31204 sleep 5
-           
+
 ```
 
 
@@ -123,7 +126,7 @@ Requirements: curl, transmission-remote
 
 Download script and make it executable:
 
-Edit settings for transmission set rpc-enabled, rpc-username and rpc-password
+Edit settings for transmission set rpc-enabled, rpc-username, rpc-password and your pt trackers
 
 ```
 wget --no-check-certificate -O tracker-add-auto-router.sh https://raw.githubusercontent.com/AndrewMarchukov/tracker-add/master/tracker-add-auto-router.sh

tracker-add-auto.sh

@@ -2,58 +2,60 @@
 # Get transmission credentials and ip or dns address
 auth=user:password
 host=localhost
-
-add_trackers () {
-    torrent_hash=$1
-    id=$2
-    trackerslist=/tmp/trackers.txt
-    for base_url in https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all.txt ; do
-        if [ ! -f $trackerslist ]; then
-            curl -o "$trackerslist" "${base_url}"
-        fi
-        Local=$(wc -c < $trackerslist)
-        Remote=$(curl -sI "${base_url}" | awk '/Content-Length/ {sub("\r",""); print $2}')
-        if [ "$Local" != "$Remote" ]; then
-            curl -o "$trackerslist" "${base_url}"
-        fi
-        echo "URL for ${base_url}"
-        echo "Adding trackers for $torrent_name..."
-        for tracker in $(cat $trackerslist) ; do
-            echo -n "${tracker}..."
-            if ${trans} --torrent "${torrent_hash}" -td "${tracker}" | grep -q 'success'; then
-                echo ' done.'
-            else
-                echo ' failed.'
-            fi
-        done
-    done
-    sleep 180
-    rm -f "/tmp/TTAA.$id.lock"
-}
+# set trackers list space separated
+trackers=https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all.txt
+pt_trackers=()
 
 trans="/usr/local/bin/transmission-remote $host --auth=$auth"
-while true ; do
-    sleep 25
 
+while true; do
+    sleep 25
+    add_trackers() {
+        torrent_hash=$1
+        id=$2
+        trackerslist=/tmp/trackers.txt
+        for base_url in $trackers; do
+            if [ ! -f $trackerslist ]; then
+                curl -o "$trackerslist" "${base_url}"
+            fi
+            Local=$(wc -c <$trackerslist)
+            Remote=$(curl -sI "${base_url}" | awk '/Content-Length/ {sub("\r",""); print $2}')
+            if [ "$Local" != "$Remote" ]; then
+                curl -o "$trackerslist" "${base_url}"
+            fi
+            echo "URL for ${base_url}"
+            echo "Adding trackers for $torrent_name..."
+            for tracker in $(cat $trackerslist); do
+                echo -n "${tracker}..."
+                if ${trans} --torrent "${torrent_hash}" -td "${tracker}" | grep -q 'success'; then
+                    echo ' done.'
+                else
+                    echo ' already added.'
+                fi
+            done
+        done
+        sleep 3m
+        rm -f "/tmp/TTAA.$id.lock"
+    }
     # Get list of active torrents
-    ids="$(${trans} --list | grep -vE 'Seeding|Stopped|Finished|[[:space:]]100%[[:space:]]' | grep '^ ' | awk '{ print $1 }' | grep -vE 'ID')"
-    for id in $ids ; do
-        add_date="$(${trans} --torrent "$id" --info| grep '^  Date added: ' |cut -c 21-)"
-        if [ "$(uname)" = "FreeBSD" ]; then
-            add_date_t="$(date -jf "%+" "$add_date" "+%Y-%m-%d %H:%M")"
-            dateo="$(date -jv-1M "+%Y-%m-%d %H:%M")"
-        else
-            add_date_t="$(date -d "$add_date" "+%Y-%m-%d %H:%M")"
-            dateo="$(date -d "1 minutes ago" "+%Y-%m-%d %H:%M")"
-        fi
+    ids="$(${trans} --list | grep -vE 'Seeding|Stopped|Finished|[[:space:]]100%[[:space:]]' | grep '^ ' | awk '{ print $1 }')"
+    for id in $ids; do
+        add_date="$(${trans} --torrent "$id" --info | grep '^  Date added: ' | cut -c 21-)"
+        add_date_t="$(date -d "$add_date" "+%Y-%m-%d %H:%M")"
         dater="$(date "+%Y-%m-%d %H:%M")"
+        dateo="$(date -d "1 minutes ago" "+%Y-%m-%d %H:%M")"
+        tracker0="$(${trans} -t "$id" -it | sed -n '2,2p' | awk '{print $3}' | awk -F : '{print $2}' | sed -e 's/\/\///')"
+        if [[ " ${pt_trackers[@]} " =~ " $tracker0 " ]]; then
+            echo "skip id=" "$id" "$tracker0"
+            continue
+        fi
 
         if [ ! -f "/tmp/TTAA.$id.lock" ]; then
-            if [ "$add_date_t" = "$dater" -o "$add_date_t" = "$dateo" ]; then
+            if [[ "( "$add_date_t" == "$dater" || "$add_date_t" == "$dateo" )" ]]; then
                 hash="$(${trans} --torrent "$id" --info | grep '^  Hash: ' | awk '{ print $2 }')"
-                torrent_name="$(${trans} --torrent "$id" --info | grep '^  Name: ' |cut -c 9-)"
-                touch "/tmp/TTAA.$id.lock"
+                torrent_name="$(${trans} --torrent "$id" --info | grep '^  Name: ' | cut -c 9-)"
                 add_trackers "$hash" "$id" &
+                touch "/tmp/TTAA.$id.lock"
             fi
         fi
     done