Skip to content

Commit

Permalink
Merge pull request #89 from egbertbouman/cleanup
Browse files Browse the repository at this point in the history 
Cleanup tribler.js
  • Loading branch information
@egbertbouman
egbertbouman authored Nov 20, 2024
2 parents 3d22cdb + 7880f35 commit 7cb438a
Show file tree
Hide file tree
Showing 5 changed files with 81 additions and 112 deletions.
2 changes: 1 addition & 1 deletion css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ header nav {
}

#content .download {
width: 289px; height: 250px; float: left; margin: 70px 0 20px 20px;
width: 289px; height: 280px; float: left; margin: 70px 0 20px 20px;
padding-top:20px;
border: 1px solid #404040;
background: #505050;
Expand Down
6 changes: 5 additions & 1 deletion download.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,11 @@

<p><img src="img/linux.png" width=100px height=100px></p>

<p><a id="download-url-linux" href="">Download .deb</a> </p>
<p>
<a id="download-url-linux" href="">Download .deb</a>
<br/>
<a id="download-url-linux-arm" href="">Download .deb (ARM64)</a>
</p>

<p><a class="tribler-source-tree-url" href="">Browse source code </a> <br/>
<a id="tribler-source-url" href="">Download source tar</a><br>
Expand Down
7 changes: 3 additions & 4 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
<title>Tribler - Privacy using our Tor-inspired onion routing</title>

<meta http-equiv="Strict-Transport-Security" content="max-age=63072000; includeSubDomains; preload">
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; upgrade-insecure-requests">
<meta http-equiv="Content-Security-Policy" content="block-all-mixed-content;default-src 'self';script-src 'self' 'report-sample' 'unsafe-inline' https://googletagmanager.com https://tagmanager.google.com https://www.googletagmanager.com;style-src 'self' 'report-sample' 'unsafe-inline' tagmanager.google.com www.googletagmanager.com;object-src 'none';frame-src 'self' ghbtns.com www.googletagmanager.com;child-src 'self' www.googletagmanager.com;img-src 'self' data: www.googletagmanager.com;font-src 'self' data:;connect-src 'self' api.github.com www.googletagmanager.com *.google-analytics.com;manifest-src 'self';base-uri 'self';form-action 'self';media-src 'self';worker-src 'self'; upgrade-insecure-requests">
<meta http-equiv="X-Content-Type-Options" content="nosniff">
<meta http-equiv="X-Frame-Options" content="SAMEORIGIN">

<meta name="description" content="Tribler is a powerful and censorship resistant peer-to-peer decentralized torrent client, providing fast and privacy enhanced file-sharing experiences using Tor-inspired onion routing. Download and share torrents with ease.">
<meta name="keywords" content="Tribler, torrent client, peer-to-peer, decentralized, file sharing">
Expand All @@ -28,7 +27,7 @@
"url": "https://tribler.org"
}
</script>


<link rel="stylesheet" href="css/style.css" />
<link rel="stylesheet" href="css/lightbox.css" />
Expand Down Expand Up @@ -147,7 +146,7 @@ <h2>Disclaimer</h2>
</div>

</div>

