@@ -1090,17 +1090,12 @@ def _safe_extract_rc_url(inst, fallback):
10901090 config_data ["debrids" ] = []
10911091
10921092 if use_embedded :
1093- mount_root = config_data .get ("rclone" , {}).get (
1094- "mount_path" , default_embedded_rclone ["mount_path" ]
1095- )
10961093 for name_lc , api_key in api_keys_map .items ():
1097- folder = _provider_folder (name_lc , mount_root ) + "/"
10981094 config_data ["debrids" ].append (
10991095 {
11001096 "name" : name_lc ,
11011097 "api_key" : api_key ,
11021098 "download_api_keys" : [api_key ],
1103- "folder" : folder ,
11041099 "rate_limit" : "250/minute" ,
11051100 "use_webdav" : True ,
11061101 "torrents_refresh_interval" : "15s" ,
@@ -1203,28 +1198,19 @@ def _safe_extract_rc_url(inst, fallback):
12031198 if not isinstance (config_data .get ("debrids" ), list ):
12041199 config_data ["debrids" ] = []
12051200
1206- mount_root = (
1207- mount_path
1208- if beta_enabled
1209- else config_data .get ("rclone" , {}).get (
1210- "mount_path" , default_embedded_rclone ["mount_path" ]
1211- )
1212- )
12131201 existing = {
12141202 _debrid_key (d ): d for d in config_data ["debrids" ] if isinstance (d , dict )
12151203 }
12161204
12171205 changed = False
12181206 for name_lc , api_key in api_keys_map .items ():
1219- desired_folder = _provider_folder (name_lc , mount_root ) + "/"
12201207 d = existing .get (name_lc )
12211208 if not d :
12221209 d = {
12231210 "provider" : name_lc ,
12241211 "name" : name_lc ,
12251212 "api_key" : api_key ,
12261213 "download_api_keys" : [api_key ],
1227- "folder" : desired_folder ,
12281214 "rate_limit" : "250/minute" ,
12291215 "use_webdav" : True ,
12301216 "torrents_refresh_interval" : "15s" ,
@@ -1249,9 +1235,6 @@ def _safe_extract_rc_url(inst, fallback):
12491235 dl_keys .add (api_key )
12501236 d ["download_api_keys" ] = list (dl_keys )
12511237 changed = True
1252- if d .get ("folder" ) != desired_folder :
1253- d ["folder" ] = desired_folder
1254- changed = True
12551238 if d .get ("use_webdav" ) is not True :
12561239 d ["use_webdav" ] = True
12571240 changed = True
@@ -1263,18 +1246,6 @@ def _safe_extract_rc_url(inst, fallback):
12631246 logger .info ("Synchronized Decypharr debrids from embedded api_keys map" )
12641247 updated = True
12651248
1266- # Final safety pass to ensure folder layout even if user edited manually
1267- changed = False
1268- for d in config_data ["debrids" ]:
1269- name_lc = _debrid_key (d ) or "unknown"
1270- desired_folder = _provider_folder (name_lc , mount_root ) + "/"
1271- if d .get ("folder" ) != desired_folder :
1272- d ["folder" ] = desired_folder
1273- changed = True
1274- if changed :
1275- logger .info ("Adjusted debrid folders for embedded rclone mount layout" )
1276- updated = True
1277-
12781249 # Legacy external-rclone mode: synchronize/merge debrids[] from api_keys_map
12791250 elif mount_type == "external_rclone" :
12801251 if not isinstance (config_data .get ("debrids" ), list ):
0 commit comments