New database prefixes

xtrime-ru · Nov 19, 2023 · df5a7b8 · df5a7b8
1 parent d2ae22a
commit df5a7b8
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 31 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Client.php b/src/Client.php
@@ -62,7 +62,7 @@ public function addSession(string $session, array $settings = []): API
             Files::getSessionSettings($session),
         );
 
-        $settingsObject = self::getSettingsFromArray($settings);
+        $settingsObject = self::getSettingsFromArray($session, $settings);
 
         $instance = new API($file, $settingsObject);
         $instance->updateSettings($settingsObject);
@@ -159,8 +159,7 @@ public static function getWrapper(API $madelineProto): APIWrapper
         return $wrapper;
     }
 
-    private static function getSettingsFromArray(array $settings, SettingsAbstract $settingsObject = new Settings()): SettingsAbstract {
-
+    private static function getSettingsFromArray(string $session, array $settings, SettingsAbstract $settingsObject = new Settings()): SettingsAbstract {
         foreach ($settings as $key => $value) {
             if (is_array($value)) {
                 if ($key === 'db' && isset($value['type'])) {
@@ -171,10 +170,12 @@ private static function getSettingsFromArray(array $settings, SettingsAbstract $
                         'redis' => new Settings\Database\Redis(),
                     };
                     $settingsObject->setDb($type);
-                    if ($value['type'] === 'memory') {
-                        self::getSettingsFromArray([], $type);
+
+                    if ($type instanceof Settings\Database\Memory) {
+                        self::getSettingsFromArray($session, [], $type);
                     } else {
-                        self::getSettingsFromArray($value[$value['type']], $type);
+                        $type->setEphemeralFilesystemPrefix($session);
+                        self::getSettingsFromArray($session, $value[$value['type']], $type);
                     }
 
                     unset($value[$value['type']], $value['type'],);
@@ -184,7 +185,7 @@ private static function getSettingsFromArray(array $settings, SettingsAbstract $
                 }
 
                 $method = 'get' . ucfirst(str_replace('_', '', ucwords($key, '_')));
-                self::getSettingsFromArray($value, $settingsObject->$method());
+                self::getSettingsFromArray($session, $value, $settingsObject->$method());
             } else {
                 $method = 'set' . ucfirst(str_replace('_', '', ucwords($key, '_')));
                 $settingsObject->$method($value);