Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zipper fix 13.0 to main #1289

Merged
merged 2 commits into from
Jan 30, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions computingservices/ZippingServices/services/zipperservice.py
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
import json
import traceback
import PyPDF2
from os import path

def processmessage(message):
try:
@@ -113,16 +114,18 @@ def __zipfilesandupload(_message, s3credentials):

_docbytes = __getdocumentbytearray(fileobj, s3credentials)
_formattedbytes = None

try:
_formattedbytes = __removesensitivecontent(_docbytes)
if _formattedbytes is not None:
print("_formattedbytes length is {0}".format(len(_formattedbytes)))
else:
print("_formattedbytes is none")
except Exception:
print("error happened while removing sensitive content of {0} ".format(filename))
print(traceback.format_exc())
_filename, extension = path.splitext(fileobj["s3uripath"])

if extension.lower() == '.pdf':
try:
_formattedbytes = __removesensitivecontent(_docbytes)
if _formattedbytes is not None:
print("_formattedbytes length is {0}".format(len(_formattedbytes)))
else:
print("_formattedbytes is none")
except Exception:
print("error happened while removing sensitive content of {0} ".format(filename))
print(traceback.format_exc())
#added a space to try out code merge on git. 18-Sept-2024
zip.writestr(
filename, _docbytes if _formattedbytes is None else _formattedbytes
@@ -172,4 +175,4 @@ def __getzipfilepath(foldername, filename):
foldername.capitalize() + "/" + filename + ".zip"
if foldername is not None
else filename + ".zip"
)
)