corysanin/artixweb_packages
1
0
Fork 0
forked from artixweb/artixweb_packages
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: corysanin:repos-update
Branches Tags
corysanin:master corysanin:repos-update artixweb:master artixweb:repo-url-fix artixweb:development artixweb:hide_stuff
artixweb:v0.1.4 artixweb:v0.1.3 artixweb:v0.1.2 artixweb:v0.1.1
..
compare: artixweb:v0.1.2
Branches Tags
artixweb:master artixweb:repo-url-fix artixweb:development artixweb:hide_stuff corysanin:master corysanin:repos-update
artixweb:v0.1.4 artixweb:v0.1.3 artixweb:v0.1.2 artixweb:v0.1.1

6 Commits
repos-upda ... v0.1.2

Author SHA1 Message Date
Cory Sanin
8e0d076e67 Merge pull request 'fix(#13): Show empty results instead of 404' (#17) from no-results into master 
Reviewed-on: artixweb/artixweb_packages#17
Reviewed-by: nikolar <nikolar@artixlinux.org>
 2024-06-15 00:50:42 +02:00
Cory Sanin
31d3cb5f27 fix(#13): Show empty results instead of 404 2024-06-14 12:16:59 -05:00
Cory Sanin
a1e748c0a9 Merge pull request 'feat: allow user to choose how links behave' (#16) from remove-target-blank into master 
Reviewed-on: artixweb/artixweb_packages#16
 2024-06-14 00:46:09 +02:00
Cory Sanin
4f2c810a2f feat: allow user to choose how links behave 2024-06-13 17:43:18 -05:00
Cory Sanin
3ce6daea15 Merge pull request 'feat: drop universe, add gremlins repos' (#12) from repos-update into master 
Reviewed-on: artixweb/artixweb_packages#12
Reviewed-by: artoo <artoo@artixlinux.org>
Reviewed-by: nikolar <nikolar@artixlinux.org>
 2024-06-14 00:17:31 +02:00
Cory Sanin
16fd963c8d use printf instead of echo 2024-06-13 17:09:44 -05:00
3 changed files with 30 additions and 32 deletions
Expand all files Collapse all files

10
Dockerfile.ci
View File

@@ -46,11 +46,11 @@ RUN pacman -Sy --noconfirm postgresql-libs \
&& set -x \
&& pacman -Syu --noconfirm \
&& pacman -Scc --noconfirm \
&& printf "\n[lib32]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf \
&& printf "\n[system-gremlins]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf \
&& printf "\n[world-gremlins]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf \
&& printf "\n[galaxy-gremlins]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf \
&& printf "\n[lib32-gremlins]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf \
&& printf "[lib32]\nInclude = /etc/pacman.d/mirrorlist\n" >> /etc/pacman.conf \
&& printf "[system-gremlins]\nInclude = /etc/pacman.d/mirrorlist\n" >> /etc/pacman.conf \
&& printf "[world-gremlins]\nInclude = /etc/pacman.d/mirrorlist\n" >> /etc/pacman.conf \
&& printf "[galaxy-gremlins]\nInclude = /etc/pacman.d/mirrorlist\n" >> /etc/pacman.conf \
&& printf "[lib32-gremlins]\nInclude = /etc/pacman.d/mirrorlist\n" >> /etc/pacman.conf \
&& pacman -Sy --noconfirm
WORKDIR /usr/share/artixweb_packages

46
crates/artixweb-packages/src/handlers/index.rs
View File

@@ -121,33 +121,31 @@ pub async fn index(
repos.join(":")
};
let s = if let Ok(result) =
let mut s = PackagesNavigation {
user_email,
packages: Vec::new(),
repos,
total: 0,
query: query_url.join("&"),
total_pages: 1,
generation_time: 0,
offset,
limit
};
if let Ok(result) =
get_packages_inner(&repos_criteria, limit, offset, search_criteria, Some(&pool)).await
{
PackagesNavigation {
user_email,
packages: result.0,
repos,
total: result.1,
query: query_url.join("&"),
total_pages: if limit > 0 {
(result.1 as f64 / limit as f64).ceil() as usize
} else {
1
},
generation_time: start_time.elapsed().as_millis(),
offset,
limit,
}
.render()
.unwrap()
} else {
return Ok(HttpResponse::NotFound()
.content_type("text/html")
.body("<html><body>404 - Page Not Found!</body></html>"));
};
s.packages = result.0;
s.total = result.1;
s.total_pages = if limit > 0 {
(result.1 as f64 / limit as f64).ceil() as usize
} else {
1
};
}
s.generation_time = start_time.elapsed().as_millis();
Ok(HttpResponse::Ok().content_type("text/html").body(s))
Ok(HttpResponse::Ok().content_type("text/html").body(s.render().unwrap()))
}
#[allow(clippy::unnecessary_wraps)]

6
crates/artixweb-packages/templates/package_details.html
View File

@@ -35,8 +35,8 @@
<h2>{{ pkg.package_name }}-{{ pkg.version }} {% if pkg.flagged %}(<span class="flagged">flagged</span>){% endif %}</h2>
<section role="action_panel" class="action_panel">
<h4>Actions Panel</h4>
<section role="action"><a href="{{ pkg.gitea_url }}" target="blank">View Package Sources</a></section>
<section role="action"><a href="{{ pkg.gitea_url }}/graph" target="blank">View Package Changes</a></section>
<section role="action"><a href="{{ pkg.gitea_url }}">View Package Sources</a></section>
<section role="action"><a href="{{ pkg.gitea_url }}/graph">View Package Changes</a></section>
{% if !pkg.flagged %}
<section role="action"><a href="/flag_package/{{ pkg.package_name }}/{{ pkg.version }}">Flag package out-of-date</a></section>
{% else %}
@@ -65,7 +65,7 @@
<section role="value">{{ pkg.replaces|provides_or_replaces }}</section>
{% endif %}
<section role="key">Upstream URL:</section>
<section role="value"><a href="{{ pkg.upstream_url }}" target="_blank">{{ pkg.upstream_url }}</a></section>
<section role="value"><a href="{{ pkg.upstream_url }}">{{ pkg.upstream_url }}</a></section>
<section role="key">Size:</section>
<section role="value">{{ pkg.size|human_readable }} MB</section>
<section role="key">Installed Size:</section>