From 4c004be7901478736a20caee1ce2c3d7e881e9ef Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Wed, 12 Jul 2023 21:11:01 +0900 Subject: [PATCH 1/4] use query to find folder + title, instead of list all files and apply fileters --- gdrive_ros/node_scripts/gdrive_server_node.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gdrive_ros/node_scripts/gdrive_server_node.py b/gdrive_ros/node_scripts/gdrive_server_node.py index e3ee2731e..bbdcd609d 100644 --- a/gdrive_ros/node_scripts/gdrive_server_node.py +++ b/gdrive_ros/node_scripts/gdrive_server_node.py @@ -252,15 +252,8 @@ def _get_parents_id(self, parents_path, parents_id=None, mkdir=False): folder_title = parents_path[0] parent = parents_id if parents_id else 'root' - gfiles = self.gdrive.ListFile( - {'q': "'{}' in parents and trashed=false".format(parent)}) - gfiles = gfiles.GetList() - gfolders = [] - for gf in gfiles: - if (gf['mimeType'] == self.folder_mime_type - and gf['title'] == folder_title): - gfolders.append(gf) - + gfolders = self.gdrive.ListFile( + {'q': "'{}' in parents and mimeType = '{}' and title = '{}' and trashed=false".format(parent, self.folder_mime_type, folder_title)}).GetList() if len(parents_path) == 1: if len(gfolders) > 0: return gfolders[0]['id'] From 52da01aef8c51f2a5960646eb010a647b576a0da Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 21 Jul 2023 13:59:16 +0900 Subject: [PATCH 2/4] ROS_DISTRO needs ros_environment --- 3rdparty/zdepth/package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/3rdparty/zdepth/package.xml b/3rdparty/zdepth/package.xml index b19445c32..8cd97a124 100644 --- a/3rdparty/zdepth/package.xml +++ b/3rdparty/zdepth/package.xml @@ -9,6 +9,7 @@ BSD catkin + ros_environment From 65737571de6f933a3afec4f5ed80cb294a19465f Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 21 Jul 2023 15:07:42 +0900 Subject: [PATCH 3/4] julius: fix location URLs, because osdn is too slow --- 3rdparty/julius/Makefile.dictation-kit | 2 +- 3rdparty/julius/Makefile.grammar-kit | 2 +- 3rdparty/julius/Makefile.julius | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/3rdparty/julius/Makefile.dictation-kit b/3rdparty/julius/Makefile.dictation-kit index 76e1b5846..811511002 100644 --- a/3rdparty/julius/Makefile.dictation-kit +++ b/3rdparty/julius/Makefile.dictation-kit @@ -5,7 +5,7 @@ all: installed.dict VERSION = 4.4 FILENAME = dictation-kit-v$(VERSION).zip TARBALL = build/$(FILENAME) -TARBALL_URL = "https://osdn.jp/dl/julius/$(FILENAME)" +TARBALL_URL = "https://github.com/jsk-ros-pkg/archives/raw/master/$(FILENAME)" TARBALL_PATCH = SOURCE_DIR = build/dictation-kit-v$(VERSION) UNPACK_CMD = unzip -qq diff --git a/3rdparty/julius/Makefile.grammar-kit b/3rdparty/julius/Makefile.grammar-kit index caf210bae..993a983ac 100644 --- a/3rdparty/julius/Makefile.grammar-kit +++ b/3rdparty/julius/Makefile.grammar-kit @@ -5,7 +5,7 @@ all: installed.grammar-kit VERSION = 4.3.1 FILENAME = grammar-kit-v$(VERSION).tar.gz TARBALL = build/$(FILENAME) -TARBALL_URL = "https://github.com/julius-speech/grammar-kit/archive/v$(VERSION).tar.gz" +TARBALL_URL = "https://github.com/jsk-ros-pkg/archives/raw/master/$(FILENAME)" TARBALL_PATCH = SOURCE_DIR = build/grammar-kit-$(VERSION) UNPACK_CMD = tar xf diff --git a/3rdparty/julius/Makefile.julius b/3rdparty/julius/Makefile.julius index dcdf002d7..66f36ae2e 100644 --- a/3rdparty/julius/Makefile.julius +++ b/3rdparty/julius/Makefile.julius @@ -5,7 +5,7 @@ all: installed.julius VERSION = 4.4.2 FILENAME = julius-$(VERSION).tar.gz TARBALL = build/$(FILENAME) -TARBALL_URL = "https://github.com/julius-speech/julius/archive/v$(VERSION).tar.gz" +TARBALL_URL = "https://github.com/jsk-ros-pkg/archives/raw/master/$(FILENAME)" PATCH_DIR = $(CURDIR)/patch TARBALL_PATCH = $(PATCH_DIR)/config.patch $(PATCH_DIR)/aarch64.patch SOURCE_DIR = build/julius-$(VERSION) From e9a4904cb2449ab86415d8d4046592546a42b801 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Thu, 26 Oct 2023 21:34:47 +0900 Subject: [PATCH 4/4] google_chat_ros: enable to return message result --- google_chat_ros/scripts/google-chat.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google_chat_ros/scripts/google-chat.l b/google_chat_ros/scripts/google-chat.l index f146737e5..385537e78 100755 --- a/google_chat_ros/scripts/google-chat.l +++ b/google_chat_ros/scripts/google-chat.l @@ -19,7 +19,7 @@ (send goal :goal :text content) (send ac :send-goal goal) (if wait - (return-from send-google-chat-text (send ac :wait-for-result :timeout 5)) + (return-from send-google-chat-text (if (send ac :wait-for-result :timeout 5) (send ac :get-result) nil)) (return-from send-google-chat-text t)))))) (defun send-google-chat-image