38C3
This commit is contained in:
parent
1d9d19797e
commit
254a5a34a6
2 changed files with 19 additions and 16 deletions
|
@ -1,4 +1,5 @@
|
||||||
#! /bin/bash
|
#! /usr/bin/env nix-shell
|
||||||
|
#! nix-shell -i bash -p bash imagemagick
|
||||||
|
|
||||||
INPUT="$1"
|
INPUT="$1"
|
||||||
OUTPUT="$2"
|
OUTPUT="$2"
|
||||||
|
@ -10,18 +11,19 @@ if [ "$OH" == "" ]; then OH=0; fi
|
||||||
OPTIONS="-resize $W -set depth 8 -set colorspace RGB"
|
OPTIONS="-resize $W -set depth 8 -set colorspace RGB"
|
||||||
|
|
||||||
#initial conversion
|
#initial conversion
|
||||||
convert-im6 $OPTIONS "$INPUT" txt:- | awk -v ow="$OW" -v oh="$OH" 'match($0, /^([0-9]*),([0-9]*):.*#([0-9A-Fa-f]{6,8}) +r/, arr ){ print "PX " arr[1]+ow " " arr[2]+oh " " arr[3] }' > "$OUTPUT"
|
convert $OPTIONS "$INPUT" txt:- | awk -v ow="$OW" -v oh="$OH" 'match($0, /^([0-9]*),([0-9]*):.*#([0-9A-Fa-f]{6,8}) +r/, arr ){ print "PX " arr[1]+ow " " arr[2]+oh " " arr[3] }' > "${OUTPUT}.tmp"
|
||||||
|
|
||||||
echo optimizing >&2
|
echo optimizing >&2
|
||||||
|
|
||||||
# edge detection
|
# edge detection
|
||||||
convert-im6 $OPTIONS "$INPUT" -negate -edge 4 -negate txt:- | awk -v ow="$OW" -v oh="$OH" 'match($0, /^([0-9]*),([0-9]*):.*#000000/, arr ){ print "PX " arr[1]+ow " " arr[2]+oh " " }' > /tmp/px6_optimize
|
convert $OPTIONS "$INPUT" -canny 0x1+10%+30% txt:- | awk -v ow="$OW" -v oh="$OH" 'match($0, /^([0-9]*),([0-9]*):.*#000000/, arr ){ print "PX " arr[1]+ow " " arr[2]+oh " " }' > /tmp/px6_optimize
|
||||||
grep -Ff /tmp/px6_optimize "$OUTPUT" > "${OUTPUT}.tmp"
|
|
||||||
grep -Ff /tmp/px6_optimize "$OUTPUT" >> "${OUTPUT}.tmp"
|
|
||||||
grep -Ff /tmp/px6_optimize "$OUTPUT" >> "${OUTPUT}.tmp"
|
|
||||||
grep -Ff /tmp/px6_optimize "$OUTPUT" >> "${OUTPUT}.tmp"
|
|
||||||
cat "${OUTPUT}.tmp" >> "$OUTPUT"
|
|
||||||
cat "$OUTPUT" | grep -ve " [a-fA-F0-9]\{6\}00" | shuf > "${OUTPUT}.tmp"
|
|
||||||
mv "${OUTPUT}.tmp" "$OUTPUT"
|
|
||||||
rm /tmp/px6_optimize
|
|
||||||
|
|
||||||
|
grep -Ff /tmp/px6_optimize "${OUTPUT}.tmp" >> "${OUTPUT}.tmp2"
|
||||||
|
cat "${OUTPUT}.tmp" > "${OUTPUT}.tmp3"
|
||||||
|
cat "${OUTPUT}.tmp2" >> "${OUTPUT}.tmp3"
|
||||||
|
cat "${OUTPUT}.tmp2" >> "${OUTPUT}.tmp3"
|
||||||
|
cat "${OUTPUT}.tmp2" >> "${OUTPUT}.tmp3"
|
||||||
|
cat "${OUTPUT}.tmp2" >> "${OUTPUT}.tmp3"
|
||||||
|
cat "${OUTPUT}.tmp3" | grep -ve " [a-fA-F0-9]\{6\}00" | shuf > /tmp/px6_optimize
|
||||||
|
mv /tmp/px6_optimize "$OUTPUT"
|
||||||
|
rm "${OUTPUT}.tmp" "${OUTPUT}.tmp2" "${OUTPUT}.tmp3"
|
||||||
|
|
11
px6_send.sh
11
px6_send.sh
|
@ -1,4 +1,5 @@
|
||||||
#! /bin/bash
|
#! /usr/bin/env nix-shell
|
||||||
|
#! nix-shell -i bash -p bash bc
|
||||||
IP="$1"
|
IP="$1"
|
||||||
PORT="$2"
|
PORT="$2"
|
||||||
PROCS="$3"
|
PROCS="$3"
|
||||||
|
@ -13,7 +14,7 @@ do_exit() {
|
||||||
}
|
}
|
||||||
trap do_exit SIGINT SIGTERM
|
trap do_exit SIGINT SIGTERM
|
||||||
|
|
||||||
for i in $(seq 0 $(($PROCS-1))); do
|
for i in $(seq 1 $PROCS); do
|
||||||
(
|
(
|
||||||
THISPID=$BASHPID
|
THISPID=$BASHPID
|
||||||
# ( while kill -0 $MAINPID; do sleep 1; done; do_exit ) &
|
# ( while kill -0 $MAINPID; do sleep 1; done; do_exit ) &
|
||||||
|
@ -21,11 +22,11 @@ for i in $(seq 0 $(($PROCS-1))); do
|
||||||
(
|
(
|
||||||
THISPID2=$BASHPID
|
THISPID2=$BASHPID
|
||||||
( sleep $PROCMAXTIME; kill -9 $THISPID2 >/dev/null 2>&1 ) &
|
( sleep $PROCMAXTIME; kill -9 $THISPID2 >/dev/null 2>&1 ) &
|
||||||
echo "starting $(($i+1)) / $PROCS"
|
echo "starting $i / $PROCS"
|
||||||
( while kill -0 $THISPID2; do cat "$FILE"; done ) | nc "$IP" "$PORT" >/dev/null 2>&1
|
( while kill -0 $THISPID2; do cat "$FILE"; done ) > /dev/tcp/$IP/$PORT 2>&1
|
||||||
) >/dev/null 2>&1
|
) >/dev/null 2>&1
|
||||||
done
|
done
|
||||||
) &
|
) &
|
||||||
sleep $(echo "scale=2; ($PROCMAXTIME/$PROCS) + 1" | bc)
|
# sleep $(echo "scale=2; ($PROCMAXTIME/$PROCS) + 1" | bc)
|
||||||
done
|
done
|
||||||
while true; do sleep 9999999; done
|
while true; do sleep 9999999; done
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue