Skip to content

Commit c732efe

Browse files
entorbentorb
committed
perltidy findings
1 parent c987ea0 commit c732efe

19 files changed

+2210
-1749
lines changed

‎TMsStrava.pm

+461-374
Large diffs are not rendered by default.

‎activityCalExport.pl

+54-60
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,18 @@
1414
# Modules: My Default Set
1515
use strict;
1616
use warnings;
17-
use 5.010; # say
17+
use 5.010; # say
1818
# use Data::Dumper;
19-
use utf8; # this script is written in UTF-8
19+
use utf8; # this script is written in UTF-8
2020
binmode STDOUT, ':utf8'; # default encoding for linux print STDOUT
21-
use autodie qw (open close); # Replace functions with ones that succeed or die: e.g. close
21+
use autodie qw (open close)
22+
; # Replace functions with ones that succeed or die: e.g. close
2223

23-
use lib ( '/var/www/virtual/entorb/perl5/lib/perl5' );
24+
use lib ('/var/www/virtual/entorb/perl5/lib/perl5');
2425

2526
# Modules: Perl Standard
26-
use Storable; # read and write variables to filesystem
27-
use File::Basename; # for basename, dirname, fileparse
27+
use Storable; # read and write variables to filesystem
28+
use File::Basename; # for basename, dirname, fileparse
2829
use File::Path qw(make_path);
2930
use Date::Parse;
3031
# use DateTime; # not working on uberspace, could not fix it, so tried POSIX instead
@@ -42,87 +43,82 @@
4243
use lib ('.');
4344
# use lib "C:\\Users\\menketrb\\Documents\\Hacken\\Perl\\Strava-Web"; # just for making Visual Studio Code happy
4445
# use lib "d:\\files\\Hacken\\Perl\\Strava-Web";
45-
use TMsStrava qw( %o %s); # at entorb.net some modules require use local::lib!!!
46+
use TMsStrava qw( %o %s)
47+
; # at entorb.net some modules require use local::lib!!!
4648

4749
TMsStrava::htmlPrintHeader( $cgi, 'Export activity calendar' );
4850
TMsStrava::initSessionVariables( $cgi->param("session") );
4951
TMsStrava::htmlPrintNavigation();
5052

51-
52-
53-
54-
5553
# if not already done, fetchActivityList, 200 per page into dir activityList
5654
unless ( -f $s{'pathToActivityListHashDump'} ) {
57-
die("E: activity cache missing");
55+
die("E: activity cache missing");
5856
}
5957

6058
TMsStrava::logIt("reading activity data from dmp file");
61-
my $ref = retrieve( $s{'pathToActivityListHashDump'} ); # retrieve data from file (as ref)
62-
my @allActivityHashes = @{$ref}; # convert arrayref to array
59+
my $ref = retrieve( $s{'pathToActivityListHashDump'} )
60+
; # retrieve data from file (as ref)
61+
my @allActivityHashes = @{$ref}; # convert arrayref to array
6362

6463
my $pathToICS = "$s{'tmpDownloadFolder'}/ActivityList.ics";
6564

