Initial tests

Document lzma/xz support in manpage
Merge pull request #2 from bitwave/tar-lzma-support
2019-02-14 23:35:41 +01:00 · 2019-02-14 23:25:36 +01:00 · 2019-02-14 23:22:58 +01:00 · 2018-04-25 19:08:58 +02:00
2 changed files with 6 additions and 2 deletions
--- a/6
+++ b/6
@ -227,7 +227,7 @@ class FileHandler(FileBaseHandler):
 class TarFileHandler(FileBaseHandler):
 	target = None
 	compression = "none"
-	compressionMethods = ("none", "gzip", "bzip2")
+	compressionMethods = ("none", "gzip", "bzip2", "xz")
 	def do_HEAD(self):
 		if self.checkAndDoRedirect():
@ -269,6 +269,8 @@ class TarFileHandler(FileBaseHandler):
 			cmd = ["tar", "-cz"]
 		elif self.compression == "bzip2":
 			cmd = ["tar", "-cj"]
 		elif self.compression == "xz":
 			cmd = ["tar", "-cJ"]
 		else:
 			raise ValueError("Unknown compression mode '%s'." % self.compression)
@ -287,6 +289,8 @@ class TarFileHandler(FileBaseHandler):
 			return ".tar.gz"
 		elif TarFileHandler.compression == "bzip2":
 			return ".tar.bz2"
 		elif TarFileHandler.compression == "xz":
 			return ".tar.xz"
 		raise ValueError("Unknown compression mode '%s'." % TarFileHandler.compression)
--- a/servefile.1
+++ b/servefile.1
@ -94,7 +94,7 @@ available.
 .TP
 \fB\-c\fR method, \fB\-\-compression\fR method
 Set compression method, only in combination with
-\fB\-\-tar\fR. Can be one of none, gzip, bzip2.
+\fB\-\-tar\fR. Can be one of none, gzip, bzip2, xz.
 .TP
 \fB\-4\fR, \fB\-\-ipv4\-only\fR
 Listen on IPv4 only
Author	SHA1	Message	Date
Sebastian Lohff	d52669b8b0	Initial tests	2019-02-14 23:35:41 +01:00
Sebastian Lohff	30738981f4	Document lzma/xz support in manpage	2019-02-14 23:25:36 +01:00
Sebastian Lohff	53d803626d	Merge pull request #2 from bitwave/tar-lzma-support added compression method lzma for tar files	2019-02-14 23:22:58 +01:00
bitwave	aeb8588198	added compression method lzma for tar files	2018-04-25 19:08:58 +02:00