ScriptFanix/IngRRD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into prod

Browse Source 
* origin/master:
  fix start/end conservation on import
  Add Recruiter

Conflicts:
	import
This commit is contained in:
Vincent Riquer 2015-01-22 16:19:20 +01:00
commit c94c990ad0
3 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
add.html
View File

@ -69,6 +69,8 @@ then
DS:Field_x_Days:GAUGE:$((48*60*60)):0:NaN \
DS:Mercenary:GAUGE:$((48*60*60)):0:NaN \
DS:Engineer:GAUGE:$((48*60*60)):0:NaN \
DS:Recruiter:GAUGE:$((48*60*60)):0:NaN \
DS:Hackaton:GAUGE:$((48*60*60)):0:NaN \
RRA:HWPREDICT:8760:8e-1:8e-1:$((24)) \
RRA:AVERAGE:99e-2:1:$((24*15)) \
RRA:MAX:99e-2:1:$((24*15)) \

42
import
View File

@ -24,17 +24,35 @@ do
done
read_query_string
template=AP:Explorer:Seer:XM:Walked:Builder:Connector:Mind_Controller:MU:Longest_Link:Largest_Field:Recharger:Liberator:Pioneer:Engineer:Purifier:Neutralized:Links_Destroyed:Fields_Destroyed:Guardian:Link_Maintained:Link_Length_x_Days:Field_Held:Field_x_Days:Mercenary:Hacker
template=AP:Explorer:Seer:XM:Walked:Builder:Connector:Mind_Controller:MU:Longest_Link:Largest_Field:Recharger:Liberator:Pioneer:Engineer:Purifier:Neutralized:Links_Destroyed:Fields_Destroyed:Guardian:Link_Maintained:Link_Length_x_Days:Field_Held:Field_x_Days:Mercenary:Hacker:Hackaton:Recruiter
if [[ $REQUEST_METHOD == POST ]]
then
declare -A POST
exprdsname='^[[:upper:][:lower:]_]+$'
while read dsname value
do
if [[ $dsname =~ $exprdsname ]]
then
POST["$dsname"]="$value"
fi
done < <(
sed 's/&/\n/g;s/=/ /g'
)
POST["data"]="${POST["data"]//%0D%0A/
}"
POST["data"]="${POST["data"]//%3A/:}"
POST["data"]="${POST["data"]//+/ }"
cat <<-EOHead
Content-type: text/plain
Last-Modified: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z')
Expires: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z')
refresh: 0,url=/cgi/$webuser/?start=${POST["start"]}&end=${POST["end"]}
EOHead
cat <<-EOHead
refresh: 0,url=/cgi/$webuser/?start=${POST["start"]}&end=${POST["end"]}
EOHead
echo
if [[ $webuser == $AUTH_USER || $webuser == dev ]]
then
echo "Welcome agent $webuser"$'!\n\n'
@ -59,22 +77,6 @@ then
fi
done
declare -A POST
exprdsname='^[[:upper:][:lower:]_]+$'
while read dsname value
do
if [[ $dsname =~ $exprdsname ]]
then
POST["$dsname"]="$value"
fi
done < <(
sed 's/&/\n/g;s/=/ /g'
)
POST["data"]="${POST["data"]//%0D%0A/
}"
POST["data"]="${POST["data"]//%3A/:}"
POST["data"]="${POST["data"]//+/ }"
echo "${POST["data"]}"
while read date hour data
do
data=$(date -d "$date $hour" +%s):${data// /:}
@ -132,6 +134,8 @@ else
DS:Field_x_Days:GAUGE:$((48*60*60)):0:NaN \
DS:Mercenary:GAUGE:$((48*60*60)):0:NaN \
DS:Engineer:GAUGE:$((48*60*60)):0:NaN \
DS:Recruiter:GAUGE:$((48*60*60)):0:NaN \
DS:Hackaton:GAUGE:$((48*60*60)):0:NaN \
RRA:HWPREDICT:8760:8e-1:8e-1:$((24)) \
RRA:AVERAGE:99e-2:1:$((24*15)) \
RRA:MAX:99e-2:1:$((24*15)) \

15
settings
View File

@ -62,6 +62,8 @@ uinames=(
"Largest Field MUs x Days"
"Unique missions completed"
Hacks
"Agents Recruited"
"Consecutive Days Hacking"
)
dsnames=(
AP
@ -90,11 +92,13 @@ dsnames=(
Field_x_Days
Mercenary
Hacker
Recruiter
Hackaton
)
medals=(
Explorer
Seer
Hacker
Walked
Builder
Connector
Mind_Controller
@ -105,7 +109,8 @@ medals=(
Guardian
Mercenary
Engineer
Walked
Hacker
Recruiter
)
## (0) 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
@ -199,3 +204,9 @@ silver["Mercenary"]=25
gold["Mercenary"]=100
platinum["Mercenary"]=200
black["Mercenary"]=500
bronze["Recruiter"]=2
silver["Recruiter"]=10
gold["Recruiter"]=25
platinum["Recruiter"]=50
black["Recruiter"]=100