account for metadata loading as None for upload_date, resolves #59
This commit is contained in:
		
							parent
							
								
									f6f4f244d7
								
							
						
					
					
						commit
						d6852bf828
					
				| 
						 | 
					@ -931,7 +931,10 @@ class Media(models.Model):
 | 
				
			||||||
    @property
 | 
					    @property
 | 
				
			||||||
    def loaded_metadata(self):
 | 
					    def loaded_metadata(self):
 | 
				
			||||||
        try:
 | 
					        try:
 | 
				
			||||||
            return json.loads(self.metadata)
 | 
					            data = json.loads(self.metadata)
 | 
				
			||||||
 | 
					            if not isinstance(data, dict):
 | 
				
			||||||
 | 
					                return {}
 | 
				
			||||||
 | 
					            return data
 | 
				
			||||||
        except Exception as e:
 | 
					        except Exception as e:
 | 
				
			||||||
            return {}
 | 
					            return {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -968,7 +971,10 @@ class Media(models.Model):
 | 
				
			||||||
    @property
 | 
					    @property
 | 
				
			||||||
    def upload_date(self):
 | 
					    def upload_date(self):
 | 
				
			||||||
        field = self.get_metadata_field('upload_date')
 | 
					        field = self.get_metadata_field('upload_date')
 | 
				
			||||||
        upload_date_str = self.loaded_metadata.get(field, '').strip()
 | 
					        try:
 | 
				
			||||||
 | 
					            upload_date_str = self.loaded_metadata.get(field, '').strip()
 | 
				
			||||||
 | 
					        except (AttributeError, ValueError) as e:
 | 
				
			||||||
 | 
					            return None
 | 
				
			||||||
        try:
 | 
					        try:
 | 
				
			||||||
            return datetime.strptime(upload_date_str, '%Y%m%d')
 | 
					            return datetime.strptime(upload_date_str, '%Y%m%d')
 | 
				
			||||||
        except (AttributeError, ValueError) as e:
 | 
					        except (AttributeError, ValueError) as e:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue