X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=43ea98853ffbd6e41f9e108512009d46063f1cb5;hp=b9a651cb5261e6b0981c015772387121d8907300;hb=4e9898a97f5c3c52d1277ed73cb4365b8644870a;hpb=e9e1e766fa27b190f194941c497f022ad7bf1b1f

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index b9a651c..43ea988 100644
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -131,11 +131,7 @@ sub get_query_string {
 		next unless defined($value);
 		next if (defined($defparam->{$key}) && $value == $defparam->{$key});
 
-		$value = URI::Escape::uri_escape($value);
-
-		# Unescape a few for prettiness (we'll need something for a real _, though)
-		$value =~ s/%20/_/g;
-		$value =~ s/%2F/\//g;
+		$value = pretty_escape($value);
 	
 		$str .= ($first) ? "?" : ';';
 		$str .= "$key=$value";
@@ -144,6 +140,44 @@ sub get_query_string {
 	return $str;
 }
 
+# This is not perfect (it can't handle "_ " right, for one), but it will do for now
+sub weird_space_encode {
+	my $val = shift;
+	if ($val =~ /_/) {
+		return "_" x (length($val) * 2);
+	} else {
+		return "_" x (length($val) * 2 - 1);
+	}
+}
+
+sub weird_space_unencode {
+	my $val = shift;
+	if (length($val) % 2 == 0) {
+		return "_" x (length($val) / 2);
+	} else {
+		return " " x ((length($val) + 1) / 2);
+	}
+}
+		
+sub pretty_escape {
+	my $value = shift;
+
+	$value =~ s/(([_ ])\2*)/weird_space_encode($1)/ge;
+	$value = URI::Escape::uri_escape($value);
+	$value =~ s/%2F/\//g;
+
+	return $value;
+}
+
+sub pretty_unescape {
+	my $value = shift;
+
+	# URI unescaping is already done for us
+	$value =~ s/(_+)/weird_space_unencode($1)/ge;
+
+	return $value;
+}
+
 sub print_link {
 	my ($r, $title, $baseurl, $param, $defparam, $accesskey) = @_;
 	my $str = "<a href=\"$baseurl" . get_query_string($param, $defparam) . "\"";