Merged with reorder

gazebosim · May 5, 2020 · b3869d8 · b3869d8
2 parents 556c687 + 976e568
commit b3869d8
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 68 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ build_*
 # OS generated files
 .DS_Store
 *.swp
+*.orig
 
 # server files
 test-server/node_modules

diff --git a/src/cmd/cmdfuel.rb.in b/src/cmd/cmdfuel.rb.in
@@ -232,6 +232,16 @@ class Cmd
 
     # check required flags
     case options['subcommand']
+    when 'delete'
+      if options['url'] == ''
+        puts "Missing resource URL (e.g. --url https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Ambulance)."
+        exit(-1)
+      end
+    when 'download'
+      if options['url'] == ''
+        puts "Missing resource URL (e.g. --url https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Ambulance)."
+        exit(-1)
+      end
     when 'list'
       # Resource type
       if !options.key?('type')
@@ -242,21 +252,11 @@ class Cmd
         puts "Invalid resource type, use 'model' or 'world'."
         exit(-1)
       end
-    when 'download'
-      if options['url'] == ''
-        puts "Missing resource URL (e.g. --url https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Ambulance)."
-        exit(-1)
-      end
     when 'upload'
       if options['model'] == ''
         puts "Missing model path."
         exit(-1)
       end
-    when 'delete'
-      if options['url'] == ''
-        puts "Missing resource URL (e.g. --url https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Ambulance)."
-        exit(-1)
-      end
     end
 
     options
@@ -302,72 +302,61 @@ class Cmd
       end
 
       case options['subcommand']
-        # Delete
-        when 'delete'
-          Importer.extern 'int deleteUrl(const char *, const char *)'
-          if not Importer.deleteUrl(options['url'], options['header'])
+      when 'delete'
+        Importer.extern 'int deleteUrl(const char *, const char *)'
+        if not Importer.deleteUrl(options['url'], options['header'])
+          exit(-1)
+        end
+      when 'download'
+        Importer.extern 'int downloadUrl(const char *, const  char *, const char *)'
+        if not Importer.downloadUrl(options['url'], options['config'],
+            options['header'])
+          exit(-1)
+        end
+      when 'edit'
+        Importer.extern 'int editUrl(const char *, const char *, const char *)'
+        if not Importer.editUrl(options['url'], options['header'],
+            options['private'])
+          exit(-1)
+        end
+      when 'list'
+        if options['type'] == 'model'
+          Importer.extern 'int listModels(const char *, const char *, const char *, const char *)'
+          if not Importer.listModels(options['url'],
+                                     options['owner'],
+                                     options['raw'],
+                                     options['config'])
             exit(-1)
           end
-
-        # Download
-        when 'download'
-          Importer.extern 'int downloadUrl(const char *, const  char *, const char *)'
-          if not Importer.downloadUrl(options['url'], options['config'],
-              options['header'])
+        elsif options['type'] == 'world'
+          Importer.extern 'int listWorlds(const char *, const char *, const char *, const char *)'
+          if not Importer.listWorlds(options['url'],
+                                     options['owner'],
+                                     options['raw'],
+                                     options['config'])
             exit(-1)
           end
-
-        # Edit
-        when 'edit'
-          Importer.extern 'int editUrl(const char *, const char *, const char *)'
-          if not Importer.editUrl(options['url'], options['header'],
-              options['private'])
+        end
+      when 'meta'
+        if options.key?('config2pbtxt') && !options['config2pbtxt'].empty?
+          Importer.extern 'int config2Pbtxt(const char *)'
+          if not Importer.config2Pbtxt(options['config2pbtxt'])
             exit(-1)
           end
-
-        # List
-        when 'list'
-          if options['type'] == 'model'
-            Importer.extern 'int listModels(const char *, const char *, const char *, const char *)'
-            if not Importer.listModels(options['url'],
-                                       options['owner'],
-                                       options['raw'],
-                                       options['config'])
-              exit(-1)
-            end
-          elsif options['type'] == 'world'
-            Importer.extern 'int listWorlds(const char *, const char *, const char *, const char *)'
-            if not Importer.listWorlds(options['url'],
-                                       options['owner'],
-                                       options['raw'],
-                                       options['config'])
-              exit(-1)
-            end
-          end
-
-        # Meta
-        when 'meta'
-          if options.key?('config2pbtxt') && !options['config2pbtxt'].empty?
-            Importer.extern 'int config2Pbtxt(const char *)'
-            if not Importer.config2Pbtxt(options['config2pbtxt'])
-              exit(-1)
-            end
-          elsif options.key?('pbtxt2config') && !options['pbtxt2config'].empty?
-            Importer.extern 'int pbtxt2Config(const char *)'
-            if not Importer.pbtxt2Config(options['pbtxt2config'])
-              exit(-1)
-            end
-          end
-
-        # Upload
-        when 'upload'
-          Importer.extern 'int upload(const char *, const char *, const char *, const char *)'
-          if not Importer.upload(options['model'],
-                                 options['url'],
-                                 options['header'],
-                                 options['private'])
+        elsif options.key?('pbtxt2config') && !options['pbtxt2config'].empty?
+          Importer.extern 'int pbtxt2Config(const char *)'
+          if not Importer.pbtxt2Config(options['pbtxt2config'])
             exit(-1)
           end
+        end
+      when 'upload'
+        Importer.extern 'int upload(const char *, const char *, const char *, const char *)'
+        if not Importer.upload(options['model'],
+                               options['url'],
+                               options['header'],
+                               options['private'])
+          exit(-1)
+        end
       end
 
     rescue