X-Git-Url: http://git.ieval.ro/?p=gruntmaster-page.git;a=blobdiff_plain;f=make_static.PL;h=f599a56b5db514f6b15e87a1e9ae71b89d4afa2b;hp=3374f5cf2a61c7769cb1a5718bd76ef657386ee6;hb=refs%2Fheads%2Fnodbic;hpb=a90fc634742cd0ce748dd7c65a73e347ba3d9ab5

diff --git a/make_static.PL b/make_static.PL
index 3374f5c..f599a56 100644
--- a/make_static.PL
+++ b/make_static.PL
@@ -6,6 +6,7 @@ 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 File::Which;
 use List::Util qw/first/;
 
 mkdir 'static';
@@ -14,7 +15,15 @@ mkdir 'static/js';
 
 sub gzip_file {
 	my ($file) = @_;
-	gzip $file => "$file.gz", -Level => 9, Minimal => 1;
+	my $zopfli = which 'zopfli';
+	system $zopfli => $file if $zopfli;
+	gzip $file => "$file.gz", -Level => 9, Minimal => 1 unless $zopfli;
+}
+
+sub write_gzfile {
+	my ($file, @content) = @_;
+	write_file $file, @content;
+	gzip_file $file
 }
 
 sub read_css_into_blocks {
@@ -30,40 +39,53 @@ sub read_css_into_blocks {
 	\@blocks
 }
 
+my $default_theme = 'cyborg';
+
+sub theme_prefix {
+	my ($theme, $decl, $default) = @_;
+	return $decl if $theme eq $default_theme || !$decl;
+	return '' if $decl eq $default;
+
+	$default =~ s/[^{]*{\n//;
+	$default =~ s/\n}[^}]*//;
+	$decl =~ s/^$_$//m for split "\n", $default;
+	$decl =~ s/\n+/\n/g;
+
+	my $prefix = "html.$theme";
+	my ($first_line) = $decl =~ /([^{]*){/;
+	$first_line =~ s/(,\s+)/$1 $prefix /g;
+	$first_line = "$prefix $first_line";
+	$decl =~ s/([^{]*){/$first_line\{/;
+	$decl
+}
+
 sub make_css {
-	my %css;
-	$css{common} .= read_file $_ for <css/*.css>;
+	my $css = join '', map { read_file $_ } <css/*.css>;
 
-	my (%themes, $rndtheme);
+	my (%themes);
 	for (<css/themes/*>) {
-		($rndtheme) = m,themes/(.*)\.css,;
-		$themes{$rndtheme} = read_css_into_blocks $_;
+		my ($theme) = m,themes/(.*)\.css,;
+		$themes{$theme} = read_css_into_blocks $_;
 	}
+	my @themes = sort grep { $_ ne $default_theme } keys %themes;
 
 	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};
-		}
+		$css .= $blocks{$default_theme};
+		$css .= theme_prefix $_, $blocks{$_}, $blocks{$default_theme} for @themes
 	}
 
-	for my $name (keys %css) {
-		write_file "static/css/$name.css", minify $css{$name};
-		gzip_file "static/css/$name.css"
-	}
+	write_gzfile "static/css/all.css", minify $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 $css_mtime = -M 'static/css/slate.css' // 0;
+my $css_mtime = -M 'static/css/all.css' // 0;
 for (<css/*>, <css/themes/*>) {
 	if (!$css_mtime || $css_mtime > -M) {
 		make_css;