Skip to content

aeon 5.2 updates #3

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
alexduryee wants to merge 1 commit into
base: master
Choose a base branch
from
Open

aeon 5.2 updates #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 14 additions & 13 deletions API.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,21 @@ function SendApiRequest(apiPath, method, parameters, authToken)

local webClient = Types["System.Net.WebClient"]()

local postParameters = Types["System.Collections.Specialized.NameValueCollection"]()
if (parameters ~= nil) then
for k, v in pairs(parameters) do
postParameters:Add(k, v)
end
end
local parametersTable = {};
local postParameters = "";
if parameters ~= nil then
for k,v in pairs(parameters) do
table.insert(parametersTable, k .. "=" .. v);
end
postParameters = table.concat(parametersTable, "&");
end


webClient.Headers:Clear()
if (authToken ~= nil and authToken ~= "") then
webClient.Headers:Add("X-ArchivesSpace-Session", authToken)
end

webClient.Encoding = Types["System.Text.Encoding"].UTF8;
local success, result

if (method == 'POST') then
Expand All @@ -120,12 +123,10 @@ function SendApiRequest(apiPath, method, parameters, authToken)
if (success) then
LogDebug("API call successful")

local utf8Result = Types["System.Text.Encoding"].UTF8:GetString(result)

return utf8Result
return result;
else
LogDebug("API call error")
HTTPErrorCode = ExtractHTTPErrorCode(result.innerException:ToString())
HTTPErrorCode = ExtractHTTPErrorCode(result.InnerException:ToString())
if HTTPErrorCode == '403' or HTTPErrorCode == '404' or HTTPErrorCode == '412' then
return '{"httpErrorCode":'..HTTPErrorCode..'}'
else
Expand All @@ -142,11 +143,11 @@ function ExtractHTTPErrorCode(innerException)
end

function WebClientPost(webClient, apiPath, postParameters)
return webClient:UploadValues(PathCombine(settings.APIUrl, apiPath), method, postParameters)
return webClient:UploadString(PathCombine(settings.APIUrl, apiPath), postParameters);
end

function WebClientGet(webClient, apiPath)
return webClient:DownloadData(PathCombine(settings.APIUrl, apiPath))
return webClient:DownloadString(PathCombine(settings.APIUrl, apiPath));
end


Expand Down
6 changes: 3 additions & 3 deletions Main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ settings["Username"] = GetSetting("APIUsername")
settings["RepoCode"] = GetSetting("RepoCode")

-- Logging needs to precede all but settings to enable supporting libraries to log
globalInterfaceMngr = GetInterfaceManager()
settings["AddonName"] = globalInterfaceMngr.environment.Info.Name
settings["AddonVersion"] = globalInterfaceMngr.environment.Info.Version
InterfaceMngr = GetInterfaceManager()
settings["AddonName"] = InterfaceMngr.Environment.Info.Name
settings["AddonVersion"] = InterfaceMngr.Environment.Info.Version
settings["LogLabel"] = settings.AddonName .. " v" .. settings.AddonVersion

LogDebug("Launching ASpace Basic Plugin")
Expand Down