@ -1,5 +1,5 @@
//
// C o p y r i g h t ( c ) 2 0 1 7 O p e n W h i s p e r S y s t e m s . A l l r i g h t s r e s e r v e d .
// C o p y r i g h t ( c ) 2 0 1 8 O p e n W h i s p e r S y s t e m s . A l l r i g h t s r e s e r v e d .
//
import Foundation
@ -17,9 +17,9 @@ extension GiphyError: LocalizedError {
public var errorDescription : String ? {
switch self {
case . assertionError :
return NSLocalizedString ( " GIF_PICKER_ERROR_GENERIC " , comment : " Generic error displayed when picking a gif " )
return NSLocalizedString ( " GIF_PICKER_ERROR_GENERIC " , comment : " Generic error displayed when picking a GIF " )
case . fetchFailure :
return NSLocalizedString ( " GIF_PICKER_ERROR_FETCH_FAILURE " , comment : " Error displayed when there is a failure fetching gifs from the remote service." )
return NSLocalizedString ( " GIF_PICKER_ERROR_FETCH_FAILURE " , comment : " Error displayed when there is a failure fetching a GIF from the remote service." )
}
}
}
@ -122,33 +122,33 @@ extension GiphyError: LocalizedError {
public func pickStillRendition ( ) -> GiphyRendition ? {
// S t i l l s a r e j u s t t e m p o r a r y p l a c e h o l d e r s , s o u s e t h e s m a l l e s t s t i l l p o s s i b l e .
return pickRendition ( renditionType : . stillPreview , pickingStrategy : . smallerIsBetter , maxFileSize : kPreferedPreviewFileSize )
return pickRendition ( renditionType : . stillPreview , pickingStrategy : . smallerIsBetter , maxFileSize : kPreferedPreviewFileSize )
}
public func pickPreviewRendition ( ) -> GiphyRendition ? {
// T r y t o p i c k a s m a l l f i l e . . .
if let rendition = pickRendition ( renditionType : . animatedLowQuality , pickingStrategy : . largerIsBetter , maxFileSize : kPreferedPreviewFileSize ) {
if let rendition = pickRendition ( renditionType : . animatedLowQuality , pickingStrategy : . largerIsBetter , maxFileSize : kPreferedPreviewFileSize ) {
return rendition
}
// . . . b u t g r a d u a l l y r e l a x t h e f i l e r e s t r i c t i o n . . .
if let rendition = pickRendition ( renditionType : . animatedLowQuality , pickingStrategy : . smallerIsBetter , maxFileSize : kPreferedPreviewFileSize * 2 ) {
if let rendition = pickRendition ( renditionType : . animatedLowQuality , pickingStrategy : . smallerIsBetter , maxFileSize : kPreferedPreviewFileSize * 2 ) {
return rendition
}
// . . . a n d r e l a x e v e n m o r e u n t i l w e f i n d a n a n i m a t e d r e n d i t i o n .
return pickRendition ( renditionType : . animatedLowQuality , pickingStrategy : . smallerIsBetter , maxFileSize : kPreferedPreviewFileSize * 3 )
return pickRendition ( renditionType : . animatedLowQuality , pickingStrategy : . smallerIsBetter , maxFileSize : kPreferedPreviewFileSize * 3 )
}
public func pickSendingRendition ( ) -> GiphyRendition ? {
// T r y t o p i c k a s m a l l f i l e . . .
if let rendition = pickRendition ( renditionType : . animatedHighQuality , pickingStrategy : . largerIsBetter , maxFileSize : kPreferedSendingFileSize ) {
if let rendition = pickRendition ( renditionType : . animatedHighQuality , pickingStrategy : . largerIsBetter , maxFileSize : kPreferedSendingFileSize ) {
return rendition
}
// . . . b u t g r a d u a l l y r e l a x t h e f i l e r e s t r i c t i o n . . .
if let rendition = pickRendition ( renditionType : . animatedHighQuality , pickingStrategy : . smallerIsBetter , maxFileSize : kPreferedSendingFileSize * 2 ) {
if let rendition = pickRendition ( renditionType : . animatedHighQuality , pickingStrategy : . smallerIsBetter , maxFileSize : kPreferedSendingFileSize * 2 ) {
return rendition
}
// . . . a n d r e l a x e v e n m o r e u n t i l w e f i n d a n a n i m a t e d r e n d i t i o n .
return pickRendition ( renditionType : . animatedHighQuality , pickingStrategy : . smallerIsBetter , maxFileSize : kPreferedSendingFileSize * 3 )
return pickRendition ( renditionType : . animatedHighQuality , pickingStrategy : . smallerIsBetter , maxFileSize : kPreferedSendingFileSize * 3 )
}
enum RenditionType {
@ -299,12 +299,12 @@ extension GiphyError: LocalizedError {
}
private func giphyAPISessionManager ( ) -> AFHTTPSessionManager ? {
guard let baseUrl = NSURL ( string : kGiphyBaseURL ) else {
guard let baseUrl = NSURL ( string : kGiphyBaseURL ) else {
Logger . error ( " \( TAG ) Invalid base URL. " )
return nil
}
let sessionManager = AFHTTPSessionManager ( baseURL : baseUrl as URL ,
sessionConfiguration : GiphyAPI . giphySessionConfiguration ( ) )
let sessionManager = AFHTTPSessionManager ( baseURL : baseUrl as URL ,
sessionConfiguration : GiphyAPI . giphySessionConfiguration ( ) )
sessionManager . requestSerializer = AFJSONRequestSerializer ( )
sessionManager . responseSerializer = AFJSONResponseSerializer ( )
@ -319,7 +319,7 @@ extension GiphyError: LocalizedError {
failure ( nil )
return
}
guard NSURL ( string : kGiphyBaseURL ) != nil else {
guard NSURL ( string : kGiphyBaseURL ) != nil else {
Logger . error ( " \( TAG ) Invalid base URL. " )
failure ( nil )
return
@ -338,10 +338,10 @@ extension GiphyError: LocalizedError {
sessionManager . get ( urlString ,
parameters : { } ,
progress : nil ,
progress : nil ,
success : { _ , value in
Logger . error ( " \( GiphyAPI . TAG ) search request succeeded " )
guard let imageInfos = self . parseGiphyImages ( responseJson : value ) else {
guard let imageInfos = self . parseGiphyImages ( responseJson : value ) else {
failure ( nil )
return
}
@ -355,16 +355,16 @@ extension GiphyError: LocalizedError {
// MARK: P a r s e A P I R e s p o n s e s
private func parseGiphyImages ( responseJson : Any ? ) -> [ GiphyImageInfo ] ? {
private func parseGiphyImages ( responseJson : Any ? ) -> [ GiphyImageInfo ] ? {
guard let responseJson = responseJson else {
Logger . error ( " \( TAG ) Missing response. " )
return nil
}
guard let responseDict = responseJson as ? [ String : Any ] else {
guard let responseDict = responseJson as ? [ String : Any ] else {
Logger . error ( " \( TAG ) Invalid response. " )
return nil
}
guard let imageDicts = responseDict [ " data " ] as ? [ [ String : Any ] ] else {
guard let imageDicts = responseDict [ " data " ] as ? [ [ String : Any ] ] else {
Logger . error ( " \( TAG ) Invalid response data. " )
return nil
}
@ -374,7 +374,7 @@ extension GiphyError: LocalizedError {
}
// G i p h y A P I r e s u l t s a r e o f t e n i n c o m p l e t e o r m a l f o r m e d , s o w e n e e d t o b e d e f e n s i v e .
private func parseGiphyImage ( imageDict : [ String : Any ] ) -> GiphyImageInfo ? {
private func parseGiphyImage ( imageDict : [ String : Any ] ) -> GiphyImageInfo ? {
guard let giphyId = imageDict [ " id " ] as ? String else {
Logger . warn ( " \( TAG ) Image dict missing id. " )
return nil
@ -383,18 +383,18 @@ extension GiphyError: LocalizedError {
Logger . warn ( " \( TAG ) Image dict has invalid id. " )
return nil
}
guard let renditionDicts = imageDict [ " images " ] as ? [ String : Any ] else {
guard let renditionDicts = imageDict [ " images " ] as ? [ String : Any ] else {
Logger . warn ( " \( TAG ) Image dict missing renditions. " )
return nil
}
var renditions = [ GiphyRendition ] ( )
for ( renditionName , renditionDict ) in renditionDicts {
guard let renditionDict = renditionDict as ? [ String : Any ] else {
guard let renditionDict = renditionDict as ? [ String : Any ] else {
Logger . warn ( " \( TAG ) Invalid rendition dict. " )
continue
}
guard let rendition = parseGiphyRendition ( renditionName : renditionName ,
renditionDict : renditionDict ) else {
guard let rendition = parseGiphyRendition ( renditionName : renditionName ,
renditionDict : renditionDict ) else {
continue
}
renditions . append ( rendition )
@ -404,13 +404,13 @@ extension GiphyError: LocalizedError {
return nil
}
guard let originalRendition = findOriginalRendition ( renditions : renditions ) else {
guard let originalRendition = findOriginalRendition ( renditions : renditions ) else {
Logger . warn ( " \( TAG ) Image has no original rendition. " )
return nil
}
return GiphyImageInfo ( giphyId : giphyId ,
renditions : renditions ,
return GiphyImageInfo ( giphyId : giphyId ,
renditions : renditions ,
originalRendition : originalRendition )
}
@ -425,15 +425,15 @@ extension GiphyError: LocalizedError {
//
// W e s h o u l d d i s c a r d r e n d i t i o n s w h i c h a r e m i s s i n g o r h a v e i n v a l i d p r o p e r t i e s .
private func parseGiphyRendition ( renditionName : String ,
renditionDict : [ String : Any ] ) -> GiphyRendition ? {
guard let width = parsePositiveUInt ( dict : renditionDict , key : " width " , typeName : " rendition " ) else {
renditionDict : [ String : Any ] ) -> GiphyRendition ? {
guard let width = parsePositiveUInt ( dict : renditionDict , key : " width " , typeName : " rendition " ) else {
return nil
}
guard let height = parsePositiveUInt ( dict : renditionDict , key : " height " , typeName : " rendition " ) else {
guard let height = parsePositiveUInt ( dict : renditionDict , key : " height " , typeName : " rendition " ) else {
return nil
}
// B e l e n i e n t w h e n p a r s i n g f i l e s i z e s - w e d o n ' t r e q u i r e t h e m f o r s t i l l s .
let fileSize = parseLenientUInt ( dict : renditionDict , key : " size " )
let fileSize = parseLenientUInt ( dict : renditionDict , key : " size " )
guard let urlString = renditionDict [ " url " ] as ? String else {
return nil
}
@ -441,7 +441,7 @@ extension GiphyError: LocalizedError {
Logger . warn ( " \( TAG ) Rendition has invalid url. " )
return nil
}
guard let url = NSURL ( string : urlString ) else {
guard let url = NSURL ( string : urlString ) else {
Logger . warn ( " \( TAG ) Rendition url could not be parsed. " )
return nil
}
@ -464,16 +464,16 @@ extension GiphyError: LocalizedError {
}
return GiphyRendition (
format : format ,
name : renditionName ,
width : width ,
height : height ,
fileSize : fileSize ,
url : url
format : format ,
name : renditionName ,
width : width ,
height : height ,
fileSize : fileSize ,
url : url
)
}
private func parsePositiveUInt ( dict : [ String : Any ] , key : String , typeName : String ) -> UInt ? {
private func parsePositiveUInt ( dict : [ String : Any ] , key : String , typeName : String ) -> UInt ? {
guard let value = dict [ key ] else {
return nil
}
@ -490,7 +490,7 @@ extension GiphyError: LocalizedError {
return parsedValue
}
private func parseLenientUInt ( dict : [ String : Any ] , key : String ) -> UInt {
private func parseLenientUInt ( dict : [ String : Any ] , key : String ) -> UInt {
let defaultValue = UInt ( 0 )
guard let value = dict [ key ] else {
Michael Kirk
7 years ago