crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Added optional "filename" parameter when publishing data from a string or base64-encoded string.

Browse Source 
This causes the data to be stored with the requested filename, instead of generating a random one. Also, randomly generated filenames now use a timestamp instead of a random number.
This commit is contained in:
CalDescent 2023-03-18 15:11:53 +00:00
parent 50780aba53
commit 87ed49a2ee
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/org/qortal/api/resource/ArbitraryResource.java
View File

@ -795,7 +795,7 @@ public class ArbitraryResource {
} }
return this.upload(Service.valueOf(serviceString), name, null, path, null, null, false, return this.upload(Service.valueOf(serviceString), name, null, path, null, null, false,
fee, title, description, tags, category, preview); fee, null, title, description, tags, category, preview);
} }
@POST @POST
@ -842,7 +842,7 @@ public class ArbitraryResource {
} }
return this.upload(Service.valueOf(serviceString), name, identifier, path, null, null, false, return this.upload(Service.valueOf(serviceString), name, identifier, path, null, null, false,
fee, title, description, tags, category, preview); fee, null, title, description, tags, category, preview);
} }
@ -880,6 +880,7 @@ public class ArbitraryResource {
@QueryParam("description") String description, @QueryParam("description") String description,
@QueryParam("tags") List<String> tags, @QueryParam("tags") List<String> tags,
@QueryParam("category") Category category, @QueryParam("category") Category category,
@QueryParam("filename") String filename,
@QueryParam("fee") Long fee, @QueryParam("fee") Long fee,
@QueryParam("preview") Boolean preview, @QueryParam("preview") Boolean preview,
String base64) { String base64) {
@ -890,7 +891,7 @@ public class ArbitraryResource {
} }
return this.upload(Service.valueOf(serviceString), name, null, null, null, base64, false, return this.upload(Service.valueOf(serviceString), name, null, null, null, base64, false,
fee, title, description, tags, category, preview); fee, filename, title, description, tags, category, preview);
} }
@POST @POST
@ -925,6 +926,7 @@ public class ArbitraryResource {
@QueryParam("description") String description, @QueryParam("description") String description,
@QueryParam("tags") List<String> tags, @QueryParam("tags") List<String> tags,
@QueryParam("category") Category category, @QueryParam("category") Category category,
@QueryParam("filename") String filename,
@QueryParam("fee") Long fee, @QueryParam("fee") Long fee,
@QueryParam("preview") Boolean preview, @QueryParam("preview") Boolean preview,
String base64) { String base64) {
@ -935,7 +937,7 @@ public class ArbitraryResource {
} }
return this.upload(Service.valueOf(serviceString), name, identifier, null, null, base64, false, return this.upload(Service.valueOf(serviceString), name, identifier, null, null, base64, false,
fee, title, description, tags, category, preview); fee, filename, title, description, tags, category, preview);
} }
@ -982,7 +984,7 @@ public class ArbitraryResource {
} }
return this.upload(Service.valueOf(serviceString), name, null, null, null, base64Zip, true, return this.upload(Service.valueOf(serviceString), name, null, null, null, base64Zip, true,
fee, title, description, tags, category, preview); fee, null, title, description, tags, category, preview);
} }
@POST @POST
@ -1027,7 +1029,7 @@ public class ArbitraryResource {
} }
return this.upload(Service.valueOf(serviceString), name, identifier, null, null, base64Zip, true, return this.upload(Service.valueOf(serviceString), name, identifier, null, null, base64Zip, true,
fee, title, description, tags, category, preview); fee, null, title, description, tags, category, preview);
} }
@ -1067,6 +1069,7 @@ public class ArbitraryResource {
@QueryParam("description") String description, @QueryParam("description") String description,
@QueryParam("tags") List<String> tags, @QueryParam("tags") List<String> tags,
@QueryParam("category") Category category, @QueryParam("category") Category category,
@QueryParam("filename") String filename,
@QueryParam("fee") Long fee, @QueryParam("fee") Long fee,
@QueryParam("preview") Boolean preview, @QueryParam("preview") Boolean preview,
String string) { String string) {
@ -1077,7 +1080,7 @@ public class ArbitraryResource {
} }
return this.upload(Service.valueOf(serviceString), name, null, null, string, null, false, return this.upload(Service.valueOf(serviceString), name, null, null, string, null, false,
fee, title, description, tags, category, preview); fee, filename, title, description, tags, category, preview);
} }
@POST @POST
@ -1114,6 +1117,7 @@ public class ArbitraryResource {
@QueryParam("description") String description, @QueryParam("description") String description,
@QueryParam("tags") List<String> tags, @QueryParam("tags") List<String> tags,
@QueryParam("category") Category category, @QueryParam("category") Category category,
@QueryParam("filename") String filename,
@QueryParam("fee") Long fee, @QueryParam("fee") Long fee,
@QueryParam("preview") Boolean preview, @QueryParam("preview") Boolean preview,
String string) { String string) {
@ -1124,7 +1128,7 @@ public class ArbitraryResource {
} }
return this.upload(Service.valueOf(serviceString), name, identifier, null, string, null, false, return this.upload(Service.valueOf(serviceString), name, identifier, null, string, null, false,
fee, title, description, tags, category, preview); fee, filename, title, description, tags, category, preview);
} }
@ -1163,7 +1167,7 @@ public class ArbitraryResource {
} }
private String upload(Service service, String name, String identifier, private String upload(Service service, String name, String identifier,
String path, String string, String base64, boolean zipped, Long fee, String path, String string, String base64, boolean zipped, Long fee, String filename,
String title, String description, List<String> tags, Category category, String title, String description, List<String> tags, Category category,
Boolean preview) { Boolean preview) {
// Fetch public key from registered name // Fetch public key from registered name
@ -1189,7 +1193,12 @@ public class ArbitraryResource {
if (path == null) { if (path == null) {
// See if we have a string instead // See if we have a string instead
if (string != null) { if (string != null) {
File tempFile = File.createTempFile("qortal-", ""); if (filename == null) {
// Use current time as filename
filename = String.format("qortal-%d", NTP.getTime());
}
java.nio.file.Path tempDirectory = Files.createTempDirectory("qortal-");
File tempFile = Paths.get(tempDirectory.toString(), filename).toFile();
tempFile.deleteOnExit(); tempFile.deleteOnExit();
BufferedWriter writer = new BufferedWriter(new FileWriter(tempFile.toPath().toString())); BufferedWriter writer = new BufferedWriter(new FileWriter(tempFile.toPath().toString()));
writer.write(string); writer.write(string);
@ -1199,7 +1208,12 @@ public class ArbitraryResource {
} }
// ... or base64 encoded raw data // ... or base64 encoded raw data
else if (base64 != null) { else if (base64 != null) {
File tempFile = File.createTempFile("qortal-", ""); if (filename == null) {
// Use current time as filename
filename = String.format("qortal-%d", NTP.getTime());
}
java.nio.file.Path tempDirectory = Files.createTempDirectory("qortal-");
File tempFile = Paths.get(tempDirectory.toString(), filename).toFile();
tempFile.deleteOnExit(); tempFile.deleteOnExit();
Files.write(tempFile.toPath(), Base64.decode(base64)); Files.write(tempFile.toPath(), Base64.decode(base64));
path = tempFile.toPath().toString(); path = tempFile.toPath().toString();