Revert "Remove tar and tar.xz sdist support since PyPI does not support them"

This reverts commit 643bf04.

Author: messense

Cargo.toml

@@ -18,4 +18,5 @@ fs-err = "2.6.0"
 mailparse = "0.13.4"
 serde = { version = "1.0.126", features = ["derive"], optional = true }
 tar = "0.4.35"
+xz = "0.1.0"
 zip = "0.5.12"

src/distribution.rs

@@ -5,6 +5,7 @@ use std::str::FromStr;
 
 use bzip2::read::BzDecoder;
 use flate2::read::GzDecoder;
+use xz::read::XzDecoder;
 use zip::ZipArchive;
 
 use crate::{Error, Metadata};
@@ -23,8 +24,10 @@ pub enum DistributionType {
 #[derive(Debug, Clone, Copy)]
 enum SDistType {
     Zip,
+    Tar,
     GzTar,
     BzTar,
+    XzTar,
 }
 
 /// Python package distribution
@@ -51,8 +54,10 @@ impl FromStr for SDistType {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let dist_type = match s {
             "zip" => SDistType::Zip,
+            "tar" => SDistType::Tar,
             "gz" => SDistType::GzTar,
             "bz2" => SDistType::BzTar,
+            "xz" => SDistType::XzTar,
             _ => return Err(Error::UnknownDistributionType),
         };
         Ok(dist_type)
@@ -65,7 +70,7 @@ impl Distribution {
         let path = path.as_ref();
         if let Some(ext) = path.extension().and_then(|ext| ext.to_str()) {
             let dist_type = match ext {
-                "zip" | "gz" | "bz2" => DistributionType::SDist,
+                "zip" | "tar" | "gz" | "bz2" | "xz" => DistributionType::SDist,
                 "egg" => DistributionType::Egg,
                 "whl" => DistributionType::Wheel,
                 _ => return Err(Error::UnknownDistributionType),
@@ -136,9 +141,13 @@ impl Distribution {
             SDistType::GzTar => {
                 Self::parse_tar(GzDecoder::new(BufReader::new(fs_err::File::open(path)?)))
             }
+            SDistType::Tar => Self::parse_tar(BufReader::new(fs_err::File::open(path)?)),
             SDistType::BzTar => {
                 Self::parse_tar(BzDecoder::new(BufReader::new(fs_err::File::open(path)?)))
             }
+            SDistType::XzTar => {
+                Self::parse_tar(XzDecoder::new(BufReader::new(fs_err::File::open(path)?)))
+            }
         }
     }
 

tests/fixtures/build-0.4.0.tar

@@ -36,6 +36,17 @@ fn test_parse_sdist_zip() {
     assert_eq!(dist.python_version(), "source");
 }
 
+#[test]
+fn test_parse_sdist_tar() {
+    let dist = Distribution::new("tests/fixtures/build-0.4.0.tar").unwrap();
+    assert_eq!(dist.r#type(), DistributionType::SDist);
+    let metadata = dist.metadata();
+    assert_eq!(metadata.metadata_version, "2.1");
+    assert_eq!(metadata.name, "build");
+    assert!(metadata.home_page.is_none());
+    assert!(metadata.download_url.is_none());
+}
+
 #[test]
 fn test_parse_sdist_tar_gz() {
     let dist = Distribution::new("tests/fixtures/build-0.4.0.tar.gz").unwrap();
@@ -59,3 +70,14 @@ fn test_parse_sdist_tar_bz2() {
     assert!(metadata.download_url.is_none());
     assert_eq!(dist.python_version(), "source");
 }
+
+#[test]
+fn test_parse_sdist_tar_xz() {
+    let dist = Distribution::new("tests/fixtures/build-0.4.0.tar.xz").unwrap();
+    assert_eq!(dist.r#type(), DistributionType::SDist);
+    let metadata = dist.metadata();
+    assert_eq!(metadata.metadata_version, "2.1");
+    assert_eq!(metadata.name, "build");
+    assert!(metadata.home_page.is_none());
+    assert!(metadata.download_url.is_none());
+}