6665
# Generate Excel only if not already done
6766
unless ( -f $pathToICS ) {
68-
my $ics_header =
69-
"BEGIN:VCALENDAR
67+
my $ics_header = "BEGIN:VCALENDAR
7068
CALSCALE:GREGORIAN
7169
VERSION:2.0
7270
X-WR-CALNAME:Strava Activity Export by entorb.net
7371
METHOD:PUBLISH
7472
";
75-
my $ics_footer =
76-
"END:VCALENDAR
73+
my $ics_footer = "END:VCALENDAR
7774
";
7875

79-
# V1: DateTime
80-
#my $date_str_now = DateTime->now()->iso8601().'Z';
81-
#$date_str_now =~ s/[\-:]//g;
82-
# V2: POSIX
83-
# my $now = time();
84-
my $date_str_now = strftime('%Y%m%dT%H%M%SZ', gmtime(time()));
76+
# V1: DateTime
77+
# my $date_str_now = DateTime->now()->iso8601().'Z';
78+
# $date_str_now =~ s/[\-:]//g;
79+
# V2: POSIX
80+
# my $now = time();
81+
my $date_str_now = strftime( '%Y%m%dT%H%M%SZ', gmtime( time() ) );
8582

86-
open my $fhOut, '>:encoding(UTF-8)', $pathToICS or die "ERROR: Can't write to file '$pathToICS': $!";
87-
print { $fhOut } $ics_header;
83+
open my $fhOut, '>:encoding(UTF-8)', $pathToICS
84+
or die "ERROR: Can't write to file '$pathToICS': $!";
85+
print {$fhOut} $ics_header;
86+
87+
foreach my $activity (@allActivityHashes) {
88+
my %h = %{$activity}; # each $activity is a hashref
8889

89-
foreach my $activity ( @allActivityHashes ) {
90-
my %h = %{ $activity }; # each $activity is a hashref
91-
# print %h;
9290
foreach my $k ( sort keys %h ) {
93-
# say "$k\t$h{$k}";
91+
# say "$k\t$h{$k}";
9492
}
9593
# say $h{'id'};
9694
# say $h{'type'};
9795
# say $h{'name'};
9896
# say $h{'start_date'};
9997
# say $h{'elapsed_time'};
100-
next if ($h{'elapsed_time'} < 5*60);
101-
my $ts = str2time($h{'start_date'}); # from Date::Parse
102-
# V1: DateTime
103-
# my $dt = DateTime->from_epoch( epoch => $ts + $h{'elapsed_time'});
104-
# my $end_date = $dt->iso8601().'Z';
105-
# $end_date =~ s/[\-:]//g;
106-
my $end_date = strftime('%Y%m%dT%H%M%SZ', gmtime($ts + $h{'elapsed_time'}));
98+
next if ( $h{'elapsed_time'} < 5 * 60 );
99+
100+
my $ts = str2time( $h{'start_date'} ); # from Date::Parse
101+
102+
my $end_date
103+
= strftime( '%Y%m%dT%H%M%SZ', gmtime( $ts + $h{'elapsed_time'} ) );
107104
# say $end_date;
108105
my $start_date = $h{'start_date'};
109106
$start_date =~ s/[\-:]//g;
110107

111-
112108
my $location = "unknown";
113-
if (exists $h{ 'x_nearest_city_start' }){
114-
$location = $h{ 'x_nearest_city_start' }
115-
} else {
116-
my @L = ();
117-
push @L, $h{'location_city'} if $h{'location_city'};
118-
push @L, $h{'location_state'} if $h{'location_state'};
119-
push @L, $h{'location_country'} if $h{'location_country'};
120-
if (@L) {
121-
$location = join (", ", @L);
122-
}
109+
if ( exists $h{'x_nearest_city_start'} ) {
110+
$location = $h{'x_nearest_city_start'};
123111
}
124-
my $vevent =
125-
"BEGIN:VEVENT
112+
else {
113+
my @L = ();
114+
push @L, $h{'location_city'} if $h{'location_city'};
115+
push @L, $h{'location_state'} if $h{'location_state'};
116+
push @L, $h{'location_country'} if $h{'location_country'};
117+
if (@L) {
118+
$location = join( ", ", @L );
119+
}
120+
} ## end else [ if ( exists $h{'x_nearest_city_start'...})]
121+
my $vevent = "BEGIN:VEVENT
126122
UID:strava-id-$h{'id'}
127123
TRANSP:OPAQUE
128124
DTSTART:$start_date
@@ -138,18 +134,16 @@
138134
END:VEVENT
139135
";
140136
# FIXME: SEQUENCE is the revision number of the event and should be increase when creating a new one
141-
print { $fhOut } $vevent;
142-
# last;
143-
}
144-
print { $fhOut } $ics_footer;
145-
close $fhOut;
137+
print {$fhOut} $vevent;
138+
# last;
139+
} ## end foreach my $activity (@allActivityHashes)
140+
print {$fhOut} $ics_footer;
141+
close $fhOut;
146142

147-
148-
}
149-
say "<p>This feature generates a calender of your cached activities in .ics format. This file can be imported into you calender application. I suggest using a new separate Strava calender than can easily be dropped completely if you do not like the result.</p>";
143+
} ## end unless ( -f $pathToICS )
144+
say
145+
"<p>This feature generates a calender of your cached activities in .ics format. This file can be imported into you calender application. I suggest using a new separate Strava calender than can easily be dropped completely if you do not like the result.</p>";
150146

151147
say "Download: <a href=\"$pathToICS\">your activity calendar</a>";
152148

153-
154-
155149
TMsStrava::htmlPrintFooter($cgi);

‎activityExcelExport.pl

+23-20
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
# Modules: My Default Set
1616
use strict;
1717
use warnings;
18-
use 5.010; # say
18+
use 5.010; # say
1919
use Data::Dumper;
20-
use utf8; # this script is written in UTF-8
20+
use utf8; # this script is written in UTF-8
2121
binmode STDOUT, ':utf8'; # default encoding for linux print STDOUT
2222

2323
# Modules: Perl Standard
@@ -35,59 +35,62 @@
3535

