[Scummvm-git-logs] scummvm-web master -> dab6d24666a7f84712ee4f8d5e9dee615b7774b6

[lotharsm]

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:
dab6d24666 WEB: Moving daily download file path


Commit: dab6d24666a7f84712ee4f8d5e9dee615b7774b6
    https://github.com/scummvm/scummvm-web/commit/dab6d24666a7f84712ee4f8d5e9dee615b7774b6
Author: Thunderforge (wjherrmann at gmail.com)
Date: 2022-01-14T13:43:13+01:00

Commit Message:
WEB: Moving daily download file path

I have proposed moving daily downloads of ScummVM and ScummVM Tools from `frs/daily/` to `frs/scummvm/daily/` and `frs/scummvm-tools/daily` respectively. This PR contains simplifications to the code that would result from this.

Changed paths:
    include/Constants.php
    include/Objects/File.php


diff --git a/include/Constants.php b/include/Constants.php
index 7964653b..8f25935b 100644
--- a/include/Constants.php
+++ b/include/Constants.php
@@ -49,7 +49,6 @@ class Constants
         /* Downloads */
         define('DOWNLOADS_BASE', 'https://downloads.scummvm.org');
         define('DOWNLOADS_URL', 'frs/scummvm/{$version}/');
-        define('DOWNLOADS_DAILY_URL', 'frs/daily/');
         define('DOWNLOADS_EXTRAS_URL', 'frs/extras/');
 
         /* Themes */
diff --git a/include/Objects/File.php b/include/Objects/File.php
index 69db16ec..cd2700ba 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->version == 'daily') {
-                $fname = DOWNLOADS_DAILY_URL . $url;
-            } elseif ($this->category == 'games' || $this->category == 'addons') {
+            if ($this->category == 'games' || $this->category == 'addons') {
                 $fname = DOWNLOADS_EXTRAS_URL . $url;
             } elseif (str_starts_with($url, '/frs') || str_starts_with($url, 'http')) {
                 $fname = $url;