From 620122f9003f14522e62930069f72d74bc691d50 Mon Sep 17 00:00:00 2001
From: Heuzef <contact@heuzef.com>
Date: Mon, 7 Oct 2019 10:50:41 +0200
Subject: [PATCH] Remove JSON

---
 Check.pm   | 27 +++++++++++++--------------
 readme.txt | 14 ++++++++------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/Check.pm b/Check.pm
index f90bc45..ec9dfe8 100644
--- a/Check.pm
+++ b/Check.pm
@@ -22,7 +22,6 @@ use lib "/usr/share/BackupPC/lib";
 use BackupPC::Lib;
 use BackupPC::CGI::Lib qw(:all);
 use POSIX;
-use JSON;
 use Getopt::Long;
 use Statistics::Descriptive;
 use Data::Dumper;
@@ -133,12 +132,12 @@ sub action
 # Check Size Consistency
 my $bpc = BackupPC::Lib->new();
 my $mainConf = $bpc->ConfigDataRead();
-my $json = {};
+my $check = {};
 
 my $hostConf = $bpc->ConfigDataRead($host);
 my $conf = { %$mainConf, %$hostConf };
 my $age = -1;
-$json = {
+$check = {
   bkp             => 0,
   last_age        => 0,
   errors          => 0,
@@ -159,25 +158,25 @@ if ( scalar( @bpc_info ) ){
     # Push all the sizes in our data set to compute avg sizes
     # Exclude backup N°0 as it'll always have much more new data than normal backups
     $sizes->add_data($backup->{sizeNew}) unless ( $backup->{num} == 0 );
-    $json->{bkp}++;
+    $check->{bkp}++;
   }
 
   # Ignore the last backup if it's not full or incr (which means it's either partial or active)
   my $i = ( $bpc_info[-1]->{type} =~ m/^full|incr$/ ) ? -1 : -2;
 
-  $json->{errors}           = $bpc_info[$i]->{xferErrs};
-  $json->{new_size}         = $bpc_info[$i]->{sizeNew};
-  $json->{new_size_avg}     = int $sizes->mean;
-  $json->{new_size_median}  = int $sizes->median;
-  $json->{new_size_q1}      = eval { int $sizes->quantile(1) } || 0;
-  $json->{new_size_q3}      = eval { int $sizes->quantile(3) } || 0;
-  $json->{age}              = time - $bpc_info[$i]->{startTime};
-  $json->{last_age}         = sprintf("%.1f", ($json->{age}) / 84600);
+  $check->{errors}           = $bpc_info[$i]->{xferErrs};
+  $check->{new_size}         = $bpc_info[$i]->{sizeNew};
+  $check->{new_size_avg}     = int $sizes->mean;
+  $check->{new_size_median}  = int $sizes->median;
+  $check->{new_size_q1}      = eval { int $sizes->quantile(1) } || 0;
+  $check->{new_size_q3}      = eval { int $sizes->quantile(3) } || 0;
+  $check->{age}              = time - $bpc_info[$i]->{startTime};
+  $check->{last_age}         = sprintf("%.1f", ($check->{age}) / 84600);
 }
 
 # TOO BIG ?
 my $toobig = "1";
-if ( $json->{new_size} > ($json->{new_size_q3} + $json->{new_size_q3} - $json->{new_size_q1}) * 1.5 or $json->{new_size} > $json->{new_size_avg} * 6 ) {
+if ( $check->{new_size} > ($check->{new_size_q3} + $check->{new_size_q3} - $check->{new_size_q1}) * 1.5 or $check->{new_size} > $check->{new_size_avg} * 6 ) {
   $toobig = "1";
   }
 else {
@@ -186,7 +185,7 @@ else {
 
 # TOO SMALL ?
 my $toosmall = "1";
-if ( $json->{new_size} < ($json->{new_size_q1} - $json->{new_size_q3} - $json->{new_size_q1}) * 1.5 or $json->{new_size} < $json->{new_size_avg} / 3 ) {
+if ( $check->{new_size} < ($check->{new_size_q1} - $check->{new_size_q3} - $check->{new_size_q1}) * 1.5 or $check->{new_size} < $check->{new_size_avg} / 3 ) {
   $toosmall = "1";
   }
 else {
diff --git a/readme.txt b/readme.txt
index 55738b7..51de0d1 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,12 +1,14 @@
-# Install Backup-Check
+# Install
 
-## Install dependencies :
+## Install dependencies
 
-``yum -y install perl-JSON perl-Statistics-Descriptive``
+``yum -y perl-Statistics-Descriptive``
+
+## Install Backup-Check
 
 ``sh update.sh``
 
-## Add menu links
+## Add menu link
 
 Edit config -> CGI -> CgiNavBarLinks
 Add link "Check" to "?action=check"
@@ -15,5 +17,5 @@ Add link "Check" to "?action=check"
 # TODO
 
 - Vérification de la fréquence IncrPeriod et FullPeriod pour l'age quotidienne et hebdomadaire.
-- Harmonisation du code Size Consistency avec des variables cohérentes scalaires et sans JSON.
-- Diminuer la redondance des conditions
+- Harmonisation du code Size Consistency avec des variables cohérentes scalaires.
+- Diminuer la redondance des conditions.