3636
# Modules: My Strava Module Lib
3737
use lib ('.');
38-
use lib ( '/var/www/virtual/entorb/perl5/lib/perl5' );
39-
use lib "C:\\Users\\menketrb\\Documents\\Hacken\\Perl\\Strava-Web"; # just for making Visual Studio Code happy
38+
use lib ('/var/www/virtual/entorb/perl5/lib/perl5');
39+
use lib "C:\\Users\\menketrb\\Documents\\Hacken\\Perl\\Strava-Web"
40+
; # just for making Visual Studio Code happy
4041
use lib "d:\\files\\Hacken\\Perl\\Strava-Web";
41-
use TMsStrava qw( %o %s); # at entorb.net some modules require use local::lib!!!
42+
use TMsStrava qw( %o %s)
43+
; # at entorb.net some modules require use local::lib!!!
4244

4345
TMsStrava::htmlPrintHeader( $cgi, 'Excel export of activities' );
4446
TMsStrava::initSessionVariables( $cgi->param("session") );
4547
TMsStrava::htmlPrintNavigation();
4648

4749
# if not already done, fetchActivityList, 200 per page into dir activityList
4850
unless ( -f $s{'pathToActivityListHashDump'} ) {
49-
die("E: activity cache missing");
51+
die("E: activity cache missing");
5052
}
5153

5254
TMsStrava::logIt("reading activity data from dmp file");
53-
my $ref = retrieve( $s{'pathToActivityListHashDump'} ); # retrieve data from file (as ref)
54-
my @allActivityHashes = @{$ref}; # convert arrayref to array
55+
my $ref = retrieve( $s{'pathToActivityListHashDump'} )
56+
; # retrieve data from file (as ref)
57+
my @allActivityHashes = @{$ref}; # convert arrayref to array
5558

5659
my $pathToExcel = "$s{'tmpDownloadFolder'}/ActivityList.xlsx";
5760

5861
# Generate Excel only if not already done
5962
unless ( -f $pathToExcel ) {
60-
TMsStrava::convertActivityHashToExcel( 'ActivityList.xlsx', @allActivityHashes );
63+
TMsStrava::convertActivityHashToExcel( 'ActivityList.xlsx',
64+
@allActivityHashes );
6165
}
6266

6367
my $pathToZipRaw = "$s{'tmpDownloadFolder'}/ActivityListRaw.zip";
6468

6569
# zip source jsons if not already done
6670
unless ( -f $pathToZipRaw ) {
67-
my $dir = dirname($pathToZipRaw);
68-
make_path $dir unless -d $dir;
69-
undef $dir;
70-
my @L = <$s{'tmpDataFolder'}/activityList/*.json>;
71-
TMsStrava::zipFiles( $pathToZipRaw, @L );
71+
my $dir = dirname($pathToZipRaw);
72+
make_path $dir unless -d $dir;
73+
undef $dir;
74+
my @L = <$s{'tmpDataFolder'}/activityList/*.json>;
75+
TMsStrava::zipFiles( $pathToZipRaw, @L );
7276
} ## end unless ( -f $pathToZipRaw )
7377

7478
my $pathToZip = "$s{'tmpDownloadFolder'}/ActivityList.zip";
7579

7680
# zip joined json if not already done
7781
unless ( -f $pathToZip ) {
78-
my $dir = dirname($pathToZip);
79-
make_path $dir unless -d $dir;
80-
undef $dir;
81-
TMsStrava::zipFiles( $pathToZip, $s{ 'pathToActivityListJsonDump' } );
82+
my $dir = dirname($pathToZip);
83+
make_path $dir unless -d $dir;
84+
undef $dir;
85+
TMsStrava::zipFiles( $pathToZip, $s{'pathToActivityListJsonDump'} );
8286
} ## end unless ( -f $pathToZip )
8387

84-
8588
say "Downloads:
8689
<ul>
8790
<li><a href=\"$pathToExcel\">your data as Excel report</a> (fields of prefix 'x_' are extensions by this app and not present in the source .json)
8891
<li><a href=\"download/ActivityListAnalysis.xlsx\">my Excel statistics template</a> (use to paste the values of your data from above generated Excel report)</li>
8992
<li><a href=\"$pathToZip\">your data as zipped .json file (including calculated fields)</a></li>
90-
<li><a href=\"$pathToZipRaw\">your raw data as zipped .json files</a></li>
93+
<li><a href=\"$pathToZipRaw\">your raw data as zipped .json files (unmodified files retrieved from Strava)</a></li>
9194
</ul>
9295
";
9396

0 commit comments

Comments
 (0)