<!-- <div class="wow fadeInUp">-->
<!-- <a href="img/image0.png" data-lightbox="screenshots" title="Channel contents | View the torrents within a channel."><img width=500px height=350px src="img/image0.png" title="Screenshot of the Tribler GUI" alt="" /></a>-->
<!-- </div>-->
Expand Down
167 changes: 68 additions & 99 deletions js/tribler.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,143 +8,111 @@ $(document).ready(function () {
$("#pre_release").hide();
$("#experimental_release").hide();

function update_page(stablerelease, prevrelease, prerelease, experimental_release) {
// find the right assets in the stable release
let windows64_url = undefined;
let windows32_url = undefined;
let mac_url = undefined;
let linux_url = undefined;
let linux_file_name = undefined;
let source_url = undefined;
$.each(stablerelease["assets"], function (index, asset) {
if (asset["name"].endsWith(".dmg") && !asset["name"].includes("debug")) {
mac_url = asset["browser_download_url"];
} else if (asset["name"].endsWith(".deb") && !asset["name"].includes("debug")) {
linux_url = asset["browser_download_url"];
linux_file_name = asset["name"];
} else if (asset["name"].endsWith("x86.exe") && !asset["name"].includes("debug")) {
windows32_url = asset["browser_download_url"];
} else if (asset["name"].endsWith("x64.exe") && !asset["name"].includes("debug")) {
windows64_url = asset["browser_download_url"];
} else if (asset["name"].endsWith("tar.xz") && !asset["name"].includes("debug")) {
source_url = asset["browser_download_url"];
}
});
function find_asset_url(release, os, architecture) {
if (release == undefined) return undefined;

// find the right assets in the prerelease
let pre_windows64_url = undefined;
let pre_windows32_url = undefined;
let pre_mac_url = undefined;
let pre_linux_url = undefined;
let pre_linux_file_name = undefined;
let pre_source_url = undefined;
if (prerelease != undefined) {
$("#pre_release").show();
$.each(prerelease["assets"], function (index, asset) {
if (asset["name"].endsWith(".dmg")) {
pre_mac_url = asset["browser_download_url"];
} else if (asset["name"].endsWith("x64.deb")) {
pre_linux_url = asset["browser_download_url"];
pre_linux_file_name = asset["name"];
} else if (asset["name"].endsWith("x86.exe")) {
pre_windows32_url = asset["browser_download_url"];
} else if (asset["name"].endsWith("x64.exe")) {
pre_windows64_url = asset["browser_download_url"];
} else if (asset["name"].endsWith("tar.xz")) {
pre_source_url = asset["browser_download_url"];
}
});
}
os = os.toLowerCase();
let assets = release["assets"];
for (var i = 0; i < assets.length; i++) {
let name = assets[i]["name"];
if (name.includes("debug"))
continue;

// find the right assets in the prerelease
let exp_windows64_url = undefined;
let exp_windows32_url = undefined;
let exp_mac_url = undefined;
let exp_linux_url = undefined;
let exp_linux_file_name = undefined;
let exp_source_url = undefined;
if (experimental_release != undefined) {
console.log(experimental_release);
$.each(experimental_release["assets"], function (index, asset) {
if (asset["name"].endsWith(".dmg")) {
exp_mac_url = asset["browser_download_url"];
} else if (asset["name"].endsWith("x64.deb")) {
exp_linux_url = asset["browser_download_url"];
exp_linux_file_name = asset["name"];
} else if (asset["name"].endsWith("x86.exe")) {
exp_windows32_url = asset["browser_download_url"];
} else if (asset["name"].endsWith("x64.exe")) {
exp_windows64_url = asset["browser_download_url"];
} else if (asset["name"].endsWith("tar.xz")) {
exp_source_url = asset["browser_download_url"];
}
});
if (os == "macos" && name.endsWith('.dmg'))
return assets[i]["browser_download_url"];
if (os == "windows" && architecture == "amd64" && name.endsWith('x64.exe'))
return assets[i]["browser_download_url"];
if (os == "windows" && architecture == "x86" && name.endsWith('x86.exe'))
return assets[i]["browser_download_url"];
if (os == "linux" && architecture == "amd64" && name.endsWith('x64.deb'))
return assets[i]["browser_download_url"];
if (os == "linux" && architecture == "arm64" && name.endsWith('aarch64.deb'))
return assets[i]["browser_download_url"];
if (os == "linux" && name.endsWith('all.deb'))
return assets[i]["browser_download_url"];
}
}

function update_page(stablerelease, prevrelease, prerelease, experimental_release) {
if (typeof (isfront) !== 'undefined') {
// set download URLs
var parser = new UAParser();
var result = parser.getResult();
var osName = result.os.name.toLowerCase();
var osName = parser.getOS().name.toLowerCase();
var architecture = parser.getCPU().architecture;

// set download URLs
if (osName == "windows") {
$("#download_os").html("For Windows 7/8/10 (64-bit)");
$("#main_download_url").attr("href", windows64_url);
$("#pre_release_download_url").attr("href", pre_windows64_url);
$("#footer_download_url").attr("href", windows64_url);

if(exp_windows64_url != undefined || exp_windows32_url != undefined){
let stable = find_asset_url(stablerelease, osName, architecture);
$("#main_download_url").attr("href", stable);
$("#footer_download_url").attr("href", stable);
$("#pre_release_download_url").attr("href", find_asset_url(prerelease, osName, architecture));

let exp32 = find_asset_url(experimental_release, osName, 'x86');
let exp64 = find_asset_url(experimental_release, osName, 'amd64');
if (exp32 != undefined || exp64 != undefined) {
$("#experimental_release").show();
const userAgent = navigator.userAgent;
if (userAgent.indexOf("WOW64") !== -1 || userAgent.indexOf("Win64") !== -1) {
$("#experimental_release_download_url").attr("href", exp_windows64_url);
$("#experimental_release_download_url").attr("href", exp64);
} else {
$("#experimental_release_download_url").attr("href", exp_windows32_url);
$("#experimental_release_download_url").attr("href", exp32);
}
}
} else if (osName == "mac os x") {
} else if (osName == "macos") {
$("#download_os").html("For macOS (Yosemite or later)");
$("#main_download_url").attr("href", mac_url);
$("#pre_release_download_url").attr("href", pre_mac_url);
$("#footer_download_url").attr("href", mac_url);

if(exp_mac_url != undefined){
let stable = find_asset_url(stablerelease, osName);
$("#main_download_url").attr("href", stable);
$("#footer_download_url").attr("href", stable);
$("#pre_release_download_url").attr("href", find_asset_url(prerelease, osName));

let exp = find_asset_url(experimental_release, osName);
if (exp != undefined) {
$("#experimental_release").show();
$("#experimental_release_download_url").attr("href", exp_mac_url);
$("#experimental_release_download_url").attr("href", exp);
}
} else if (jQuery.inArray(osName, new Array('kubuntu', 'xubuntu', 'lubuntu', 'ubuntu', 'gentoo', 'fedora', 'mandriva', 'redhat', 'suse', 'debian', 'slackware', 'arch', 'linux')) !== -1) {
$("#download_os").html("For Linux");
$("#main_download_url").attr("href", linux_url);
$("#pre_release_download_url").attr("href", pre_linux_url);
$("#footer_download_url").attr("href", linux_url);

let stable = find_asset_url(stablerelease, "linux", architecture);
$("#main_download_url").attr("href", stable);
$("#footer_download_url").attr("href", stable);
$("#pre_release_download_url").attr("href", find_asset_url(prerelease, "linux", architecture));
$("#instructions").html("Installation instructions for Linux");
$("#instructions").css("display", "block");
$("#instructions").attr("href", "./linux.html");

if(exp_linux_url != undefined){
let exp = find_asset_url(experimental_release, "linux", architecture);
if (exp != undefined) {
$("#experimental_release").show();
$("#experimental_release_download_url").attr("href", exp_linux_url);
$("#experimental_release_download_url").attr("href", exp);
}
} else {
$("#download_os").html("Unknown OS");
$("#main_download_url").attr("href", "download.html");
$("#footer_download_url").attr("href", "download.html");
}
} else if (pagename == "linux.html") {
let stable = find_asset_url(stablerelease, "linux", new UAParser().getCPU().architecture);
$("#linux-content-header").text("Latest release - Tribler " + stablerelease["name"].substring(1));
$("#debian-download-url").attr("href", linux_url);
$("#debian-download-url").attr("href", stable);
$("#debian-download-url").text("Download " + stablerelease["name"].substring(1));
$("#tribler-source-url").attr("href", source_url);
$("#tribler-source-url").attr("href", stablerelease["tarball_url"]);
$("#tribler-source-tree-url").attr("href", 'https://github.com/Tribler/tribler/tree/' + stablerelease['tag_name']);

$("#debian-install-code-url").text(linux_url);
$("#debian-install-code-file").text("./" + linux_file_name);
$("#debian-install-code-url").text(find_asset_url(stablerelease, "linux"));
$("#debian-install-code-file").text("./" + stable.split(/(\\|\/)/g).pop());
$("#debian-install-code").show();
} else if (pagename == "download.html") {
$("#download-url-win64").attr("href", windows64_url);
$("#download-url-win32").attr("href", windows32_url);
$("#download-url-mac").attr("href", mac_url);
$("#download-url-linux").attr("href", linux_url);
$("#tribler-source-url").attr("href", source_url);
$("#download-url-win64").attr("href", find_asset_url(stablerelease, "windows", "amd64"));
$("#download-url-win32").attr("href", find_asset_url(stablerelease, "windows", "x86"));
$("#download-url-mac").attr("href", find_asset_url(stablerelease, "macos"));
$("#download-url-linux").attr("href", find_asset_url(stablerelease, "linux", "amd64"));
let arm = find_asset_url(stablerelease, "linux", "arm64")
$("#download-url-linux-arm").toggle(arm && !arm.endsWith("all.deb"));
$("#download-url-linux-arm").attr("href", arm);
$("#tribler-source-url").attr("href", stablerelease["zipball_url"]);
$(".tribler-source-tree-url").attr("href", 'https://github.com/Tribler/tribler/tree/' + stablerelease['tag_name']);
$(".downloads-content").show()
$("#github-compare-url").attr("href", 'https://github.com/Tribler/tribler/compare/' + prevrelease['tag_name'] + '...' + stablerelease['tag_name'])
Expand All @@ -160,6 +128,7 @@ $(document).ready(function () {
if (index == 0 && release["prerelease"] && !prerelease) {
// we found a prerelease;
prerelease = release;
$("#pre_release").show();
$("#pre_release_download_url").text("Download Tribler " + release["name"].substring(1));
}
if (!release["prerelease"] && !stablerelease) {
Expand All @@ -174,7 +143,7 @@ $(document).ready(function () {

// Fetch experimental release
let experimental_release = undefined;

// DISABLED, re-enable by pointing to some repository here:
//$.get("https://api.github.com/repos/qstokkink/TriblerExperimental/releases", function (data) {
// experimental_release = data[0];
Expand Down
Loading

0 comments on commit 7cb438a

Please sign in to comment.