You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by GitBox <gi...@apache.org> on 2021/08/04 15:20:39 UTC
[GitHub] [nifi-minifi-cpp] lordgamez opened a new pull request #1153: MINIFICPP-1622 Fix filename update of CompressContent in case of tar.gz
lordgamez opened a new pull request #1153:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1153
https://issues.apache.org/jira/browse/MINIFICPP-1622
---------------------------------------------------------------------------------------------------
Thank you for submitting a contribution to Apache NiFi - MiNiFi C++.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
### For all changes:
- [ ] Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
- [ ] Does your PR title start with MINIFICPP-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
- [ ] Has your PR been rebased against the latest commit within the target branch (typically main)?
- [ ] Is your initial contribution a single, squashed commit?
### For code changes:
- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [ ] If applicable, have you updated the LICENSE file?
- [ ] If applicable, have you updated the NOTICE file?
### For documentation related changes:
- [ ] Have you ensured that format looks appropriate for the output in which it is rendered?
### Note:
Please ensure that once the PR is submitted, you check GitHub Actions CI results for build issues and submit an update to your PR as soon as possible.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] adamdebreceni commented on a change in pull request #1153: MINIFICPP-1622 Fix filename update of CompressContent in case of tar.gz
Posted by GitBox <gi...@apache.org>.
adamdebreceni commented on a change in pull request #1153:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1153#discussion_r683343728
##########
File path: extensions/libarchive/CompressContent.cpp
##########
@@ -191,14 +194,20 @@ void CompressContent::processFlowFile(const std::shared_ptr<core::FlowFile>& flo
if (compressMode_ == CompressionMode::Compress) {
session->putAttribute(result, core::SpecialFlowAttribute::MIME_TYPE, mimeType);
if (updateFileName_) {
+ if (encapsulateInTar_) {
+ fileName = fileName + TAR_EXT;
+ }
fileName = fileName + fileExtension;
session->putAttribute(result, core::SpecialFlowAttribute::FILENAME, fileName);
}
} else {
session->removeAttribute(result, core::SpecialFlowAttribute::MIME_TYPE);
if (updateFileName_) {
- if (fileName.size() >= fileExtension.size() && fileName.compare(fileName.size() - fileExtension.size(), fileExtension.size(), fileExtension) == 0) {
+ if (utils::StringUtils::endsWith(fileName, fileExtension)) {
fileName = fileName.substr(0, fileName.size() - fileExtension.size());
+ if (encapsulateInTar_ && utils::StringUtils::endsWith(fileName, TAR_EXT)) {
Review comment:
using the `encapsulateInTar_` during decompression seems strange, shouldn't we infer the need for "de-tar-ing" only from the extension?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] lordgamez commented on a change in pull request #1153: MINIFICPP-1622 Fix filename update of CompressContent in case of tar.gz
Posted by GitBox <gi...@apache.org>.
lordgamez commented on a change in pull request #1153:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1153#discussion_r683353174
##########
File path: extensions/libarchive/CompressContent.cpp
##########
@@ -191,14 +194,20 @@ void CompressContent::processFlowFile(const std::shared_ptr<core::FlowFile>& flo
if (compressMode_ == CompressionMode::Compress) {
session->putAttribute(result, core::SpecialFlowAttribute::MIME_TYPE, mimeType);
if (updateFileName_) {
+ if (encapsulateInTar_) {
+ fileName = fileName + TAR_EXT;
+ }
fileName = fileName + fileExtension;
session->putAttribute(result, core::SpecialFlowAttribute::FILENAME, fileName);
}
} else {
session->removeAttribute(result, core::SpecialFlowAttribute::MIME_TYPE);
if (updateFileName_) {
- if (fileName.size() >= fileExtension.size() && fileName.compare(fileName.size() - fileExtension.size(), fileExtension.size(), fileExtension) == 0) {
+ if (utils::StringUtils::endsWith(fileName, fileExtension)) {
fileName = fileName.substr(0, fileName.size() - fileExtension.size());
+ if (encapsulateInTar_ && utils::StringUtils::endsWith(fileName, TAR_EXT)) {
Review comment:
Currently the "de-tar-ing" depends on the `Encapsulate in TAR` property in the processor, so if that is not set in decompression only the "gunzip" operation will be run on the data and the end content will still be encapsulated in tar. That is why I followed this same process in the filename changes.
##########
File path: extensions/libarchive/CompressContent.cpp
##########
@@ -191,14 +194,20 @@ void CompressContent::processFlowFile(const std::shared_ptr<core::FlowFile>& flo
if (compressMode_ == CompressionMode::Compress) {
session->putAttribute(result, core::SpecialFlowAttribute::MIME_TYPE, mimeType);
if (updateFileName_) {
+ if (encapsulateInTar_) {
+ fileName = fileName + TAR_EXT;
+ }
fileName = fileName + fileExtension;
session->putAttribute(result, core::SpecialFlowAttribute::FILENAME, fileName);
}
} else {
session->removeAttribute(result, core::SpecialFlowAttribute::MIME_TYPE);
if (updateFileName_) {
- if (fileName.size() >= fileExtension.size() && fileName.compare(fileName.size() - fileExtension.size(), fileExtension.size(), fileExtension) == 0) {
+ if (utils::StringUtils::endsWith(fileName, fileExtension)) {
fileName = fileName.substr(0, fileName.size() - fileExtension.size());
+ if (encapsulateInTar_ && utils::StringUtils::endsWith(fileName, TAR_EXT)) {
Review comment:
Currently the "de-tar-ing" depends on the `Encapsulate in TAR` property in the processor, so if that is not set in decompression will only run the "gunzip" operation will be run on the data and the end content will still be encapsulated in tar. That is why I followed this same process in the filename changes.
##########
File path: extensions/libarchive/CompressContent.cpp
##########
@@ -191,14 +194,20 @@ void CompressContent::processFlowFile(const std::shared_ptr<core::FlowFile>& flo
if (compressMode_ == CompressionMode::Compress) {
session->putAttribute(result, core::SpecialFlowAttribute::MIME_TYPE, mimeType);
if (updateFileName_) {
+ if (encapsulateInTar_) {
+ fileName = fileName + TAR_EXT;
+ }
fileName = fileName + fileExtension;
session->putAttribute(result, core::SpecialFlowAttribute::FILENAME, fileName);
}
} else {
session->removeAttribute(result, core::SpecialFlowAttribute::MIME_TYPE);
if (updateFileName_) {
- if (fileName.size() >= fileExtension.size() && fileName.compare(fileName.size() - fileExtension.size(), fileExtension.size(), fileExtension) == 0) {
+ if (utils::StringUtils::endsWith(fileName, fileExtension)) {
fileName = fileName.substr(0, fileName.size() - fileExtension.size());
+ if (encapsulateInTar_ && utils::StringUtils::endsWith(fileName, TAR_EXT)) {
Review comment:
Currently the "de-tar-ing" depends on the `Encapsulate in TAR` property in the processor, so if that is not set in decompression will only run the "gunzip" operation on the data and the end content will still be encapsulated in tar. That is why I followed this same process in the filename changes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] lordgamez commented on a change in pull request #1153: MINIFICPP-1622 Fix filename update of CompressContent in case of tar.gz
Posted by GitBox <gi...@apache.org>.
lordgamez commented on a change in pull request #1153:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1153#discussion_r683353174
##########
File path: extensions/libarchive/CompressContent.cpp
##########
@@ -191,14 +194,20 @@ void CompressContent::processFlowFile(const std::shared_ptr<core::FlowFile>& flo
if (compressMode_ == CompressionMode::Compress) {
session->putAttribute(result, core::SpecialFlowAttribute::MIME_TYPE, mimeType);
if (updateFileName_) {
+ if (encapsulateInTar_) {
+ fileName = fileName + TAR_EXT;
+ }
fileName = fileName + fileExtension;
session->putAttribute(result, core::SpecialFlowAttribute::FILENAME, fileName);
}
} else {
session->removeAttribute(result, core::SpecialFlowAttribute::MIME_TYPE);
if (updateFileName_) {
- if (fileName.size() >= fileExtension.size() && fileName.compare(fileName.size() - fileExtension.size(), fileExtension.size(), fileExtension) == 0) {
+ if (utils::StringUtils::endsWith(fileName, fileExtension)) {
fileName = fileName.substr(0, fileName.size() - fileExtension.size());
+ if (encapsulateInTar_ && utils::StringUtils::endsWith(fileName, TAR_EXT)) {
Review comment:
Currently the "de-tar-ing" depends on the `Encapsulate in TAR` property in the processor, so if that is not set in decompression only the "gunzip" operation will be run on the data and the end content will still be encapsulated in tar. That is why I followed this same process in the filename changes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] lordgamez commented on a change in pull request #1153: MINIFICPP-1622 Fix filename update of CompressContent in case of tar.gz
Posted by GitBox <gi...@apache.org>.
lordgamez commented on a change in pull request #1153:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1153#discussion_r683353174
##########
File path: extensions/libarchive/CompressContent.cpp
##########
@@ -191,14 +194,20 @@ void CompressContent::processFlowFile(const std::shared_ptr<core::FlowFile>& flo
if (compressMode_ == CompressionMode::Compress) {
session->putAttribute(result, core::SpecialFlowAttribute::MIME_TYPE, mimeType);
if (updateFileName_) {
+ if (encapsulateInTar_) {
+ fileName = fileName + TAR_EXT;
+ }
fileName = fileName + fileExtension;
session->putAttribute(result, core::SpecialFlowAttribute::FILENAME, fileName);
}
} else {
session->removeAttribute(result, core::SpecialFlowAttribute::MIME_TYPE);
if (updateFileName_) {
- if (fileName.size() >= fileExtension.size() && fileName.compare(fileName.size() - fileExtension.size(), fileExtension.size(), fileExtension) == 0) {
+ if (utils::StringUtils::endsWith(fileName, fileExtension)) {
fileName = fileName.substr(0, fileName.size() - fileExtension.size());
+ if (encapsulateInTar_ && utils::StringUtils::endsWith(fileName, TAR_EXT)) {
Review comment:
Currently the "de-tar-ing" depends on the `Encapsulate in TAR` property in the processor, so if that is not set decompression will only run the "gunzip" operation on the data and the end content will still be encapsulated in tar. That is why I followed this same process in the filename changes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] fgerlits closed pull request #1153: MINIFICPP-1622 Fix filename update of CompressContent in case of tar.gz
Posted by GitBox <gi...@apache.org>.
fgerlits closed pull request #1153:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1153
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] adamdebreceni commented on a change in pull request #1153: MINIFICPP-1622 Fix filename update of CompressContent in case of tar.gz
Posted by GitBox <gi...@apache.org>.
adamdebreceni commented on a change in pull request #1153:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1153#discussion_r683343728
##########
File path: extensions/libarchive/CompressContent.cpp
##########
@@ -191,14 +194,20 @@ void CompressContent::processFlowFile(const std::shared_ptr<core::FlowFile>& flo
if (compressMode_ == CompressionMode::Compress) {
session->putAttribute(result, core::SpecialFlowAttribute::MIME_TYPE, mimeType);
if (updateFileName_) {
+ if (encapsulateInTar_) {
+ fileName = fileName + TAR_EXT;
+ }
fileName = fileName + fileExtension;
session->putAttribute(result, core::SpecialFlowAttribute::FILENAME, fileName);
}
} else {
session->removeAttribute(result, core::SpecialFlowAttribute::MIME_TYPE);
if (updateFileName_) {
- if (fileName.size() >= fileExtension.size() && fileName.compare(fileName.size() - fileExtension.size(), fileExtension.size(), fileExtension) == 0) {
+ if (utils::StringUtils::endsWith(fileName, fileExtension)) {
fileName = fileName.substr(0, fileName.size() - fileExtension.size());
+ if (encapsulateInTar_ && utils::StringUtils::endsWith(fileName, TAR_EXT)) {
Review comment:
using the `encapsulateInTar_` during decompression seems strange, shouldn't we infer the need for "de-tar-ing" only from the extension?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] lordgamez commented on a change in pull request #1153: MINIFICPP-1622 Fix filename update of CompressContent in case of tar.gz
Posted by GitBox <gi...@apache.org>.
lordgamez commented on a change in pull request #1153:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1153#discussion_r683353174
##########
File path: extensions/libarchive/CompressContent.cpp
##########
@@ -191,14 +194,20 @@ void CompressContent::processFlowFile(const std::shared_ptr<core::FlowFile>& flo
if (compressMode_ == CompressionMode::Compress) {
session->putAttribute(result, core::SpecialFlowAttribute::MIME_TYPE, mimeType);
if (updateFileName_) {
+ if (encapsulateInTar_) {
+ fileName = fileName + TAR_EXT;
+ }
fileName = fileName + fileExtension;
session->putAttribute(result, core::SpecialFlowAttribute::FILENAME, fileName);
}
} else {
session->removeAttribute(result, core::SpecialFlowAttribute::MIME_TYPE);
if (updateFileName_) {
- if (fileName.size() >= fileExtension.size() && fileName.compare(fileName.size() - fileExtension.size(), fileExtension.size(), fileExtension) == 0) {
+ if (utils::StringUtils::endsWith(fileName, fileExtension)) {
fileName = fileName.substr(0, fileName.size() - fileExtension.size());
+ if (encapsulateInTar_ && utils::StringUtils::endsWith(fileName, TAR_EXT)) {
Review comment:
Currently the "de-tar-ing" depends on the `Encapsulate in TAR` property in the processor, so if that is not set in decompression will only run the "gunzip" operation will be run on the data and the end content will still be encapsulated in tar. That is why I followed this same process in the filename changes.
##########
File path: extensions/libarchive/CompressContent.cpp
##########
@@ -191,14 +194,20 @@ void CompressContent::processFlowFile(const std::shared_ptr<core::FlowFile>& flo
if (compressMode_ == CompressionMode::Compress) {
session->putAttribute(result, core::SpecialFlowAttribute::MIME_TYPE, mimeType);
if (updateFileName_) {
+ if (encapsulateInTar_) {
+ fileName = fileName + TAR_EXT;
+ }
fileName = fileName + fileExtension;
session->putAttribute(result, core::SpecialFlowAttribute::FILENAME, fileName);
}
} else {
session->removeAttribute(result, core::SpecialFlowAttribute::MIME_TYPE);
if (updateFileName_) {
- if (fileName.size() >= fileExtension.size() && fileName.compare(fileName.size() - fileExtension.size(), fileExtension.size(), fileExtension) == 0) {
+ if (utils::StringUtils::endsWith(fileName, fileExtension)) {
fileName = fileName.substr(0, fileName.size() - fileExtension.size());
+ if (encapsulateInTar_ && utils::StringUtils::endsWith(fileName, TAR_EXT)) {
Review comment:
Currently the "de-tar-ing" depends on the `Encapsulate in TAR` property in the processor, so if that is not set in decompression will only run the "gunzip" operation on the data and the end content will still be encapsulated in tar. That is why I followed this same process in the filename changes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] adamdebreceni commented on a change in pull request #1153: MINIFICPP-1622 Fix filename update of CompressContent in case of tar.gz
Posted by GitBox <gi...@apache.org>.
adamdebreceni commented on a change in pull request #1153:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1153#discussion_r683418287
##########
File path: extensions/libarchive/CompressContent.cpp
##########
@@ -191,14 +194,20 @@ void CompressContent::processFlowFile(const std::shared_ptr<core::FlowFile>& flo
if (compressMode_ == CompressionMode::Compress) {
session->putAttribute(result, core::SpecialFlowAttribute::MIME_TYPE, mimeType);
if (updateFileName_) {
+ if (encapsulateInTar_) {
+ fileName = fileName + TAR_EXT;
+ }
fileName = fileName + fileExtension;
session->putAttribute(result, core::SpecialFlowAttribute::FILENAME, fileName);
}
} else {
session->removeAttribute(result, core::SpecialFlowAttribute::MIME_TYPE);
if (updateFileName_) {
- if (fileName.size() >= fileExtension.size() && fileName.compare(fileName.size() - fileExtension.size(), fileExtension.size(), fileExtension) == 0) {
+ if (utils::StringUtils::endsWith(fileName, fileExtension)) {
fileName = fileName.substr(0, fileName.size() - fileExtension.size());
+ if (encapsulateInTar_ && utils::StringUtils::endsWith(fileName, TAR_EXT)) {
Review comment:
oh I see, that makes sense
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org