[Scummvm-git-logs] scummvm-web master -> 1fdd6fd18f3c2d483b7a169308864ed94ab31b9c
Thunderforge
noreply at scummvm.org
Wed Jan 12 04:11:34 UTC 2022
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .
Summary:
1fdd6fd18f WEB: Changing category from "tools" to "scummvm-tools"
Commit: 1fdd6fd18f3c2d483b7a169308864ed94ab31b9c
https://github.com/scummvm/scummvm-web/commit/1fdd6fd18f3c2d483b7a169308864ed94ab31b9c
Author: Thunderforge (wjherrmann at gmail.com)
Date: 2022-01-11T22:11:30-06:00
Commit Message:
WEB: Changing category from "tools" to "scummvm-tools"
This allows for simpler URL generation
Changed paths:
data/en/scummvm_downloads.yaml
include/Constants.php
include/Models/DownloadsModel.php
include/Objects/File.php
diff --git a/data/en/scummvm_downloads.yaml b/data/en/scummvm_downloads.yaml
index c7a3d248..5b6c4300 100644
--- a/data/en/scummvm_downloads.yaml
+++ b/data/en/scummvm_downloads.yaml
@@ -1111,8 +1111,8 @@
description: ''
-
enabled: true
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: windows
user_agent: ''
version: 2.5.0
@@ -1121,8 +1121,8 @@
description: ''
-
enabled: true
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: windows
user_agent: ''
version: 2.5.0
@@ -1131,8 +1131,8 @@
description: ''
-
enabled: true
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: macos
user_agent: ''
version: 2.5.0
@@ -1141,8 +1141,8 @@
description: ''
-
enabled: true
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: haiku
user_agent: ''
version: 2.5.0
@@ -1151,8 +1151,8 @@
description: ''
-
enabled: true
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: haiku
user_agent: ''
version: 2.5.0
@@ -1161,8 +1161,8 @@
description: ''
-
enabled: true
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: amiga
user_agent: ''
version: 2.5.0
@@ -1171,8 +1171,8 @@
description: ''
-
enabled: false
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: morphos
user_agent: ''
version: 2.5.0
@@ -1181,8 +1181,8 @@
description: ''
-
enabled: true
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: riscos
user_agent: ''
version: 2.5.0
@@ -1191,8 +1191,8 @@
description: ''
-
enabled: true
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: freemint
user_agent: ''
version: 2.5.0
@@ -1201,8 +1201,8 @@
description: ''
-
enabled: true
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: freemint
user_agent: ''
version: 2.5.0
@@ -1211,8 +1211,8 @@
description: ''
-
enabled: true
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: freemint
user_agent: ''
version: 2.5.0
@@ -1221,8 +1221,8 @@
description: ''
-
enabled: false
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: windows
user_agent: ''
version: 2.5.0
@@ -1231,8 +1231,8 @@
description: ''
-
enabled: false
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: fedora
user_agent: ''
version: 2.5.0
@@ -1241,8 +1241,8 @@
description: ''
-
enabled: false
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: fedora
user_agent: ''
version: 2.5.0
@@ -1251,8 +1251,8 @@
description: ''
-
enabled: false
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: solaris
user_agent: ''
version: 2.5.0
@@ -1261,8 +1261,8 @@
description: ''
-
enabled: false
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: solaris
user_agent: ''
version: 2.5.0
@@ -1271,8 +1271,8 @@
description: ''
-
enabled: false
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: irix
user_agent: ''
version: 2.5.0
@@ -1281,8 +1281,8 @@
description: ''
-
enabled: false
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: irix
user_agent: ''
version: 2.5.0
@@ -1291,8 +1291,8 @@
description: ''
-
enabled: false
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: beos
user_agent: ''
version: 2.5.0
@@ -1301,8 +1301,8 @@
description: ''
-
enabled: true
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: cpp
user_agent: ''
version: 2.5.0
@@ -1311,8 +1311,8 @@
description: ''
-
enabled: true
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: cpp
user_agent: ''
version: 2.5.0
@@ -1321,8 +1321,8 @@
description: ''
-
enabled: true
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: cpp
user_agent: ''
version: 2.5.0
@@ -1331,8 +1331,8 @@
description: ''
-
enabled: true
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: cpp
user_agent: ''
version: 2.5.0
@@ -1341,8 +1341,8 @@
description: ''
-
enabled: true
- category: tools
- subcategory: tools
+ category: scummvm-tools
+ subcategory: release
category_icon: cpp
user_agent: ''
version: 2.5.0
diff --git a/include/Constants.php b/include/Constants.php
index 6615fc72..7964653b 100644
--- a/include/Constants.php
+++ b/include/Constants.php
@@ -51,7 +51,6 @@ class Constants
define('DOWNLOADS_URL', 'frs/scummvm/{$version}/');
define('DOWNLOADS_DAILY_URL', 'frs/daily/');
define('DOWNLOADS_EXTRAS_URL', 'frs/extras/');
- define('DOWNLOADS_TOOLS_URL', 'frs/scummvm-tools/{$release_tools}/');
/* Themes */
define('THEMES', [
diff --git a/include/Models/DownloadsModel.php b/include/Models/DownloadsModel.php
index ad141f24..fd256707 100644
--- a/include/Models/DownloadsModel.php
+++ b/include/Models/DownloadsModel.php
@@ -29,12 +29,12 @@ class DownloadsModel extends BasicModel
if ($data->getVersion() == 'Daily') {
$category = 'daily';
$subCategory = 'daily_downloads';
- } elseif ($data->getVersion() == RELEASE || $data->getCategory() == 'tools') {
+ } elseif ($data->getVersion() == RELEASE || $data->getCategory() == 'scummvm-tools') {
$category = 'current';
if ($data->getSubCategory() == 'source') {
$subCategory = 'source';
- } elseif ($data->getCategory() == 'tools') {
- $subCategory = 'tools';
+ } elseif ($data->getCategory() == 'scummvm-tools') {
+ $subCategory = 'scummvm-tools';
} else {
$subCategory = 'release';
}
@@ -78,7 +78,7 @@ class DownloadsModel extends BasicModel
"current"=>["title"=>"{#downloadsXMLTitle#} {#downloadsXMLVersion#}"],
"release"=>["title"=>"{#downloadsBinaries#}","notes"=>"{#downloadsBinariesNote1#} <a href='https://downloads.scummvm.org/frs/scummvm/{ldelim}release{rdelim}/ReleaseNotes.html'>{#downloadsBinariesNote2#}</a>.<p>{#downloadsBinariesNote3#}</p>"],
"source"=>["title"=>"{#downloadsSourceCode#}"],
- "tools"=>["title"=>"{#downloadsTools#}"],
+ "scummvm-tools"=>["title"=>"{#downloadsTools#}"],
"legacy"=>["title"=>"{#downloadsOldBinaries#}"],
"old"=>["title"=>"{#downloadsOld#}","notes"=>"{#downloadsOldBinariesNote#} {#downloadsOldBinariesFrsNote1#} <a href='https://downloads.scummvm.org/frs/scummvm/'>{#downloadsOldBinariesFrsNote2#}</a> {#downloadsOldBinariesFrsNote3#}"],
"daily"=>["title"=>"{#downloadsDailyBuilds#}"],
diff --git a/include/Objects/File.php b/include/Objects/File.php
index 6f39ff81..7e18559f 100644
--- a/include/Objects/File.php
+++ b/include/Objects/File.php
@@ -38,8 +38,6 @@ class File extends BasicObject
// Construct the URL based on its type
if ($this->category == 'scummvm' && $this->version == 'daily') {
$fname = DOWNLOADS_DAILY_URL . $url;
- } elseif ($this->subcategory == 'tools') {
- $fname = DOWNLOADS_TOOLS_URL . $url;
} elseif ($this->category == 'games' || $this->category == 'addons') {
$fname = DOWNLOADS_EXTRAS_URL . $url;
} elseif (str_starts_with($url, '/frs') || str_starts_with($url, 'http')) {
More information about the Scummvm-git-logs
mailing list