Merge pull request #47 from anamewing/feature/ExHentaiApi

fix #46, 让 e-hentai 与 ExHentai 分别调用各自的 API
DaidoujiChen · Feb 23, 2016 · ba06f8e · ba06f8e
2 parents bf76950 + aa849c3
commit ba06f8e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/e-Hentai/ExMainViewController/ExMainViewController.m b/e-Hentai/ExMainViewController/ExMainViewController.m
@@ -27,6 +27,10 @@ - (NSString *)filterString {
     return filterString;
 }
 
+- (BOOL) isExHentai {
+    return YES;
+}
+
 #pragma mark - life cycle
 
 - (void)viewDidLoad {

diff --git a/e-Hentai/MainViewController/MainViewController.m b/e-Hentai/MainViewController/MainViewController.m
@@ -17,6 +17,7 @@ @interface MainViewController ()
 @property (nonatomic, strong) UITableView *listTableView;
 @property (nonatomic, strong) UIRefreshControl *refreshControl;
 @property (nonatomic, readonly) NSString *filterString;
+@property (nonatomic, readonly) BOOL isExHentai;
 @property (nonatomic, assign) BOOL onceFlag;
 @property (nonatomic, strong) NSMutableDictionary *textViewCacheMapping;
 
@@ -33,6 +34,10 @@ - (NSString *)filterString {
     return [self filterDependOnURL:@"http://g.e-hentai.org/?page=%lu"];
 }
 
+- (BOOL) isExHentai {
+    return NO;
+}
+
 #pragma mark - SearchFilterV2ViewControllerDelegate
 
 // 搜尋畫面按 done 回來時
@@ -236,7 +241,7 @@ - (void)reloadDatas {
 //把 request 的判斷都放到這個 method 裡面來
 - (void)loadList:(void (^)(BOOL successed, NSArray *listArray))completion {
     [SVProgressHUD show];
-    [HentaiParser requestListAtFilterUrl:self.filterString forExHentai:NO completion: ^(HentaiParserStatus status, NSArray *listArray) {
+    [HentaiParser requestListAtFilterUrl:self.filterString forExHentai:[self isExHentai] completion: ^(HentaiParserStatus status, NSArray *listArray) {
         if (status && [listArray count]) {
             completion(YES, listArray);
         }