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

[lotharsm]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .

Summary:
f53ffc4ab8 WEB: Removing leading slash from file path constants
bea0da3bc4 WEB: Change how file extra info is generated


Commit: f53ffc4ab83ccb9a9f12495a1cee3171983e7311
    https://github.com/scummvm/scummvm-web/commit/f53ffc4ab83ccb9a9f12495a1cee3171983e7311
Author: Thunderforge (wjherrmann at gmail.com)
Date: 2022-01-09T09:04:05+01:00

Commit Message:
WEB: Removing leading slash from file path constants

This resulted in `//`, which resolved as a `/` in the URL, but broke calls like `is_file()`.

Changed paths:
    include/Constants.php


diff --git a/include/Constants.php b/include/Constants.php
index d6ccba7b..9e27a5ae 100644
--- a/include/Constants.php
+++ b/include/Constants.php
@@ -47,9 +47,9 @@ class Constants
 
         /* Downloads */
         define('DOWNLOADS_BASE', 'https://downloads.scummvm.org');
-        define('DOWNLOADS_URL', '/frs/scummvm/{$version}/');
-        define('DOWNLOADS_DAILY_URL', '/frs/daily/');
-        define('DOWNLOADS_TOOLS_URL', '/frs/scummvm-tools/{$release_tools}/');
+        define('DOWNLOADS_URL', 'frs/scummvm/{$version}/');
+        define('DOWNLOADS_DAILY_URL', 'frs/daily/');
+        define('DOWNLOADS_TOOLS_URL', 'frs/scummvm-tools/{$release_tools}/');
 
         /* Themes */
         define('THEMES', [


Commit: bea0da3bc4321489844cdc03982bf2fccc57e8e3
    https://github.com/scummvm/scummvm-web/commit/bea0da3bc4321489844cdc03982bf2fccc57e8e3
Author: Thunderforge (wjherrmann at gmail.com)
Date: 2022-01-09T09:04:05+01:00

Commit Message:
WEB: Change how file extra info is generated

Changed paths:
    include/Objects/File.php


diff --git a/include/Objects/File.php b/include/Objects/File.php
index f07eb19b..167747e4 100644
--- a/include/Objects/File.php
+++ b/include/Objects/File.php
@@ -15,7 +15,6 @@ class File extends BasicObject
     {
         parent::__construct($data);
         $this->category_icon = $data['category_icon'];
-        $this->extra_info = $data['extra_info'] ?? null;
         $this->subcategory = $data['subcategory'] ?? null;
         $this->user_agent = isset($data["user_agent"]) ? $data["user_agent"] : "";
         $this->version = strtolower($data['version'] ?? null);
@@ -80,22 +79,10 @@ class File extends BasicObject
                 }
 
                 $this->extra_info['ext'] = $ext;
-                $this->extra_info['msg'] = $data['extra_msg'];
-            }
-            $this->url = $fname;
-        }
-        /**
-         * Get the filesize/last modified information and put it in
-         * $this->extra_info.
-         */
-        if (isset($attributes['extra_info'])
-            && $attributes['extra_info'] == 'true') {
-            if (is_file($fname) && is_readable($fname)) {
                 $this->extra_info['date'] = date('F j, Y, g:i a', @filemtime($fname));
-                if (!is_null($data['extra_info'])) {
-                    $this->extra_info['info'] = $data['extra_info'];
-                }
+                $this->extra_info['msg'] = isset($data['notes']) ? $data['notes'] : '';
             }
+            $this->url = $fname;
         }
     }