Skip to content
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

Jump to bottom

Added infoFileFunctions #28

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

Added infoFileFunctions #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d9dd24
Added infoFileFunctions
ChristophLHR May 12, 2023
4c1b447
fixed old reference
ChristophLHR May 12, 2023
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
119 changes: 73 additions & 46 deletions scm.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ scm.config = {
["rawURL"] = "https://raw.githubusercontent.com/",
["programSuffix"] = "-prog",
["librarySuffix"] = "-lib",
["infoFile"] = "files.txt", -- provides the structure of a git repo (paths to all files)
["backUpFile"] = "files.txt", -- provides the structure of a git repo (paths to all files)
["infoFile"] = "infoFile.json",
["apiGithubURL"] = "https://api.github.com/orgs/",
["apiGithubGetRepos"] = "/repos?type=all&per_page=100&page=1",
["apiGithubGetTags"] = "https://api.github.com/repos/<USER>/<REPO>/tags",
Expand Down Expand Up @@ -376,6 +377,18 @@ function scm:download (target, fileType, updateObj)
return scm:addScript(self:downloadGit(sourceObject, repository, self.config[fileType .. "Directory"], updateObj))
end

local function readInfoFile(url)
local file = http.get(url)
if file then
local infoFileContent = file.readAll();
file.close()
if infoFileContent and infoFileContent ~= "" then
infoFileContent = textutils.unserialiseJSON(infoFileContent)
return infoFileContent
end
end
end

---@param sourceObject table
---@param repository string
---@param targetDirectory string
Expand All @@ -388,69 +401,83 @@ function scm:downloadGit (sourceObject, repository, targetDirectory, updateObj)
repository .. "/" ..
self.config["branch"] .. "/"

local filesUrl = baseUrl .. self.config["infoFile"]

local request = http.get(filesUrl)
if request then
local content = request.readAll()
local infoFileUrl = baseUrl .. "/" .. self.config["infoFile"]
local isBackupFile = false
local infoFileContent = readInfoFile(infoFileUrl)
if not infoFileContent then
isBackupFile = true
local filesUrl = baseUrl .. self.config["backUpFile"]
local request = http.get(filesUrl)
if not request then
return false
end
infoFileContent = request.readAll()
request.close()
end

if content then
local file = fs.open(targetDirectory .. sourceObject.name .. self.config[sourceObject.type .. "Suffix"] .. "/" .. self.config["infoFile"], "w")
file.write(content)
if infoFileContent then
local file = fs.open(
targetDirectory ..
sourceObject.name .. self.config[sourceObject.type .. "Suffix"] .. "/" ..
(isBackupFile and self.config["backUpFile"] or self.config["infoFile"]),
"w")
if isBackupFile then
file.write(infoFileContent)
else
file.write(textutils.serializeJSON(infoFileContent))
end
file.close()

local filePaths = {}
file = fs.open(targetDirectory .. sourceObject.name .. self.config[sourceObject.type .. "Suffix"] .. "/" .. self.config["infoFile"], "r")
local filePaths = {}
if isBackupFile then
file = fs.open(targetDirectory .. sourceObject.name .. self.config[sourceObject.type .. "Suffix"] .. "/" .. self.config["backUpFile"], "r")
for line in file.readLine do
filePaths[#filePaths + 1] = line
end
file.close()
else
for _, line in pairs(infoFileContent["files"]) do
filePaths[#filePaths + 1] = line
scm:log(line)
end
end

for i = 1, #filePaths, 1 do
local success = true
local tmpRequest = http.get(baseUrl .. filePaths[i])
if tmpRequest then
local tmpContent = tmpRequest.readAll()
if tmpContent then
local tmpFile = fs.open(targetDirectory .. sourceObject.name .. self.config[sourceObject.type .. "Suffix"] .. "/" .. filePaths[i], "w")
tmpFile.write(tmpContent)
tmpFile.close()
else
success = false
end

tmpRequest.close()
for i = 1, #filePaths, 1 do
local tmpRequest = http.get(baseUrl .. filePaths[i])
if tmpRequest then
local tmpContent = tmpRequest.readAll()
tmpRequest.close()
if tmpContent then
local tmpFile = fs.open(targetDirectory .. sourceObject.name .. self.config[sourceObject.type .. "Suffix"] .. "/" .. filePaths[i], "w")
tmpFile.write(tmpContent)
tmpFile.close()
else
success = false
end

if not success then
return nil, false
end
else
return nil, false
end
end

-- create a link that calls the file within the program directory
if sourceObject.type == "program" then
local progamLink = fs.open(sourceObject.name, "w")
progamLink.write("shell.execute(\"" .. targetDirectory .. sourceObject.name .. self.config[sourceObject.type .. "Suffix"] .. "/" .. sourceObject.name .. ".lua" .. "\", ...)")
progamLink.close()
elseif sourceObject.type == "library" then
local libraryLink = fs.open(targetDirectory .. sourceObject.name .. ".lua", "w")

local tmpName = sourceObject.name
if tmpName:find("%.") then
tmpName = tmpName:match("(.+)%..+$")
end

libraryLink.write("return require(\"./" .. self.config["libraryDirectory"] .. tmpName .. self.config[sourceObject.type .. "Suffix"] .. "/" .. tmpName .. "\")")
libraryLink.close()
-- create a link that calls the file within the program directory
if sourceObject.type == "program" then
local progamLink = fs.open(sourceObject.name, "w")
progamLink.write("shell.execute(\"" .. targetDirectory .. sourceObject.name .. self.config[sourceObject.type .. "Suffix"] .. "/" .. sourceObject.name .. ".lua" .. "\", ...)")
progamLink.close()
elseif sourceObject.type == "library" then
local libraryLink = fs.open(targetDirectory .. sourceObject.name .. ".lua", "w")

local tmpName = sourceObject.name
if tmpName:find("%.") then
tmpName = tmpName:match("(.+)%..+$")
end

return sourceObject, true
libraryLink.write("return require(\"./" .. self.config["libraryDirectory"] .. tmpName .. self.config[sourceObject.type .. "Suffix"] .. "/" .. tmpName .. "\")")
libraryLink.close()
end
end

return sourceObject, true
end
return nil, false
end

Expand Down