opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve remaining merge markers

Browse Source
This commit is contained in:
PlushZ
2026-04-05 12:15:20 +10:00
parent 5341612687
commit 9730b68b03
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/files/sources/onedrive.py
-8
View File
@@ -81,14 +81,10 @@ class OneDriveFilesSource(
return f"{api_base}/special/approot"
def _children_url(self, config: OneDriveFilesSourceConfiguration, path: str) -> str:
<<<<<<< HEAD
return f"{self._item_url(config, path)}/children"
=======
item_url = self._item_url(config, path)
if path.strip("/"):
return f"{item_url}:/children"
return f"{item_url}/children"
>>>>>>> 4132e5d794 (Add OneDrive file source)
def _content_url(self, config: OneDriveFilesSourceConfiguration, path: str) -> str:
return f"{self._item_url(config, path)}:/content" if path.strip("/") else f"{self._item_url(config, path)}/content"
@@ -196,14 +192,10 @@ class OneDriveFilesSource(
def _create_entry(
self, entry_data: EntryData, context: FilesSourceRuntimeContext[OneDriveFilesSourceConfiguration]
) -> Entry:
<<<<<<< HEAD
parent_path = getattr(entry_data, "path", "/")
=======
parent_path = getattr(entry_data, "path", None)
if parent_path is None:
target = getattr(entry_data, "target", "/")
parent_path = self.to_relative_path(target)
>>>>>>> 4132e5d794 (Add OneDrive file source)
payload = {
"name": entry_data.name,
"folder": {},