DATABASES/ckanext-jro/api-cliente Commit - r14:a8d46058b456

v2.9.2 :: Update 'upload_file' function - Add empty resource

eynilupu -

r14:a8d46058b456

parent child

Context file:

r14:a8d46058b456

Collapse all files

CKAN_JRO-2.9.2.0.tar.gz binary modified 0 0

NO CONTENT: modified file, binary diff hidden

script/CKAN_JRO/jro_api.py +27 -12

                      except:
                          _, exc_value, _ = sys.exc_info()
                          return exc_value
-                 def upload_file(self, dataset_id, file_path, file_date, file_type, **kwargs):
+                 def upload_file(self, dataset_id, file_date, file_type, file_path=False, url_or_path=False, ignore_repetition=False, **kwargs):
                      # Agregar si es interruptido por teclado
                      '''
                      FINALIDAD:
-                         Funcion para subir un unico archivo al repositorio del ROJ.
+                         Funcion para crear un unico recurso (puede incluir un archivo asociado) al repositorio del ROJ.
                      PARAMETROS DISPONIBLES:
                          CONSULTAR: "GUIA DE SCRIPT.pdf"
                      ESTRUCTURA:
-                         <access_name>.upload_file(dataset_id = <class 'str'>, file_date = <class 'str'>, file_path = <class 'str'>, file_type = <class 'str'>, param_1 = <class 'param_1'>, ...)
+                         <access_name>.upload_file(dataset_id = <class 'str'>, file_date = <class 'str'>, file_type = <class 'str'>, file_path = <class 'str'>, url_or_path = <class 'str'>, param_1 = <class 'param_1'>, ...)
                      '''
-                     self.list = ['package_id', 'upload', 'voc_file_type', 'name'] #file_date
+                     #self.list = ['package_id', 'upload', 'voc_file_type', 'name'] #file_date
+                     self.list = ['package_id', 'upload', 'voc_file_type'] #file_date
                      for key1, value1 in kwargs.items():
                          if not key1 in self.list:
                              self.dict[key1] = value1
                              self.dict['others'] = json.dumps(kwargs['others'])
                      #---------------------------#
-                     if not os.path.isfile(file_path):
-                         return 'File "%s" not exist' % (file_path)
+                     if isinstance(file_path, str) and isinstance(url_or_path, str):
+                         return 'ERROR:: Choose one: "file_path" or "url_or_path" parameters'
+                     if isinstance(file_path, str):
+                         if not os.path.isfile(file_path):
+                             return 'File "%s" not exist' % (file_path)
+                         self.dict['upload'] = open(file_path, 'rb')
+                         self.dict['name'] = os.path.basename(file_path)
+                     elif isinstance(url_or_path, str):
+                         self.dict['url'] = url_or_path
+                         if not 'name' in self.dict:
+                             self.dict['name'] = os.path.basename(url_or_path)
+                     else:
+                         return 'ERROR: Verify "file_path" or "url_or_path" parameters: <class "str"> or choose one'
                      #if not 'format' in self.dict:
                      #    self.str = ''.join(pathlib.Path(file_path).suffixes)
                      #    if len(self.str) > 0:
                      for u in dataset_show:
                          resources_name.append(u['name'].lower())
-                     if os.path.basename(file_path).lower() in resources_name:
-                         return 'ERROR:: "%s" file already exist in this dataset' % (os.path.basename(file_path))
+                     if self.dict['name'].lower() in resources_name:
+                         if not ignore_repetition:
+                             return 'ERROR:: "%s" resource already exist in this dataset' % (self.dict['name'])
+                         print('WARRING:: "'+ str(self.dict['name']) +'" resource already exist in this dataset')
                      #------------------------------------------------------------#
                      try:
-                         return getattr(self.ckan.action, 'resource_create')(package_id=dataset_id, file_date=file_date, upload=open(file_path, 'rb'), voc_file_type=file_type, name=os.path.basename(file_path), **self.dict)
+                         return getattr(self.ckan.action, 'resource_create')(package_id=dataset_id, file_date=file_date, voc_file_type=file_type, **self.dict)
                      except:
                          _, exc_value, _ = sys.exc_info()
                          return exc_value

script/CKAN_JRO/logic_download.py 0 -2

              DL_CHUNK_SIZE = 100 * 1024
-             print()
              def dump_things_change(ckan, thing, arguments, worker_pool=None, stdout=None, stderr=None, **kwargs):
                  if worker_pool is None:
                      worker_pool = workers.worker_pool

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages