From: Edita Kizinevic Date: Mon, 18 May 2020 12:12:42 +0000 (+0200) Subject: Add file size X-Git-Tag: AWSTATS_7_9~9^2~7^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c3dcdbe3f852380d2ac7228384f52b1bdfe9933;p=thirdparty%2FAWStats.git Add file size --- diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf index d0108b29..51bbb0d3 100644 --- a/wwwroot/cgi-bin/awstats.model.conf +++ b/wwwroot/cgi-bin/awstats.model.conf @@ -1049,9 +1049,9 @@ ShowPagesStats=PBEX # Default: HB, Possible column codes: HBC ShowFileTypesStats=HB -# Show file size chart (Not yet available) +# Show file size chart. # Context: Web, Streaming, Mail, Ftp -# Default: 1, Possible column codes: None +# Default: 0, Possible column codes: None ShowFileSizesStats=0 # Show downloads chart. diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl index 3a3d4c6f..818585a6 100755 --- a/wwwroot/cgi-bin/awstats.pl +++ b/wwwroot/cgi-bin/awstats.pl @@ -373,6 +373,7 @@ use vars qw/ use vars qw/ @MiscListOrder %MiscListCalc %OSFamily %BrowsersFamily @SessionsRange %SessionsAverage + @PayloadRange %PayloadAverage %LangBrowserToLangAwstats %LangAWStatsToFlagAwstats %BrowsersSafariBuildToVersionHash @HostAliases @AllowAccessFromWebToFollowingAuthenticatedUsers @DefaultFile @SkipDNSLookupFor @@ -413,6 +414,12 @@ use vars qw/ '1h+', 3600 ); +@PayloadRange = ('0-44', '44-100', '100-500', '500-1K', '1K-2K', '2K-5K', '5K+'); +%PayloadAverage = ( + '0-44', 44, '44-100', 100, '100-500', 500, '500-1K', 1024, + '1K-2K', 2048, '2K-5K', 5120, '5K+', 5121 +); + # HTTP-Accept or Lang parameter => AWStats code to use for lang # ISO-639-1 or 2 or other => awstats-xx.txt where xx is ISO-639-1 %LangBrowserToLangAwstats = ( @@ -526,6 +533,7 @@ use vars qw/ %MonthPages %MonthHits %MonthBytes %MonthNotViewedPages %MonthNotViewedHits %MonthNotViewedBytes %_session %_browser_h %_browser_p + %_filesize %_domener_p %_domener_h %_domener_k %_errors_h %_errors_k %_filetypes_h %_filetypes_k %_filetypes_gz_in %_filetypes_gz_out %_host_p %_host_h %_host_k %_host_l %_host_s %_host_u @@ -739,7 +747,9 @@ use vars qw/ @Message /; 'Konqueror versions', ',', 'Downloads', - 'Export CSV' + 'Export CSV', + 'Frequency[/s]', + 'Request size' ); #------------------------------------------------------------------------------ @@ -1615,6 +1625,25 @@ sub Get_Filename{ return $temp; } +#------------------------------------------------------------------------------ +# Function: Return string of Bandwidth Range +# Parameters: $starttime $endtime +# Input: None +# Output: None +# Return: A string that identify the bandwidth range +#------------------------------------------------------------------------------ +sub GetBandwidthRange { + my $payload = shift; + if ($Debug) { debug("GetPayloadRange $payload",4); } + if ($payload <= 44) { return $PayloadRange[0]; } + if ($payload <= 100) { return $PayloadRange[1]; } + if ($payload <= 500) { return $PayloadRange[2]; } + if ($payload <= 1024) { return $PayloadRange[3]; } + if ($payload <= 2048) { return $PayloadRange[4]; } + if ($payload <= 5120) { return $PayloadRange[5]; } + return $PayloadRange[6]; +} + #------------------------------------------------------------------------------ # Function: Compare two browsers version # Parameters: $a @@ -3393,6 +3422,7 @@ sub Read_History_With_TmpUpdate { 'searchwords' => 25, 'keywords' => 26, 'errors' => 27, + 'filesize' => 28, ); my $order = ( scalar keys %allsections ) + 1; @@ -3501,6 +3531,13 @@ sub Read_History_With_TmpUpdate { { $SectionsToLoad{'session'} = $order++; } + if ( $UpdateStats + || $MigrateStats + || ($HTMLOutput{'main'} && $ShowFileSizesStats) + || $HTMLOutput{'filesizes'} ) + { + $SectionsToLoad{'filesize'} = $order++; + } if ( $UpdateStats || $MigrateStats || ( $HTMLOutput{'main'} && $ShowPagesStats ) @@ -3847,6 +3884,52 @@ sub Read_History_With_TmpUpdate { next; } + # BEGIN_FILESIZE + if ( $field[0] eq 'BEGIN_FILESIZE' ) { + if ($Debug) { debug(" Begin of FILESIZE section"); } + $field[0] = ''; + my $count = 0; + my $countloaded = 0; + do { + if ( $field[0] ) { + $count++; + if ( $SectionsToLoad{'filesize'} ) { + $countloaded++; + if ($field[1]) { + $_filesize{ $field[0] } += $field[1]; + } + } + } + $_ = ; + chomp $_; + s/\r//; + @field = + split( /\s+/, + ( $readxml ? CleanFromTags($_) : $_) ); + $countlines++; + } until ( $field[0] eq 'END_FILESIZE' + || $field[0] eq "${xmleb}END_FILESIZE" + || ! $_ ); + if ( $field[0] ne 'END_FILESIZE' + && $field[0] ne "${xmleb}END_FILESIZE") + { + error( +"History file \"$filetoread\" is corrupted (End of section FILESIZE not found).\nRestore a recent backup of this file (data for this month will be restored to backup date), remove it (data for month will be lost), or remove the corrupted section in file (data for at least this section will be lost).","","",1 + ); + } + if ($Debug) { + debug( +" End of FILESIZE section ($count entries, $countloaded loaded)" + ); + } + delete $SectionsToLoad{'filesize'}; + if ( !scalar %SectionsToLoad ) { + debug(" Stop reading history file. Got all we need."); + last; + } + next; + } + # BEGIN_MISC if ( $field[0] eq 'BEGIN_MISC' ) { if ($Debug) { debug(" Begin of MISC section"); } @@ -6340,6 +6423,9 @@ sub Save_History { print HISTORYTMP "${xmlrb}POS_SESSION${xmlrs}"; $PosInFile{"session"} = tell HISTORYTMP; print HISTORYTMP "$spacebar${xmlre}\n"; + print HISTORYTMP "${xmlrb}POS_FILESIZE${xmlrs}"; + $PosInFile{"filesize"} = tell HISTORYTMP; + print HISTORYTMP "$spacebar${xmlre}\n"; print HISTORYTMP "${xmlrb}POS_SIDER${xmlrs}"; $PosInFile{"sider"} = tell HISTORYTMP; print HISTORYTMP "$spacebar${xmlre}\n"; @@ -6870,6 +6956,25 @@ sub Save_History { } print HISTORYTMP "${xmleb}END_SESSION${xmlee}\n"; } + if ($sectiontosave eq 'filesize') + { # This section must be saved after VISITOR section is read + print HISTORYTMP "\n"; + if ($xml) { + print HISTORYTMP "
\n"; + } + print HISTORYTMP "# Payload Range - Payload Frequency\n"; + $ValueInFile{$sectiontosave} = tell HISTORYTMP; + print HISTORYTMP "${xmlbb}BEGIN_FILESIZE${xmlbs}" + . ( scalar keys %_filesize ) + . "${xmlbe}\n"; + foreach ( keys %_filesize) { + print HISTORYTMP "${xmlrb}$_${xmlrs}" + . int( $_filesize{$_} ) + . "${xmlre}\n"; + } + print HISTORYTMP "${xmleb}END_FILESIZE${xmlee}\n"; + + } if ( $sectiontosave eq 'sider' ) { # This section must be saved after VISITOR section is read print HISTORYTMP "\n"; @@ -7746,6 +7851,7 @@ sub Init_HashArray { # Reset all hash arrays with name beginning by _ %_session = %_browser_h = %_browser_p = (); + %_filesize = (); %_domener_p = %_domener_h = %_domener_k = %_errors_h = %_errors_k = (); %_filetypes_h = %_filetypes_k = %_filetypes_gz_in = %_filetypes_gz_out = (); %_host_p = %_host_h = %_host_k = %_host_l = %_host_s = %_host_u = (); @@ -10301,6 +10407,12 @@ sub HTMLMenu{ "$Message[117]"; print( $frame? "\n" : "   " ); } + if ($ShowFileSizesStats) { + print ( $frame? "" : "" ); + print +"$Message[181]"; + print ( $frame? "\n" : "   "); + } if ($ShowFileTypesStats && $LevelForFileTypesDetection > 0) { print( $frame? "" : "" ); print @@ -10772,6 +10884,85 @@ sub HTMLMainFileType{ &tab_end(); } +#------------------------------------------------------------------------------ +# Function: Prints the File Size Table +# Parameters: _ +# Input: _ +# Output: HTML +# Return: - +#------------------------------------------------------------------------------ +sub HTMLMainFileSize{ + if ($Debug) { debug("ShowFileSizesStats",2); } + my $FirstTime = 0; + my $LastTime = 0; + foreach my $key ( keys %FirstTime ) { + my $keyqualified = 0; + if ( $MonthRequired eq 'all' ) { $keyqualified = 1; } + if ( $key =~ /^$YearRequired$MonthRequired/ ) { $keyqualified = 1; } + if ($keyqualified) { + if ( $FirstTime{$key} + && ( $FirstTime == 0 || $FirstTime > $FirstTime{$key} ) ) + { + $FirstTime = $FirstTime{$key}; + } + if ( $LastTime < ( $LastTime{$key} || 0 ) ) { + $LastTime = $LastTime{$key}; + } + } + } + + my $inicio = 0; + my $fim = 0; + if ($FirstTime =~ /$regdate/o) { $inicio = Time::Local::timelocal($6, $5, $4, $3, $2-1, $1); } + if ($LastTime =~ /$regdate/o) { $fim = Time::Local::timelocal($6, $5, $4, $3, $2-1, $1); } + my $periodo = $fim - $inicio; + my $number_of_requests = 0; + my $request_frequency_average = 0; + foreach my $key (@PayloadRange) { + $number_of_requests += $_filesize{$key}; + } + if ($periodo) { $request_frequency_average = $number_of_requests/$periodo;} + else { $request_frequency_average = 0 }; + print "$Center 
\n"; + my $title = "$Message[181]"; + &tab_head($title, 19, 0, 'filesizes'); + my $Totals = 0; + my $average_s = 0; + foreach (@PayloadRange) { + $average_s += ( $_filesize{$_} || 0 ) * $PayloadAverage{$_}; + $Totals += $_filesize{$_} || 0; + } + if ($Totals) { $average_s = int($average_s / $Totals); } + else { $average_s = '?'; } + print "Number of requests: $number_of_requests - Period: $periodo s - Request average frequency [/s]: ".sprintf ("%.6f",$request_frequency_average)."$Message[180]$Message[57]$Message[15]\n"; + my $total_s = 0; + my $count = 0; + foreach my $key (@PayloadRange) { + my $p = 0; + my $f = 0; + if ($Totals) { $p = int($_filesize{$key} / $Totals * 1000) / 10; } + if ($periodo) { $f = $_filesize{$key} / $periodo; } + $total_s += $_filesize{$key} || 0; + print "$key"; + print "".($_filesize{$key}? sprintf("%.5f",$f):" ").""; + print "".($_filesize{$key}? $_filesize{$key}:" ").""; + print "".($_filesize{$key}? "$p %":" ").""; + print "\n"; + $count++; + } + my $rest_s = $TotalVisits-$total_s; + if ($rest_s > 0) { + my $p = 0; + if ($TotalVisits) { $p = int($rest_s / $TotalVisits * 1000) / 10; } + print "$Message[0]"; + print "$rest_s"; + print "".($rest_s?"$p %":" ").""; + print "\n"; + } + + &tab_end(); +} + #------------------------------------------------------------------------------ # Function: Prints the Browser Detail frame or static page # Parameters: _ @@ -20243,6 +20434,12 @@ s/^(cache|related):[^\+]+// int( $field[$pos_size] );} #Count accesses for page (kb) } + # Check size frequency + #--------------------- + if ( $pos_size >= 0 ) { + $_filesize{ GetBandwidthRange(int($field[$pos_size])) }++; + } + # Analyze: Extra #--------------- foreach my $extranum ( 1 .. @ExtraName - 1 ) { @@ -21345,7 +21542,7 @@ if ( scalar keys %HTMLOutput ) { # BY FILE SIZE #------------------------- if ($ShowFileSizesStats) { - # TODO + &HTMLMainFileSize(); } # BY DOWNLOADS diff --git a/wwwroot/cgi-bin/lang/awstats-en.txt b/wwwroot/cgi-bin/lang/awstats-en.txt index f8f4d562..ff519169 100644 --- a/wwwroot/cgi-bin/lang/awstats-en.txt +++ b/wwwroot/cgi-bin/lang/awstats-en.txt @@ -180,4 +180,6 @@ message175=Chrome versions message176=Konqueror versions message177=, message178=Downloads -message179=TB \ No newline at end of file +message179=TB +message180=Frequency[/s] +message181=Request size