Skip to content

Commit fbe9ad4

Browse files
committed
remove dropbox upload, move to github artifacts
1 parent 9d87ef7 commit fbe9ad4

File tree

8 files changed

+16
-138
lines changed

8 files changed

+16
-138
lines changed

.github/workflows/publish.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,8 @@ jobs:
2020
- name: Build with Gradle
2121
run: ./gradlew bootRun
2222
env:
23-
DROPBOX_ACCESS_TOKEN: ${{ secrets.DROPBOX_ACCESS_TOKEN }}
23+
DROPBOX_ACCESS_TOKEN: ${{ secrets.DROPBOX_ACCESS_TOKEN }}
24+
- uses: actions/upload-artifact@v4
25+
with:
26+
name: mudlet-docs
27+
path: Mudlet Docs

src/main/java/pl/nullpointersoftware/mudlet/mudletdocs/PagesRunner.java

+8-18
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
import pl.nullpointersoftware.mudlet.mudletdocs.model.LuaDescriptor;
99
import pl.nullpointersoftware.mudlet.mudletdocs.service.LuaWriter;
1010
import pl.nullpointersoftware.mudlet.mudletdocs.service.PageAnalyzer;
11-
import pl.nullpointersoftware.mudlet.mudletdocs.service.api.GithubRestClient;
1211
import pl.nullpointersoftware.mudlet.mudletdocs.service.api.WikiRestClient;
13-
import pl.nullpointersoftware.mudlet.mudletdocs.service.dropbox.DropBoxUploader;
14-
import pl.nullpointersoftware.mudlet.mudletdocs.service.dropbox.DropBoxUploaderFactory;
1512
import pl.nullpointersoftware.mudlet.mudletdocs.service.github.GithubDownloader;
1613

1714
import java.io.IOException;
@@ -33,35 +30,28 @@ public class PagesRunner implements ApplicationRunner {
3330
private final LuaWriter luaWriter;
3431
private final WikiRestClient wikiRestClient;
3532
private final GithubDownloader githubDownloader;
36-
private final DropBoxUploaderFactory dropBoxUploaderFactory;
3733

3834
@Override
3935
public void run(ApplicationArguments args) throws InterruptedException, URISyntaxException, IOException {
40-
DropBoxUploader dropBoxUploader = dropBoxUploaderFactory.getClient();
4136
ExecutorService executor = Executors.newFixedThreadPool(appConfig.getPages().size());
42-
appConfig.getPages().forEach(pageName -> {
43-
executor.submit(() -> {
44-
log.info("Processing {}", pageName);
45-
Set<LuaDescriptor> descriptors = pageAnalyzer.analyze(wikiRestClient.getPage(pageName).getParse().getWikitext());
46-
dropBoxUploader.addFile(luaWriter.generateFile(sanitizeFilename(pageName), descriptors));
47-
});
48-
});
37+
appConfig.getPages().forEach(pageName -> executor.submit(() -> {
38+
log.info("Processing {}", pageName);
39+
Set<LuaDescriptor> descriptors = pageAnalyzer.analyze(wikiRestClient.getPage(pageName).getParse().getWikitext());
40+
luaWriter.generateFile(sanitizeFilename(pageName), descriptors);
41+
}));
4942

5043
executor.shutdown();
5144
executor.awaitTermination(1, TimeUnit.MINUTES);
5245

53-
githubDownloader.downloadAll(dropBoxUploader);
46+
githubDownloader.downloadAll();
5447

55-
dropBoxUploader.addFile(luaWriter.generateFile("lfs.lua", LfsDoc.DESCRIPTORS));
56-
dropBoxUploader.addFile(luaWriter.generateFile("rex.lua", RexDoc.DESCRIPTORS));
48+
luaWriter.generateFile("lfs.lua", LfsDoc.DESCRIPTORS);
49+
luaWriter.generateFile("rex.lua", RexDoc.DESCRIPTORS);
5750

5851
String dir = System.getProperty("user.dir") + "/Mudlet Docs/globals.lua";
5952
Path globalsPath = Path.of(dir);
6053
Files.deleteIfExists(globalsPath);
6154
Files.copy(Path.of(getClass().getClassLoader().getResource("globals.lua").toURI()), Path.of(dir));
62-
dropBoxUploader.addFile(globalsPath);
63-
64-
dropBoxUploader.finish();
6555
log.info("We are done!");
6656
}
6757

src/main/java/pl/nullpointersoftware/mudlet/mudletdocs/service/dropbox/DropBoxProperties.java

-14
This file was deleted.

src/main/java/pl/nullpointersoftware/mudlet/mudletdocs/service/dropbox/DropBoxUploader.java

-15
This file was deleted.

src/main/java/pl/nullpointersoftware/mudlet/mudletdocs/service/dropbox/DropBoxUploaderFactory.java

-18
This file was deleted.

src/main/java/pl/nullpointersoftware/mudlet/mudletdocs/service/dropbox/DropBoxUploaderImpl.java

-53
This file was deleted.

src/main/java/pl/nullpointersoftware/mudlet/mudletdocs/service/dropbox/NoopDropBoxUploader.java

-14
This file was deleted.

src/main/java/pl/nullpointersoftware/mudlet/mudletdocs/service/github/GithubDownloader.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import lombok.extern.slf4j.Slf4j;
66
import org.springframework.stereotype.Component;
77
import pl.nullpointersoftware.mudlet.mudletdocs.service.api.GithubRestClient;
8-
import pl.nullpointersoftware.mudlet.mudletdocs.service.dropbox.DropBoxUploader;
98

109
import java.nio.file.Files;
1110
import java.nio.file.Path;
@@ -20,21 +19,20 @@ public class GithubDownloader {
2019
private final String dir = System.getProperty("user.dir") + "/Mudlet Docs/geyser/";
2120

2221
@SneakyThrows
23-
public void downloadAll(DropBoxUploader dropBoxUploader) {
22+
public void downloadAll() {
2423
Files.createDirectories(Path.of(dir));
2524
githubRestClient.getTree().getTree().stream()
2625
.filter(treeItem -> treeItem.getPath().startsWith("src/mudlet-lua/lua/geyser/"))
2726
.parallel()
28-
.forEach(treeItem -> storeFile(Path.of(treeItem.getPath()).toFile().getName(), treeItem.getSha(), dropBoxUploader));
27+
.forEach(treeItem -> storeFile(Path.of(treeItem.getPath()).toFile().getName(), treeItem.getSha()));
2928
}
3029

3130
@SneakyThrows
32-
private void storeFile(String name, String sha, DropBoxUploader dropBoxUploader) {
31+
private void storeFile(String name, String sha) {
3332
log.info("Downloading file {}", name);
3433
String content = githubRestClient.getBlob(sha).getContent();
3534
Path filePath = Path.of(dir + name);
3635
Files.write(filePath, Base64.getMimeDecoder().decode(content));
37-
dropBoxUploader.addFile(filePath, "geyser/");
3836
}
3937

4038
}

0 commit comments

Comments
 (0)