2024-01-03 17:59:04 +00:00
|
|
|
package stirling.software.SPDF.utils;
|
|
|
|
|
|
|
|
import java.io.File;
|
|
|
|
import java.io.FileOutputStream;
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.io.InputStream;
|
2024-12-24 09:52:53 +00:00
|
|
|
import java.net.*;
|
2024-10-14 22:34:41 +01:00
|
|
|
import java.nio.charset.StandardCharsets;
|
2024-12-24 09:52:53 +00:00
|
|
|
import java.nio.file.*;
|
2024-01-03 17:59:04 +00:00
|
|
|
import java.nio.file.attribute.BasicFileAttributes;
|
2024-10-14 22:34:41 +01:00
|
|
|
import java.security.MessageDigest;
|
2025-01-31 11:00:03 +00:00
|
|
|
import java.util.ArrayDeque;
|
2024-01-03 17:59:04 +00:00
|
|
|
import java.util.ArrayList;
|
2025-01-31 11:00:03 +00:00
|
|
|
import java.util.Arrays;
|
|
|
|
import java.util.Collections;
|
|
|
|
import java.util.Deque;
|
2024-10-14 22:34:41 +01:00
|
|
|
import java.util.Enumeration;
|
2025-01-31 11:00:03 +00:00
|
|
|
import java.util.HashMap;
|
2024-01-03 17:59:04 +00:00
|
|
|
import java.util.List;
|
2025-01-31 11:00:03 +00:00
|
|
|
import java.util.Map;
|
2024-10-14 22:34:41 +01:00
|
|
|
import java.util.UUID;
|
2024-01-03 17:59:04 +00:00
|
|
|
|
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
2024-03-10 14:00:00 +00:00
|
|
|
import com.fathzer.soft.javaluator.DoubleEvaluator;
|
|
|
|
|
2024-02-06 00:00:49 +00:00
|
|
|
import io.github.pixee.security.HostValidator;
|
|
|
|
import io.github.pixee.security.Urls;
|
|
|
|
|
2024-12-17 10:26:18 +01:00
|
|
|
import lombok.extern.slf4j.Slf4j;
|
2025-02-23 13:36:21 +00:00
|
|
|
|
2025-01-06 12:41:30 +00:00
|
|
|
import stirling.software.SPDF.config.InstallationPathConfig;
|
2024-01-03 17:59:04 +00:00
|
|
|
|
2024-12-17 10:26:18 +01:00
|
|
|
@Slf4j
|
|
|
|
public class GeneralUtils {
|
2024-06-02 11:59:43 +01:00
|
|
|
|
2024-01-12 23:15:27 +00:00
|
|
|
public static File convertMultipartFileToFile(MultipartFile multipartFile) throws IOException {
|
2024-02-02 00:15:46 +00:00
|
|
|
File tempFile = Files.createTempFile("temp", null).toFile();
|
2024-01-12 23:15:27 +00:00
|
|
|
try (FileOutputStream os = new FileOutputStream(tempFile)) {
|
|
|
|
os.write(multipartFile.getBytes());
|
|
|
|
}
|
|
|
|
return tempFile;
|
|
|
|
}
|
|
|
|
|
2024-01-03 17:59:04 +00:00
|
|
|
public static void deleteDirectory(Path path) throws IOException {
|
|
|
|
Files.walkFileTree(
|
|
|
|
path,
|
|
|
|
new SimpleFileVisitor<Path>() {
|
|
|
|
@Override
|
|
|
|
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
|
|
|
|
throws IOException {
|
2024-05-27 16:31:00 +01:00
|
|
|
Files.deleteIfExists(file);
|
2024-01-03 17:59:04 +00:00
|
|
|
return FileVisitResult.CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public FileVisitResult postVisitDirectory(Path dir, IOException exc)
|
|
|
|
throws IOException {
|
2024-05-27 16:31:00 +01:00
|
|
|
Files.deleteIfExists(dir);
|
2024-01-03 17:59:04 +00:00
|
|
|
return FileVisitResult.CONTINUE;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
public static String convertToFileName(String name) {
|
|
|
|
String safeName = name.replaceAll("[^a-zA-Z0-9]", "_");
|
|
|
|
if (safeName.length() > 50) {
|
|
|
|
safeName = safeName.substring(0, 50);
|
|
|
|
}
|
|
|
|
return safeName;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static boolean isValidURL(String urlStr) {
|
|
|
|
try {
|
2024-02-06 00:00:49 +00:00
|
|
|
Urls.create(
|
|
|
|
urlStr, Urls.HTTP_PROTOCOLS, HostValidator.DENY_COMMON_INFRASTRUCTURE_TARGETS);
|
2024-01-03 17:59:04 +00:00
|
|
|
return true;
|
|
|
|
} catch (MalformedURLException e) {
|
|
|
|
return false;
|
|
|
|
}
|
2024-08-23 10:17:50 +02:00
|
|
|
}
|
2024-08-08 22:35:15 +02:00
|
|
|
|
|
|
|
public static boolean isURLReachable(String urlStr) {
|
|
|
|
try {
|
2024-12-11 21:06:07 +01:00
|
|
|
// Parse the URL
|
2024-08-23 12:52:45 +02:00
|
|
|
URL url = URI.create(urlStr).toURL();
|
2024-12-11 21:06:07 +01:00
|
|
|
|
|
|
|
// Allow only http and https protocols
|
|
|
|
String protocol = url.getProtocol();
|
2025-01-06 12:41:30 +00:00
|
|
|
if (!"http".equals(protocol) && !"https".equals(protocol)) {
|
2024-12-11 21:06:07 +01:00
|
|
|
return false; // Disallow other protocols
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check if the host is a local address
|
|
|
|
String host = url.getHost();
|
|
|
|
if (isLocalAddress(host)) {
|
|
|
|
return false; // Exclude local addresses
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check if the URL is reachable
|
2024-08-08 22:35:15 +02:00
|
|
|
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
|
|
|
|
connection.setRequestMethod("HEAD");
|
2024-12-11 21:10:18 +01:00
|
|
|
// connection.setConnectTimeout(5000); // Set connection timeout
|
|
|
|
// connection.setReadTimeout(5000); // Set read timeout
|
2024-08-08 22:35:15 +02:00
|
|
|
int responseCode = connection.getResponseCode();
|
|
|
|
return (200 <= responseCode && responseCode <= 399);
|
2024-12-11 21:06:07 +01:00
|
|
|
} catch (Exception e) {
|
|
|
|
return false; // Return false in case of any exception
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
private static boolean isLocalAddress(String host) {
|
|
|
|
try {
|
|
|
|
// Resolve DNS to IP address
|
|
|
|
InetAddress address = InetAddress.getByName(host);
|
|
|
|
|
|
|
|
// Check for local addresses
|
2024-12-17 10:26:18 +01:00
|
|
|
return address.isAnyLocalAddress()
|
|
|
|
|| // Matches 0.0.0.0 or similar
|
|
|
|
address.isLoopbackAddress()
|
|
|
|
|| // Matches 127.0.0.1 or ::1
|
|
|
|
address.isSiteLocalAddress()
|
|
|
|
|| // Matches private IPv4 ranges: 192.168.x.x, 10.x.x.x, 172.16.x.x to
|
|
|
|
// 172.31.x.x
|
|
|
|
address.getHostAddress()
|
|
|
|
.startsWith("fe80:"); // Matches link-local IPv6 addresses
|
2024-12-11 21:06:07 +01:00
|
|
|
} catch (Exception e) {
|
|
|
|
return false; // Return false for invalid or unresolved addresses
|
2024-08-08 22:35:15 +02:00
|
|
|
}
|
2024-01-03 17:59:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
public static File multipartToFile(MultipartFile multipart) throws IOException {
|
|
|
|
Path tempFile = Files.createTempFile("overlay-", ".pdf");
|
|
|
|
try (InputStream in = multipart.getInputStream();
|
|
|
|
FileOutputStream out = new FileOutputStream(tempFile.toFile())) {
|
|
|
|
byte[] buffer = new byte[1024];
|
|
|
|
int bytesRead;
|
|
|
|
while ((bytesRead = in.read(buffer)) != -1) {
|
|
|
|
out.write(buffer, 0, bytesRead);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return tempFile.toFile();
|
|
|
|
}
|
|
|
|
|
|
|
|
public static Long convertSizeToBytes(String sizeStr) {
|
|
|
|
if (sizeStr == null) {
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
|
|
|
sizeStr = sizeStr.trim().toUpperCase();
|
2024-04-09 18:47:53 +02:00
|
|
|
sizeStr = sizeStr.replace(",", ".").replace(" ", "");
|
2024-01-03 17:59:04 +00:00
|
|
|
try {
|
|
|
|
if (sizeStr.endsWith("KB")) {
|
2024-08-23 10:17:50 +02:00
|
|
|
return (long)
|
|
|
|
(Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2)) * 1024);
|
2024-01-03 17:59:04 +00:00
|
|
|
} else if (sizeStr.endsWith("MB")) {
|
2024-08-23 10:17:50 +02:00
|
|
|
return (long)
|
|
|
|
(Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
|
|
|
|
* 1024
|
|
|
|
* 1024);
|
2024-01-03 17:59:04 +00:00
|
|
|
} else if (sizeStr.endsWith("GB")) {
|
2024-08-23 10:17:50 +02:00
|
|
|
return (long)
|
|
|
|
(Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
|
|
|
|
* 1024
|
|
|
|
* 1024
|
|
|
|
* 1024);
|
2024-01-03 17:59:04 +00:00
|
|
|
} else if (sizeStr.endsWith("B")) {
|
|
|
|
return Long.parseLong(sizeStr.substring(0, sizeStr.length() - 1));
|
|
|
|
} else {
|
|
|
|
// Assume MB if no unit is specified
|
|
|
|
return (long) (Double.parseDouble(sizeStr) * 1024 * 1024);
|
|
|
|
}
|
|
|
|
} catch (NumberFormatException e) {
|
|
|
|
// The numeric part of the input string cannot be parsed, handle this case
|
|
|
|
}
|
|
|
|
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
2024-03-10 14:00:00 +00:00
|
|
|
public static List<Integer> parsePageList(String pages, int totalPages, boolean oneBased) {
|
|
|
|
if (pages == null) {
|
|
|
|
return List.of(1); // Default to first page if input is null
|
2024-02-06 00:00:49 +00:00
|
|
|
}
|
2024-03-10 14:00:00 +00:00
|
|
|
try {
|
|
|
|
return parsePageList(pages.split(","), totalPages, oneBased);
|
|
|
|
} catch (NumberFormatException e) {
|
|
|
|
return List.of(1); // Default to first page if input is invalid
|
2024-02-06 00:00:49 +00:00
|
|
|
}
|
2024-01-03 17:59:04 +00:00
|
|
|
}
|
2024-02-10 14:52:59 +00:00
|
|
|
|
2024-03-10 14:00:00 +00:00
|
|
|
public static List<Integer> parsePageList(String[] pages, int totalPages) {
|
|
|
|
return parsePageList(pages, totalPages, false);
|
2024-02-10 14:52:27 +00:00
|
|
|
}
|
2024-02-10 14:52:59 +00:00
|
|
|
|
2024-03-10 14:00:00 +00:00
|
|
|
public static List<Integer> parsePageList(String[] pages, int totalPages, boolean oneBased) {
|
|
|
|
List<Integer> result = new ArrayList<>();
|
|
|
|
int offset = oneBased ? 1 : 0;
|
|
|
|
for (String page : pages) {
|
|
|
|
if ("all".equalsIgnoreCase(page)) {
|
2024-03-13 19:15:10 +00:00
|
|
|
|
2024-01-03 17:59:04 +00:00
|
|
|
for (int i = 0; i < totalPages; i++) {
|
2024-03-10 14:00:00 +00:00
|
|
|
result.add(i + offset);
|
2024-01-03 17:59:04 +00:00
|
|
|
}
|
2024-03-10 14:00:00 +00:00
|
|
|
} else if (page.contains(",")) {
|
|
|
|
// Split the string into parts, could be single pages or ranges
|
|
|
|
String[] parts = page.split(",");
|
|
|
|
for (String part : parts) {
|
|
|
|
result.addAll(handlePart(part, totalPages, offset));
|
2024-01-03 17:59:04 +00:00
|
|
|
}
|
2024-03-10 14:00:00 +00:00
|
|
|
} else {
|
|
|
|
result.addAll(handlePart(page, totalPages, offset));
|
|
|
|
}
|
|
|
|
}
|
2025-02-18 11:57:56 +00:00
|
|
|
return result;
|
2024-03-10 14:00:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
public static List<Integer> evaluateNFunc(String expression, int maxValue) {
|
|
|
|
List<Integer> results = new ArrayList<>();
|
|
|
|
DoubleEvaluator evaluator = new DoubleEvaluator();
|
|
|
|
|
|
|
|
// Validate the expression
|
|
|
|
if (!expression.matches("[0-9n+\\-*/() ]+")) {
|
|
|
|
throw new IllegalArgumentException("Invalid expression");
|
|
|
|
}
|
2024-01-03 17:59:04 +00:00
|
|
|
|
Enhancement: Enhance NFunction evaluation and support advanced NFunctions (#2577)
# Description
Enhance NFunction sanitization and support advanced functions:
- Start page counting from 1 rather than 0 as PDFs are one based from
the user's perspective, thus functions results would be affected by
starting with "0" rather than "1".
- Ignore out of bound results rather than stopping iterations to work
with functions such as (n - 4) when page count is 10 as we would get
positive values when n > 4.
- Remove spaces to support expressions such as 2n + 1 rather just 2n+1.
- Support advanced functions as follows:
- Support expressions such as follows 5(n-1), n(n-1), expressions
followed by opening rounded without '*' operator.
- Support expressions such as follows (n-1)5, (n-1)n, expressions
preceded closing rounded without '*' operator.
- Support consecutive "n" expressions, examples: nnn, 2nn, nn*3, nnnn.
Closes #(issue_number)
## Checklist
- [x] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [x] I have performed a self-review of my own code
- [ ] I have attached images of the change if it is UI based
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] If my code has heavily changed functionality I have updated
relevant docs on [Stirling-PDFs doc
repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
- [x] My changes generate no new warnings
- [ ] I have read the section [Add New Translation
Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags)
(for new translation tags only)
2025-01-02 16:48:20 +02:00
|
|
|
for (int n = 1; n <= maxValue; n++) {
|
2024-08-08 22:35:15 +02:00
|
|
|
// Replace 'n' with the current value of n, correctly handling numbers before
|
|
|
|
// 'n'
|
Enhancement: Enhance NFunction evaluation and support advanced NFunctions (#2577)
# Description
Enhance NFunction sanitization and support advanced functions:
- Start page counting from 1 rather than 0 as PDFs are one based from
the user's perspective, thus functions results would be affected by
starting with "0" rather than "1".
- Ignore out of bound results rather than stopping iterations to work
with functions such as (n - 4) when page count is 10 as we would get
positive values when n > 4.
- Remove spaces to support expressions such as 2n + 1 rather just 2n+1.
- Support advanced functions as follows:
- Support expressions such as follows 5(n-1), n(n-1), expressions
followed by opening rounded without '*' operator.
- Support expressions such as follows (n-1)5, (n-1)n, expressions
preceded closing rounded without '*' operator.
- Support consecutive "n" expressions, examples: nnn, 2nn, nn*3, nnnn.
Closes #(issue_number)
## Checklist
- [x] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [x] I have performed a self-review of my own code
- [ ] I have attached images of the change if it is UI based
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] If my code has heavily changed functionality I have updated
relevant docs on [Stirling-PDFs doc
repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
- [x] My changes generate no new warnings
- [ ] I have read the section [Add New Translation
Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags)
(for new translation tags only)
2025-01-02 16:48:20 +02:00
|
|
|
String sanitizedExpression = sanitizeNFunction(expression, n);
|
2024-03-10 14:00:00 +00:00
|
|
|
Double result = evaluator.evaluate(sanitizedExpression);
|
2024-01-03 17:59:04 +00:00
|
|
|
|
2024-03-10 14:00:00 +00:00
|
|
|
// Check if the result is null or not within bounds
|
2025-01-06 12:41:30 +00:00
|
|
|
if (result == null) break;
|
Enhancement: Enhance NFunction evaluation and support advanced NFunctions (#2577)
# Description
Enhance NFunction sanitization and support advanced functions:
- Start page counting from 1 rather than 0 as PDFs are one based from
the user's perspective, thus functions results would be affected by
starting with "0" rather than "1".
- Ignore out of bound results rather than stopping iterations to work
with functions such as (n - 4) when page count is 10 as we would get
positive values when n > 4.
- Remove spaces to support expressions such as 2n + 1 rather just 2n+1.
- Support advanced functions as follows:
- Support expressions such as follows 5(n-1), n(n-1), expressions
followed by opening rounded without '*' operator.
- Support expressions such as follows (n-1)5, (n-1)n, expressions
preceded closing rounded without '*' operator.
- Support consecutive "n" expressions, examples: nnn, 2nn, nn*3, nnnn.
Closes #(issue_number)
## Checklist
- [x] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [x] I have performed a self-review of my own code
- [ ] I have attached images of the change if it is UI based
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] If my code has heavily changed functionality I have updated
relevant docs on [Stirling-PDFs doc
repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
- [x] My changes generate no new warnings
- [ ] I have read the section [Add New Translation
Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags)
(for new translation tags only)
2025-01-02 16:48:20 +02:00
|
|
|
|
|
|
|
if (result.intValue() > 0 && result.intValue() <= maxValue)
|
2024-03-10 14:00:00 +00:00
|
|
|
results.add(result.intValue());
|
|
|
|
}
|
|
|
|
|
|
|
|
return results;
|
|
|
|
}
|
|
|
|
|
Enhancement: Enhance NFunction evaluation and support advanced NFunctions (#2577)
# Description
Enhance NFunction sanitization and support advanced functions:
- Start page counting from 1 rather than 0 as PDFs are one based from
the user's perspective, thus functions results would be affected by
starting with "0" rather than "1".
- Ignore out of bound results rather than stopping iterations to work
with functions such as (n - 4) when page count is 10 as we would get
positive values when n > 4.
- Remove spaces to support expressions such as 2n + 1 rather just 2n+1.
- Support advanced functions as follows:
- Support expressions such as follows 5(n-1), n(n-1), expressions
followed by opening rounded without '*' operator.
- Support expressions such as follows (n-1)5, (n-1)n, expressions
preceded closing rounded without '*' operator.
- Support consecutive "n" expressions, examples: nnn, 2nn, nn*3, nnnn.
Closes #(issue_number)
## Checklist
- [x] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [x] I have performed a self-review of my own code
- [ ] I have attached images of the change if it is UI based
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] If my code has heavily changed functionality I have updated
relevant docs on [Stirling-PDFs doc
repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
- [x] My changes generate no new warnings
- [ ] I have read the section [Add New Translation
Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags)
(for new translation tags only)
2025-01-02 16:48:20 +02:00
|
|
|
private static String sanitizeNFunction(String expression, int nValue) {
|
|
|
|
String sanitizedExpression = expression.replace(" ", "");
|
2025-01-06 12:41:30 +00:00
|
|
|
String multiplyByOpeningRoundBracketPattern =
|
|
|
|
"([0-9n)])\\("; // example: n(n-1), 9(n-1), (n-1)(n-2)
|
|
|
|
sanitizedExpression =
|
|
|
|
sanitizedExpression.replaceAll(multiplyByOpeningRoundBracketPattern, "$1*(");
|
Enhancement: Enhance NFunction evaluation and support advanced NFunctions (#2577)
# Description
Enhance NFunction sanitization and support advanced functions:
- Start page counting from 1 rather than 0 as PDFs are one based from
the user's perspective, thus functions results would be affected by
starting with "0" rather than "1".
- Ignore out of bound results rather than stopping iterations to work
with functions such as (n - 4) when page count is 10 as we would get
positive values when n > 4.
- Remove spaces to support expressions such as 2n + 1 rather just 2n+1.
- Support advanced functions as follows:
- Support expressions such as follows 5(n-1), n(n-1), expressions
followed by opening rounded without '*' operator.
- Support expressions such as follows (n-1)5, (n-1)n, expressions
preceded closing rounded without '*' operator.
- Support consecutive "n" expressions, examples: nnn, 2nn, nn*3, nnnn.
Closes #(issue_number)
## Checklist
- [x] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [x] I have performed a self-review of my own code
- [ ] I have attached images of the change if it is UI based
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] If my code has heavily changed functionality I have updated
relevant docs on [Stirling-PDFs doc
repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
- [x] My changes generate no new warnings
- [ ] I have read the section [Add New Translation
Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags)
(for new translation tags only)
2025-01-02 16:48:20 +02:00
|
|
|
|
2025-01-06 12:41:30 +00:00
|
|
|
String multiplyByClosingRoundBracketPattern =
|
|
|
|
"\\)([0-9n)])"; // example: (n-1)n, (n-1)9, (n-1)(n-2)
|
|
|
|
sanitizedExpression =
|
|
|
|
sanitizedExpression.replaceAll(multiplyByClosingRoundBracketPattern, ")*$1");
|
Enhancement: Enhance NFunction evaluation and support advanced NFunctions (#2577)
# Description
Enhance NFunction sanitization and support advanced functions:
- Start page counting from 1 rather than 0 as PDFs are one based from
the user's perspective, thus functions results would be affected by
starting with "0" rather than "1".
- Ignore out of bound results rather than stopping iterations to work
with functions such as (n - 4) when page count is 10 as we would get
positive values when n > 4.
- Remove spaces to support expressions such as 2n + 1 rather just 2n+1.
- Support advanced functions as follows:
- Support expressions such as follows 5(n-1), n(n-1), expressions
followed by opening rounded without '*' operator.
- Support expressions such as follows (n-1)5, (n-1)n, expressions
preceded closing rounded without '*' operator.
- Support consecutive "n" expressions, examples: nnn, 2nn, nn*3, nnnn.
Closes #(issue_number)
## Checklist
- [x] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [x] I have performed a self-review of my own code
- [ ] I have attached images of the change if it is UI based
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] If my code has heavily changed functionality I have updated
relevant docs on [Stirling-PDFs doc
repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
- [x] My changes generate no new warnings
- [ ] I have read the section [Add New Translation
Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags)
(for new translation tags only)
2025-01-02 16:48:20 +02:00
|
|
|
|
|
|
|
sanitizedExpression = insertMultiplicationBeforeN(sanitizedExpression, nValue);
|
|
|
|
return sanitizedExpression;
|
|
|
|
}
|
|
|
|
|
2024-03-10 14:00:00 +00:00
|
|
|
private static String insertMultiplicationBeforeN(String expression, int nValue) {
|
|
|
|
// Insert multiplication between a number and 'n' (e.g., "4n" becomes "4*n")
|
|
|
|
String withMultiplication = expression.replaceAll("(\\d)n", "$1*n");
|
Enhancement: Enhance NFunction evaluation and support advanced NFunctions (#2577)
# Description
Enhance NFunction sanitization and support advanced functions:
- Start page counting from 1 rather than 0 as PDFs are one based from
the user's perspective, thus functions results would be affected by
starting with "0" rather than "1".
- Ignore out of bound results rather than stopping iterations to work
with functions such as (n - 4) when page count is 10 as we would get
positive values when n > 4.
- Remove spaces to support expressions such as 2n + 1 rather just 2n+1.
- Support advanced functions as follows:
- Support expressions such as follows 5(n-1), n(n-1), expressions
followed by opening rounded without '*' operator.
- Support expressions such as follows (n-1)5, (n-1)n, expressions
preceded closing rounded without '*' operator.
- Support consecutive "n" expressions, examples: nnn, 2nn, nn*3, nnnn.
Closes #(issue_number)
## Checklist
- [x] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [x] I have performed a self-review of my own code
- [ ] I have attached images of the change if it is UI based
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] If my code has heavily changed functionality I have updated
relevant docs on [Stirling-PDFs doc
repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
- [x] My changes generate no new warnings
- [ ] I have read the section [Add New Translation
Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags)
(for new translation tags only)
2025-01-02 16:48:20 +02:00
|
|
|
withMultiplication = formatConsecutiveNsForNFunction(withMultiplication);
|
2024-03-10 14:00:00 +00:00
|
|
|
// Now replace 'n' with its current value
|
2024-04-09 06:52:52 +01:00
|
|
|
return withMultiplication.replace("n", String.valueOf(nValue));
|
2024-03-10 14:00:00 +00:00
|
|
|
}
|
|
|
|
|
Enhancement: Enhance NFunction evaluation and support advanced NFunctions (#2577)
# Description
Enhance NFunction sanitization and support advanced functions:
- Start page counting from 1 rather than 0 as PDFs are one based from
the user's perspective, thus functions results would be affected by
starting with "0" rather than "1".
- Ignore out of bound results rather than stopping iterations to work
with functions such as (n - 4) when page count is 10 as we would get
positive values when n > 4.
- Remove spaces to support expressions such as 2n + 1 rather just 2n+1.
- Support advanced functions as follows:
- Support expressions such as follows 5(n-1), n(n-1), expressions
followed by opening rounded without '*' operator.
- Support expressions such as follows (n-1)5, (n-1)n, expressions
preceded closing rounded without '*' operator.
- Support consecutive "n" expressions, examples: nnn, 2nn, nn*3, nnnn.
Closes #(issue_number)
## Checklist
- [x] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [x] I have performed a self-review of my own code
- [ ] I have attached images of the change if it is UI based
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] If my code has heavily changed functionality I have updated
relevant docs on [Stirling-PDFs doc
repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
- [x] My changes generate no new warnings
- [ ] I have read the section [Add New Translation
Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags)
(for new translation tags only)
2025-01-02 16:48:20 +02:00
|
|
|
private static String formatConsecutiveNsForNFunction(String expression) {
|
|
|
|
String text = expression;
|
|
|
|
while (text.matches(".*n{2,}.*")) {
|
|
|
|
text = text.replaceAll("(?<!n)n{2}", "n*n");
|
|
|
|
}
|
|
|
|
return text;
|
|
|
|
}
|
|
|
|
|
2024-03-10 14:00:00 +00:00
|
|
|
private static List<Integer> handlePart(String part, int totalPages, int offset) {
|
|
|
|
List<Integer> partResult = new ArrayList<>();
|
|
|
|
|
|
|
|
// First check for n-syntax because it should not be processed as a range
|
|
|
|
if (part.contains("n")) {
|
|
|
|
partResult = evaluateNFunc(part, totalPages);
|
|
|
|
// Adjust the results according to the offset
|
|
|
|
for (int i = 0; i < partResult.size(); i++) {
|
|
|
|
int adjustedValue = partResult.get(i) - 1 + offset;
|
|
|
|
partResult.set(i, adjustedValue);
|
|
|
|
}
|
|
|
|
} else if (part.contains("-")) {
|
|
|
|
// Process ranges only if it's not n-syntax
|
|
|
|
String[] rangeParts = part.split("-");
|
|
|
|
try {
|
|
|
|
int start = Integer.parseInt(rangeParts[0]);
|
2025-01-30 23:44:57 +05:30
|
|
|
int end =
|
|
|
|
(rangeParts.length > 1 && !rangeParts[1].isEmpty())
|
|
|
|
? Integer.parseInt(rangeParts[1])
|
|
|
|
: totalPages;
|
2024-03-10 14:00:00 +00:00
|
|
|
for (int i = start; i <= end; i++) {
|
|
|
|
if (i >= 1 && i <= totalPages) {
|
|
|
|
partResult.add(i - 1 + offset);
|
2024-01-03 17:59:04 +00:00
|
|
|
}
|
|
|
|
}
|
2024-03-10 14:00:00 +00:00
|
|
|
} catch (NumberFormatException e) {
|
|
|
|
// Range is invalid, ignore this part
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// This is a single page number
|
|
|
|
try {
|
|
|
|
int pageNum = Integer.parseInt(part.trim());
|
|
|
|
if (pageNum >= 1 && pageNum <= totalPages) {
|
|
|
|
partResult.add(pageNum - 1 + offset);
|
2024-01-03 17:59:04 +00:00
|
|
|
}
|
2024-03-10 14:00:00 +00:00
|
|
|
} catch (NumberFormatException ignored) {
|
|
|
|
// Ignore invalid numbers
|
2024-01-03 17:59:04 +00:00
|
|
|
}
|
|
|
|
}
|
2024-03-10 14:00:00 +00:00
|
|
|
return partResult;
|
2024-01-03 17:59:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
public static boolean createDir(String path) {
|
|
|
|
Path folder = Paths.get(path);
|
|
|
|
if (!Files.exists(folder)) {
|
|
|
|
try {
|
|
|
|
Files.createDirectories(folder);
|
|
|
|
} catch (IOException e) {
|
2024-12-17 10:26:18 +01:00
|
|
|
log.error("exception", e);
|
2024-01-03 17:59:04 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
2024-10-14 22:34:41 +01:00
|
|
|
|
|
|
|
public static boolean isValidUUID(String uuid) {
|
|
|
|
if (uuid == null) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
try {
|
|
|
|
UUID.fromString(uuid);
|
|
|
|
return true;
|
|
|
|
} catch (IllegalArgumentException e) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
public static void saveKeyToConfig(String id, String key) throws IOException {
|
|
|
|
saveKeyToConfig(id, key, true);
|
|
|
|
}
|
2024-12-10 20:39:24 +00:00
|
|
|
|
2024-12-10 11:17:50 +00:00
|
|
|
public static void saveKeyToConfig(String id, boolean key) throws IOException {
|
|
|
|
saveKeyToConfig(id, key, true);
|
|
|
|
}
|
2024-10-14 22:34:41 +01:00
|
|
|
|
|
|
|
public static void saveKeyToConfig(String id, String key, boolean autoGenerated)
|
|
|
|
throws IOException {
|
2025-01-31 11:00:03 +00:00
|
|
|
doSaveKeyToConfig(id, (key == null ? "" : key), autoGenerated);
|
|
|
|
}
|
2024-10-14 22:34:41 +01:00
|
|
|
|
2025-01-31 11:00:03 +00:00
|
|
|
public static void saveKeyToConfig(String id, boolean key, boolean autoGenerated)
|
|
|
|
throws IOException {
|
|
|
|
doSaveKeyToConfig(id, String.valueOf(key), autoGenerated);
|
|
|
|
}
|
2024-10-14 22:34:41 +01:00
|
|
|
|
2025-01-31 11:00:03 +00:00
|
|
|
/*------------------------------------------------------------------------*
|
|
|
|
* Internal Implementation Details *
|
|
|
|
*------------------------------------------------------------------------*/
|
2024-10-14 22:34:41 +01:00
|
|
|
|
2025-01-31 11:00:03 +00:00
|
|
|
/**
|
|
|
|
* Actually performs the line-based update for the given path (e.g. "security.csrfDisabled") to
|
|
|
|
* a new string value (e.g. "true"), possibly marking it as auto-generated.
|
|
|
|
*/
|
|
|
|
private static void doSaveKeyToConfig(String fullPath, String newValue, boolean autoGenerated)
|
|
|
|
throws IOException {
|
|
|
|
// 1) Load the file (settings.yml)
|
|
|
|
Path settingsPath = Paths.get(InstallationPathConfig.getSettingsPath());
|
|
|
|
if (!Files.exists(settingsPath)) {
|
|
|
|
log.warn("Settings file not found at {}, creating a new empty file...", settingsPath);
|
|
|
|
Files.createDirectories(settingsPath.getParent());
|
|
|
|
Files.createFile(settingsPath);
|
|
|
|
}
|
|
|
|
List<String> lines = Files.readAllLines(settingsPath);
|
|
|
|
|
|
|
|
// 2) Build a map of "nestedKeyPath -> lineIndex" by parsing indentation
|
|
|
|
// Also track each line's indentation so we can preserve it when rewriting.
|
|
|
|
Map<String, LineInfo> pathToLine = parseNestedYamlKeys(lines);
|
|
|
|
|
|
|
|
// 3) If the path is found, rewrite its line. Else, append at the bottom (no indentation).
|
|
|
|
boolean changed = false;
|
|
|
|
if (pathToLine.containsKey(fullPath)) {
|
|
|
|
// Rewrite existing line
|
|
|
|
LineInfo info = pathToLine.get(fullPath);
|
|
|
|
String oldLine = lines.get(info.lineIndex);
|
|
|
|
String newLine =
|
|
|
|
rewriteLine(oldLine, info.indentSpaces, fullPath, newValue, autoGenerated);
|
|
|
|
if (!newLine.equals(oldLine)) {
|
|
|
|
lines.set(info.lineIndex, newLine);
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// Append a new line at the bottom, with zero indentation
|
|
|
|
String appended = fullPath + ": " + newValue;
|
|
|
|
if (autoGenerated) {
|
|
|
|
appended += " # Automatically Generated Settings (Do Not Edit Directly)";
|
|
|
|
}
|
|
|
|
lines.add(appended);
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// 4) If changed, write back to file
|
|
|
|
if (changed) {
|
|
|
|
Files.write(settingsPath, lines);
|
|
|
|
log.info(
|
|
|
|
"Updated '{}' to '{}' (autoGenerated={}) in {}",
|
|
|
|
fullPath,
|
|
|
|
newValue,
|
|
|
|
autoGenerated,
|
|
|
|
settingsPath);
|
|
|
|
} else {
|
|
|
|
log.info("No changes for '{}' (already set to '{}').", fullPath, newValue);
|
2024-10-14 22:34:41 +01:00
|
|
|
}
|
|
|
|
}
|
2024-12-10 20:39:24 +00:00
|
|
|
|
2025-01-31 11:00:03 +00:00
|
|
|
/** A small record-like class that holds: - lineIndex - indentSpaces */
|
|
|
|
private static class LineInfo {
|
|
|
|
int lineIndex;
|
|
|
|
int indentSpaces;
|
|
|
|
|
|
|
|
public LineInfo(int lineIndex, int indentSpaces) {
|
|
|
|
this.lineIndex = lineIndex;
|
|
|
|
this.indentSpaces = indentSpaces;
|
|
|
|
}
|
|
|
|
}
|
2024-12-10 20:39:24 +00:00
|
|
|
|
2025-01-31 11:00:03 +00:00
|
|
|
/**
|
|
|
|
* Parse the YAML lines to build a map: "full.nested.key" -> (lineIndex, indentSpaces). We do a
|
|
|
|
* naive indentation-based path stacking: - 2 spaces = 1 indent level - lines that start with
|
|
|
|
* fewer or equal indentation pop the stack - lines that look like "key:" or "key: value" cause
|
|
|
|
* a push
|
|
|
|
*/
|
|
|
|
private static Map<String, LineInfo> parseNestedYamlKeys(List<String> lines) {
|
|
|
|
Map<String, LineInfo> result = new HashMap<>();
|
|
|
|
|
|
|
|
// We'll maintain a stack of (keyName, indentLevel).
|
|
|
|
// Each line that looks like "myKey:" or "myKey: value" is a new "child" of the top of the
|
|
|
|
// stack if indent is deeper.
|
|
|
|
Deque<String> pathStack = new ArrayDeque<>();
|
|
|
|
Deque<Integer> indentStack = new ArrayDeque<>();
|
|
|
|
indentStack.push(-1); // sentinel
|
|
|
|
|
|
|
|
for (int i = 0; i < lines.size(); i++) {
|
|
|
|
String line = lines.get(i);
|
|
|
|
String trimmed = line.trim();
|
|
|
|
|
|
|
|
// skip blank lines, comment lines, or list items
|
|
|
|
if (trimmed.isEmpty() || trimmed.startsWith("#") || trimmed.startsWith("-")) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
// check if there's a colon
|
|
|
|
int colonIdx = trimmed.indexOf(':');
|
|
|
|
if (colonIdx <= 0) { // must have at least one char before ':'
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
// parse out key
|
|
|
|
String keyPart = trimmed.substring(0, colonIdx).trim();
|
|
|
|
if (keyPart.isEmpty()) {
|
|
|
|
continue;
|
|
|
|
}
|
2024-12-10 20:39:24 +00:00
|
|
|
|
2025-01-31 11:00:03 +00:00
|
|
|
// count leading spaces for indentation
|
|
|
|
int leadingSpaces = countLeadingSpaces(line);
|
|
|
|
int indentLevel = leadingSpaces / 2; // assume 2 spaces per level
|
2024-12-10 20:39:24 +00:00
|
|
|
|
2025-01-31 11:00:03 +00:00
|
|
|
// pop from stack until we get to a shallower indentation
|
|
|
|
while (indentStack.peek() != null && indentStack.peek() >= indentLevel) {
|
|
|
|
indentStack.pop();
|
|
|
|
pathStack.pop();
|
|
|
|
}
|
|
|
|
|
|
|
|
// push the new key
|
|
|
|
pathStack.push(keyPart);
|
|
|
|
indentStack.push(indentLevel);
|
|
|
|
|
|
|
|
// build the full path
|
|
|
|
String[] arr = pathStack.toArray(new String[0]);
|
|
|
|
List<String> reversed = Arrays.asList(arr);
|
|
|
|
Collections.reverse(reversed);
|
|
|
|
String fullPath = String.join(".", reversed);
|
|
|
|
|
|
|
|
// store line info
|
|
|
|
result.put(fullPath, new LineInfo(i, leadingSpaces));
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Rewrite a single line to set a new value, preserving indentation and (optionally) the
|
|
|
|
* existing or auto-generated inline comment.
|
|
|
|
*
|
|
|
|
* <p>For example, oldLine might be: " csrfDisabled: false # set to 'true' to disable CSRF
|
|
|
|
* protection" newValue = "true" autoGenerated = false
|
|
|
|
*
|
|
|
|
* <p>We'll produce something like: " csrfDisabled: true # set to 'true' to disable CSRF
|
|
|
|
* protection"
|
|
|
|
*/
|
|
|
|
private static String rewriteLine(
|
|
|
|
String oldLine, int indentSpaces, String path, String newValue, boolean autoGenerated) {
|
|
|
|
// We'll keep the exact leading indentation (indentSpaces).
|
|
|
|
// Then "key: newValue". We'll try to preserve any existing inline comment unless
|
|
|
|
// autoGenerated is true.
|
|
|
|
|
|
|
|
// 1) Extract leading spaces from the old line (just in case they differ from indentSpaces).
|
|
|
|
int actualLeadingSpaces = countLeadingSpaces(oldLine);
|
|
|
|
String leading = oldLine.substring(0, actualLeadingSpaces);
|
|
|
|
|
|
|
|
// 2) Remove leading spaces from the rest
|
|
|
|
String trimmed = oldLine.substring(actualLeadingSpaces);
|
|
|
|
|
|
|
|
// 3) Check for existing comment
|
|
|
|
int hashIndex = trimmed.indexOf('#');
|
|
|
|
String lineWithoutComment =
|
|
|
|
(hashIndex >= 0) ? trimmed.substring(0, hashIndex).trim() : trimmed.trim();
|
|
|
|
String oldComment = (hashIndex >= 0) ? trimmed.substring(hashIndex).trim() : "";
|
|
|
|
|
|
|
|
// 4) Rebuild "key: newValue"
|
|
|
|
// The "key" here is everything before ':' in lineWithoutComment
|
|
|
|
int colonIdx = lineWithoutComment.indexOf(':');
|
|
|
|
String existingKey =
|
|
|
|
(colonIdx >= 0)
|
|
|
|
? lineWithoutComment.substring(0, colonIdx).trim()
|
|
|
|
: path; // fallback if line is malformed
|
|
|
|
|
|
|
|
StringBuilder sb = new StringBuilder();
|
|
|
|
sb.append(leading); // restore original leading spaces
|
|
|
|
|
|
|
|
// "key: newValue"
|
|
|
|
sb.append(existingKey).append(": ").append(newValue);
|
|
|
|
|
|
|
|
// 5) If autoGenerated, add/replace comment
|
2024-12-10 20:39:24 +00:00
|
|
|
if (autoGenerated) {
|
2025-01-31 11:00:03 +00:00
|
|
|
sb.append(" # Automatically Generated Settings (Do Not Edit Directly)");
|
|
|
|
} else {
|
|
|
|
// preserve the old comment if it exists
|
|
|
|
if (!oldComment.isEmpty()) {
|
|
|
|
sb.append(" ").append(oldComment);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return sb.toString();
|
|
|
|
}
|
|
|
|
|
|
|
|
private static int countLeadingSpaces(String line) {
|
|
|
|
int count = 0;
|
|
|
|
for (char c : line.toCharArray()) {
|
|
|
|
if (c == ' ') count++;
|
|
|
|
else break;
|
2024-12-10 20:39:24 +00:00
|
|
|
}
|
2025-01-31 11:00:03 +00:00
|
|
|
return count;
|
2024-12-10 20:39:24 +00:00
|
|
|
}
|
2024-10-14 22:34:41 +01:00
|
|
|
|
|
|
|
public static String generateMachineFingerprint() {
|
|
|
|
try {
|
|
|
|
// Get the MAC address
|
|
|
|
StringBuilder sb = new StringBuilder();
|
|
|
|
InetAddress ip = InetAddress.getLocalHost();
|
|
|
|
NetworkInterface network = NetworkInterface.getByInetAddress(ip);
|
|
|
|
|
|
|
|
if (network == null) {
|
|
|
|
Enumeration<NetworkInterface> networks = NetworkInterface.getNetworkInterfaces();
|
|
|
|
while (networks.hasMoreElements()) {
|
|
|
|
NetworkInterface net = networks.nextElement();
|
|
|
|
byte[] mac = net.getHardwareAddress();
|
|
|
|
if (mac != null) {
|
|
|
|
for (int i = 0; i < mac.length; i++) {
|
|
|
|
sb.append(String.format("%02X", mac[i]));
|
|
|
|
}
|
|
|
|
break; // Use the first network interface with a MAC address
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
byte[] mac = network.getHardwareAddress();
|
|
|
|
if (mac != null) {
|
|
|
|
for (int i = 0; i < mac.length; i++) {
|
|
|
|
sb.append(String.format("%02X", mac[i]));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Hash the MAC address for privacy and consistency
|
|
|
|
MessageDigest md = MessageDigest.getInstance("SHA-256");
|
|
|
|
byte[] hash = md.digest(sb.toString().getBytes(StandardCharsets.UTF_8));
|
|
|
|
StringBuilder fingerprint = new StringBuilder();
|
|
|
|
for (byte b : hash) {
|
|
|
|
fingerprint.append(String.format("%02x", b));
|
|
|
|
}
|
|
|
|
return fingerprint.toString();
|
|
|
|
} catch (Exception e) {
|
|
|
|
return "GenericID";
|
|
|
|
}
|
|
|
|
}
|
2024-12-10 20:39:24 +00:00
|
|
|
|
2024-12-10 11:17:50 +00:00
|
|
|
public static boolean isVersionHigher(String currentVersion, String compareVersion) {
|
|
|
|
if (currentVersion == null || compareVersion == null) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Split versions into components
|
|
|
|
String[] current = currentVersion.split("\\.");
|
|
|
|
String[] compare = compareVersion.split("\\.");
|
|
|
|
|
|
|
|
// Get the length of the shorter version array
|
|
|
|
int length = Math.min(current.length, compare.length);
|
|
|
|
|
|
|
|
// Compare each component
|
|
|
|
for (int i = 0; i < length; i++) {
|
|
|
|
int currentPart = Integer.parseInt(current[i]);
|
|
|
|
int comparePart = Integer.parseInt(compare[i]);
|
|
|
|
|
|
|
|
if (currentPart > comparePart) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
if (currentPart < comparePart) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// If all components so far are equal, the longer version is considered higher
|
|
|
|
return current.length > compare.length;
|
|
|
|
}
|
2024-01-03 17:59:04 +00:00
|
|
|
}
|