Use metadata instead of filename

pyiricdata/Client.py

@@ -13,7 +13,7 @@ from collections import namedtuple
 from .tools import is_json
 
 
-IDF = namedtuple('IricDataFile', ['name', 'data', 'metadata'])
+IDF = namedtuple('IricDataFile', ['metadata', 'data', 'annotations'])
 
 
 class Client:
@@ -174,25 +174,6 @@ class Client:
     def get_dataset_filelist(self, dataset_id):
         sys.stderr.write("DEPRECATED: Please use " +
                          "get_list_datafiles(dataset_id=dataset_id)\n")
-
-#        df = pd.DataFrame(columns=['file_id', 'file_name', 'file_hash', 'file_slug'])
-#        if dataset_id not in self.datasets.index:
-#            sys.stderr.write(
-#                "ERROR: Dataset '{}' does not exist or you do not have permission to access it.".format(dataset_id) +\
-#                " Try Client.datasets for more details.\n")
-#            return df
-#        files = self.session.get(os.path.join(self.url, 'secure/dataset', dataset_id, 'file-list')).text.split('\n')
-#        file_id_list = np.unique([x.split('/')[-1] for x in files])
-#        df.file_id = file_id_list
-#        if files != ['']:
-#            for index, row in df.iterrows():
-#                file_meta = self.get_file_metadata(row['file_id'])
-#                assert not file_meta is None
-#                row['file_name'] = file_meta['filename']
-#                row['file_slug'] = file_meta['iric_data_id']
-#                row['file_hash'] = file_meta['hash']
-#        df.index = df.file_slug.copy()
-#        df.index.name = 'ID'
         return(self.get_list_datafiles(dataset_id=dataset_id))
 
     """ Get DatasetId by name"""
@@ -205,13 +186,12 @@ class Client:
 
     """ Get file content according to file_id """
     def get_file(self, file_id):
-        file_object = self.get_file_metadata(file_id)
         path = os.path.join(self.url, 'secure/datafiles/download', str(file_id))
         try:
-            file_name = file_object['filename']
+            file_metadata = self.get_file_metadata(file_id)
             file_content = self.session.get(path, allow_redirects=True).content
             file_annotation = self.get_file_metadata(file_id)
-            return IDF(file_name, file_content, file_annotation)
+            return IDF(file_metadata, file_content, file_annotation)
         except TypeError:
             return IDF(None, None, None)
 
@@ -224,7 +204,7 @@ class Client:
             else:
                 folder_out = os.path.join(os.getcwd(), folder_out)
             os.makedirs(folder_out, exist_ok=True)
-            filename = idf.name if not filename else filename
+            filename = idf.metadata['filename'] if not filename else filename
             out_file_path = os.path.join(folder_out, filename)
             if os.path.exists(out_file_path):
                 sys.stderr.write('Warning: File already exists at location %s, skipping.\n' % out_file_path)