[Scummvm-git-logs] scummvm-web master -> 5e82b7570c968745e9f6925db51ec7a88b0ef927

[Thunderforge]

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:
5e82b7570c WEB: Simplifying how source URLs are constructed


Commit: 5e82b7570c968745e9f6925db51ec7a88b0ef927
    https://github.com/scummvm/scummvm-web/commit/5e82b7570c968745e9f6925db51ec7a88b0ef927
Author: Thunderforge (wjherrmann at gmail.com)
Date: 2022-01-11T21:32:35-06:00

Commit Message:
WEB: Simplifying how source URLs are constructed

Changed paths:
    data/en/scummvm_downloads.yaml
    include/Models/DownloadsModel.php
    include/Objects/File.php


diff --git a/data/en/scummvm_downloads.yaml b/data/en/scummvm_downloads.yaml
index 2e41d6d0..c7a3d248 100644
--- a/data/en/scummvm_downloads.yaml
+++ b/data/en/scummvm_downloads.yaml
@@ -1051,7 +1051,7 @@
     description: ''
 -
     enabled: true
-    category: source
+    category: scummvm
     subcategory: source
     category_icon: cpp
     user_agent: ''
@@ -1061,7 +1061,7 @@
     description: ''
 -
     enabled: true
-    category: source
+    category: scummvm
     subcategory: source
     category_icon: cpp
     user_agent: ''
@@ -1071,7 +1071,7 @@
     description: ''
 -
     enabled: true
-    category: source
+    category: scummvm
     subcategory: source
     category_icon: cpp
     user_agent: ''
@@ -1081,7 +1081,7 @@
     description: ''
 -
     enabled: true
-    category: source
+    category: scummvm
     subcategory: source
     category_icon: cpp
     user_agent: ''
@@ -1091,7 +1091,7 @@
     description: ''
 -
     enabled: true
-    category: source
+    category: scummvm
     subcategory: source
     category_icon: cpp
     user_agent: ''
@@ -1101,7 +1101,7 @@
     description: ''
 -
     enabled: false
-    category: source
+    category: scummvm
     subcategory: source
     category_icon: cpp
     user_agent: ''
diff --git a/include/Models/DownloadsModel.php b/include/Models/DownloadsModel.php
index 2e0636e1..5c729b64 100644
--- a/include/Models/DownloadsModel.php
+++ b/include/Models/DownloadsModel.php
@@ -28,7 +28,7 @@ class DownloadsModel extends BasicModel
                 // Tools are always go to the current section
                 if ($data->getVersion() == RELEASE || $data->getCategory() == 'tools') {
                     $category = 'current';
-                    if ($data->getCategory() == 'source') {
+                    if ($data->getSubCategory() == 'source') {
                         $subCategory = 'source';
                     } elseif ($data->getCategory() == 'tools') {
                         $subCategory = 'tools';
diff --git a/include/Objects/File.php b/include/Objects/File.php
index 477a51ad..1a61e120 100644
--- a/include/Objects/File.php
+++ b/include/Objects/File.php
@@ -36,9 +36,7 @@ class File extends BasicObject
             $this->url = $url;
         } else {
             // Construct the URL based on its type
-            if ($this->category == 'source') {
-                $fname = DOWNLOADS_URL . $url;
-            } elseif ($this->subcategory == 'tools') {
+            if ($this->subcategory == 'tools') {
                 $fname = DOWNLOADS_TOOLS_URL . $url;
             } elseif ($this->category == 'games' || $this->category == 'addons') {
                 $fname = DOWNLOADS_EXTRAS_URL . $url;