Compare commits

..

No commits in common. "65fc082b1b70a73822cfc2fd984417f56a94ff08" and "4dbb5e3c51b14465552403cab39fbbefe545cffb" have entirely different histories.

2 changed files with 2 additions and 7 deletions

View file

@ -181,11 +181,6 @@ class File(models.Model):
for type in ox.movie.EXTENSIONS: for type in ox.movie.EXTENSIONS:
if data['extension'] in ox.movie.EXTENSIONS[type]: if data['extension'] in ox.movie.EXTENSIONS[type]:
data['type'] = type data['type'] = type
if data['type'] == 'unknown':
if self.info.get('video'):
data['type'] = 'video'
elif self.info.get('audio'):
data['type'] = 'audio'
if 'part' in data and isinstance(data['part'], int): if 'part' in data and isinstance(data['part'], int):
data['part'] = str(data['part']) data['part'] = str(data['part'])
return data return data

View file

@ -1111,8 +1111,8 @@ pandora.escapeQueryValue = function(value) {
value = value.toString(); value = value.toString();
} }
return value return value
.replace(/%/g, '%25') .replace(/%/, '%25')
.replace(/&/g, '%26') .replace(/&/, '%26')
.replace(/_/g, '%09') .replace(/_/g, '%09')
.replace(/\s/g, '_') .replace(/\s/g, '_')
.replace(/</g, '%0E') .replace(/</g, '%0E')