PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
MihailRis
2025-09-30 23:40:02 +03:00
parent dba3b62964 c15302510a
commit 289e0f597c
39 changed files with 658 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/layouts/pages/content.xml
+2 -2
View File
@@ -31,11 +31,11 @@
size='32' margin='0,0,425,64' gravity='bottom-right'
color='#FFFFFF50' hover-color='#FFFFFF10'/>
<panel id='packs_add' pos='485,34' size='440,507' color='0' max-length='455' scrollable='true'>
<panel id='packs_add' pos='485,34' size='440,455' color='0' max-length='455' scrollable='true'>
<!-- content is generated in script -->
</panel>
<panel id='packs_cur' pos='15,34' size='440,507' color='0' max-length='455' scrollable='true'>
<panel id='packs_cur' pos='15,34' size='440,455' color='0' max-length='455' scrollable='true'>
<!-- content is generated in script -->
</panel>
</container>
res/layouts/pages/content.xml.lua
+24 -21
View File
@@ -255,30 +255,33 @@ function check_dependencies(packinfo)
if packinfo.dependencies == nil then
return
end
for i,dep in ipairs(packinfo.dependencies) do
for i, dep in ipairs(packinfo.dependencies) do
local depid, depver = unpack(string.split(dep:sub(2,-1), "@"))
if dep:sub(1,1) == '!' then
if not table.has(packs_all, depid) then
return string.format(
"%s (%s)", gui.str("error.dependency-not-found"), depid
)
end
local dep_pack = pack.get_info(depid);
if not compare_version(depver, dep_pack.version) then
local op, ver = Version.parse(depver);
print(string.format("%s: %s !%s %s (%s)", gui.str("error.dependency-version-not-met"), dep_pack.version, op, ver, depid));
return string.format("%s: %s != %s (%s)", gui.str("error.dependency-version-not-met"), dep_pack.version, ver, depid);
end
if table.has(packs_installed, packinfo.id) then
table.insert(required, depid)
end
if dep:sub(1,1) ~= '!' then
goto continue
end
if not table.has(packs_all, depid) then
return string.format(
"%s (%s)", gui.str("error.dependency-not-found"), depid
)
end
local dep_pack = pack.get_info(depid);
if not compare_version(depver, dep_pack.version) then
local op, ver = Version.parse(depver)
return string.format(
"%s: %s != %s (%s)",
gui.str("error.dependency-version-not-met"),
dep_pack.version, ver, depid
);
end
if table.has(packs_installed, packinfo.id) then
table.insert(required, depid)
end
::continue::
end
return
end