X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=make_static.PL;h=06c9eeea791cd9e8da281f4d43fbb576d1398c4e;hb=6f5debb62f9d49098b660b626890a46dbbf7346f;hp=44f56fa6012f89f1d0093eb3ab101e0781b5613e;hpb=1d4981aae22600f090d67d740017682354162ec8;p=plack-app-gruntmaster.git

diff --git a/make_static.PL b/make_static.PL
index 44f56fa..06c9eee 100644
--- a/make_static.PL
+++ b/make_static.PL
@@ -2,71 +2,97 @@
 use v5.14;
 use warnings;
 
-use CSS::Minifier::XS qw//;
-use CSS::SpriteMaker;
-
+use CSS::Minifier::XS qw/minify/;
 use Digest::SHA qw/sha256_base64/;
 use IO::Compress::Gzip qw/gzip/;
 use File::Slurp qw/read_file write_file edit_file_lines/;
+use SVG::SpriteMaker;
+use File::Which;
+use List::Util qw/first/;
 
 mkdir 'static';
 mkdir 'static/css';
 mkdir 'static/js';
+mkdir 'static/logos';
 
-sub make_sprite {
-	my $maker = Local::CSS::SpriteMaker->new(
-		css_class_prefix => 'logo-',
-		rc_override_classname => sub {
-			my ($name) = @_;
-			$name =~ s/-light/.logo-light/r;
-		}
-	);
-
-	$maker->make_sprite(
-		source_images     => ['logos/'],
-		target_file       => 'static/logos.png',
-		add_extra_padding => 10,
-	);
-
-	$maker->print_css(
-		filename        => 'css/logos.css',
-		sprite_filename => '/static/logos.png',
-	);
-
-	system 'pngnq-s9', '-s1', 'static/logos.png';
-	system 'optipng', '-o7', '-zm1-9', 'static/logos-nq8.png';
-	rename 'static/logos-nq8.png', 'static/logos.png';
+sub gzip_file {
+	my ($file) = @_;
+	my $zopfli = which 'zopfli';
+	system $zopfli => $file if $zopfli;
+	gzip $file => "$file.gz", -Level => 9, Minimal => 1 unless $zopfli;
 }
 
-sub gzip_file {
+sub write_gzfile {
+	my ($file, @content) = @_;
+	write_file $file, @content;
+	gzip_file $file
+}
+
+sub sprite_name {
+	my ($name) = $_[0] =~ m,/(.*)\.svg,;
+	"logo-$name"
+}
+
+sub make_logos {
+	my @logos = <logos/*>;
+	my $logos = make_sprite \&sprite_name, @logos;
+	my @logos_light;
+	for (<logos/*>) {
+		my $light = s/logos/logos-light/r;
+		push @logos_light, -f $light ? $light : $_;
+	}
+	my $logos_light = make_sprite \&sprite_name, @logos_light;
+
+	write_gzfile 'static/logos/dark.svg', $logos->render;
+	write_gzfile 'static/logos/light.svg', $logos_light->render;
+}
+
+sub read_css_into_blocks {
 	my ($file) = @_;
-	gzip $file => "$file.gz", -Level => 9, Minimal => 1;
+	my (@blocks, $block);
+	for (read_file $file) {
+		$block .= $_;
+		if (/^}/) {
+			push @blocks, $block;
+			$block = '';
+		}
+	}
+	\@blocks
 }
 
 sub make_css {
-	my $common_css;
-	$common_css .= read_file $_ for <css/*.css>;
+	my %css;
+	$css{common} .= read_file $_ for <css/*.css>;
+
+	my (%themes, $rndtheme);
 	for (<css/themes/*>) {
-		my ($theme) = m,themes/(.*)\.css,;
-		my $css = read_file $_;
-		$css .= $common_css;
-		write_file "static/css/$theme.css", CSS::Minifier::XS::minify $css;
-		gzip_file "static/css/$theme.css";
+		($rndtheme) = m,themes/(.*)\.css,;
+		$themes{$rndtheme} = read_css_into_blocks $_;
 	}
+
+	while (grep { scalar @$_ } values %themes) {
+		my %blocks = map { $_ => (shift @{$themes{$_}}) // '' } keys %themes;
+		if (grep { $_ ne $blocks{$rndtheme} } values %blocks) {
+			$css{$_} .= $blocks{$_} for keys %themes;
+		} else {
+			$css{common} .= $blocks{$rndtheme};
+		}
+	}
+
+	write_gzfile "static/css/$_.css", minify $css{$_} for keys %css
 }
 
 sub make_js {
 	system java => -jar => 'compiler.jar', qw,-O SIMPLE --create_source_map static/js/js.map --js_output_file static/js/all.js --language_in ECMASCRIPT6_STRICT --language_out ECMASCRIPT5_STRICT --source_map_location_mapping js/|/static/js/,, <js/*>;
 	my $js = read_file 'static/js/all.js';
-	write_file 'static/js/all.js', '//# sourceMappingURL=/static/js/js.map', "\n", $js;
+	write_gzfile 'static/js/all.js', '//# sourceMappingURL=/static/js/js.map', "\n", $js;
 	system 'cp', '-rp', 'js', 'static/';
-	gzip_file 'static/js/all.js';
 }
 
-my $sprite_mtime = -M 'static/logos.png' // 0;
-for (<logos/*>) {
+my $sprite_mtime = -M 'static/logos/dark.svg' // 0;
+for (<logos/*>, <logos-light/*>) {
 	if (!$sprite_mtime || $sprite_mtime > -M) {
-		make_sprite;
+		make_logos;
 		last
 	}
 }
@@ -79,7 +105,7 @@ for (<css/*>, <css/themes/*>) {
 	}
 }
 
-my $js_mtime = -M 'static/js.js' // 0;
+my $js_mtime = -M 'static/js/all.js' // 0;
 for (<js/*>) {
 	if (!$js_mtime || $js_mtime > -M) {
 		make_js;
@@ -93,24 +119,3 @@ edit_file_lines {
 	my $hash = sha256_base64 scalar read_file $file;
 	s/integrity=".*"/integrity="sha256-$hash="/;
 } 'tmpl/skel.en';
-
-package
-  Local::CSS::SpriteMaker;
-
-use parent qw/CSS::SpriteMaker/;
-
-sub _get_stylesheet_string {
-	my $self = shift;
-	my @ret = split "\n", $self->SUPER::_get_stylesheet_string(@_);
-	shift @ret;
-	@ret = sort @ret;
-	unshift @ret, <<EOF;
-a.logo {
-	background-image: url("/static/logos.png");
-	background-repeat: no-repeat;
-	display: inline-block;
-	vertical-align: middle;
-}
-EOF
-	join "\n", @ret;
-}