From 3a819d0e2cee7339f67bb28c867b85e91d843ab0 Mon Sep 17 00:00:00 2001
From: xgdyp <zxyasrf@163.com>
Date: Wed, 7 Jul 2021 20:03:30 +0800
Subject: [PATCH] remove rar 7z type

---
 .gitignore           |  3 +++
 be/.gitignore        |  1 +
 be/app/libs/tools.py | 28 ++++++++++++++--------------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1da8522..1d64f8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 .idea
+b3/.idea
+be/__pycache__
+be/app/projects/*
\ No newline at end of file
diff --git a/be/.gitignore b/be/.gitignore
index 3f9881e..4c019c1 100644
--- a/be/.gitignore
+++ b/be/.gitignore
@@ -4,3 +4,4 @@ app/projects/*
 
 
 
+
diff --git a/be/app/libs/tools.py b/be/app/libs/tools.py
index 48d344c..fd35e9a 100644
--- a/be/app/libs/tools.py
+++ b/be/app/libs/tools.py
@@ -1,10 +1,10 @@
 import os
 import json
 import zipfile
-import rarfile
-import py7zr
 import tarfile
-import gzip
+# import rarfile
+# import py7zr
+
 from os import rename
 from os import listdir
 from shutil import move
@@ -50,16 +50,16 @@ def unzip_file(zip_src, dst_dir):
         for file in fz.namelist():
             fz.extract(file, dst_dir)
         return "unzip .zip file success"
-    elif rarfile.is_rarfile(zip_src):
-        fr = rarfile.RarFile(zip_src, "r")
-        print(fr.namelist())
-        for file in fr.namelist():
-            fr.extract(file, dst_dir)
-        return "unzip .rar file success"
-    elif py7zr.is_7zfile(zip_src):
-        f7z = py7zr.SevenZipFile(zip_src, "r")
-        f7z.extractall(path=dst_dir)
-        f7z.close()
+    # elif rarfile.is_rarfile(zip_src):
+    #     fr = rarfile.RarFile(zip_src, "r")
+    #     print(fr.namelist())
+    #     for file in fr.namelist():
+    #         fr.extract(file, dst_dir)
+    #     return "unzip .rar file success"
+    # elif py7zr.is_7zfile(zip_src):
+    #     f7z = py7zr.SevenZipFile(zip_src, "r")
+    #     f7z.extractall(path=dst_dir)
+    #     f7z.close()
     elif tarfile.is_tarfile(zip_src):
 
         ft = tarfile.TarFile(zip_src, "r")
@@ -68,4 +68,4 @@ def unzip_file(zip_src, dst_dir):
             ft.extract(file,dst_dir)
 
     else:
-        return "请上传.zip .rar .tar .7z格式的文件"
+        return "请上传.zip .tar格式的文件"