Skip to content

Added numbering to the filenames of the attachments that are extracted #38

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added numbering to the filenames of the attachments that are extracted #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7938281
added numbering to the filenames of the attachments that are extracted
Dec 4, 2019
6ac5569
Merge branch 'ChargePoint:master' into AddNumberingToExtractedAttachm…
bennet3 Oct 20, 2021
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
4 changes: 2 additions & 2 deletions Sources/XCParseCore/XCResultToolCommand.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ open class XCResultToolCommand {
super.init(withXCResult: xcresult, process: process)
}

public init(withXCResult xcresult: XCResult, attachment: ActionTestAttachment, outputPath: String) {
public init(withXCResult xcresult: XCResult, attachment: ActionTestAttachment, outputPath: String, filenamePrefix: String = "") {
if let identifier = attachment.payloadRef?.id {
self.id = identifier;

// Now let's figure out the filename & path
let filename = attachment.filename ?? identifier
let filename = filenamePrefix + "\(attachment.filename ?? identifier)"
Copy link

@rpendleton rpendleton Dec 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the interpolated string actually necessary? I assume the following would also work:

filenamePrefix + (attachment.filename ?? identifier)

let attachmentOutputPath = URL.init(fileURLWithPath: outputPath).appendingPathComponent(filename)
self.outputPath = attachmentOutputPath.path
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/xcparse/XCPParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ class XCPParser {
for (index, attachment) in attachments.enumerated() {
progressBar.update(step: index, total: attachments.count, text: "Extracting \"\(attachment.filename ?? "Unknown Filename")\"")

XCResultToolCommand.Export(withXCResult: xcresult, attachment: attachment, outputPath: screenshotDirectoryURL.path).run()
XCResultToolCommand.Export(withXCResult: xcresult, attachment: attachment, outputPath: screenshotDirectoryURL.path, filenamePrefix: "\(index)-").run()
}

progressBar.update(step: attachments.count, total: attachments.count, text: "🎊 Export complete! 🎊")
Expand Down