Update py

pyramid/src/main/python/app.py

@@ -69,8 +69,8 @@ def playerContent(ru, flag, id, vipFlags):
     return formatJo
 
 
-def searchContent(ru, key, quick):
-    result = ru.searchContent(key, quick)
+def searchContent(ru, key, quick, pg):
+    result = ru.searchContent(key, quick, pg)
     formatJo = json.dumps(result, ensure_ascii=False)
     return formatJo
 

pyramid/src/main/python/base/spider.py

@@ -37,7 +37,7 @@ class Spider(metaclass=ABCMeta):
         pass
 
     @abstractmethod
-    def searchContent(self, key, quick):
+    def searchContent(self, key, quick, pg):
         pass
 
     @abstractmethod
@@ -63,9 +63,6 @@ class Spider(metaclass=ABCMeta):
     def getDependence(self):
         return []
 
-    def setExtendInfo(self, extend):
-        self.extend = extend
-
     def regStr(self, src, reg, group=1):
         m = re.search(reg, src)
         src = ''
@@ -105,5 +102,5 @@ class Spider(metaclass=ABCMeta):
         else:
             return ele[0]
 
-    def loadModule(self, name, fileName):
-        return SourceFileLoader(name, fileName).load_module()
+    def loadModule(self, name, path):
+        return SourceFileLoader(name, path).load_module()

pyramid/src/main/python/runner.py

@@ -23,8 +23,8 @@ class Runner():
     def detailContent(self, ids):
         return self.spider.detailContent(ids)
 
-    def searchContent(self, key, quick):
-        return self.spider.searchContent(key, quick)
+    def searchContent(self, key, quick, pg):
+        return self.spider.searchContent(key, quick, pg)
 
     def playerContent(self, flag, id, vipFlags):
         return self.spider.playerContent(flag, id, vipFlags)

pyramid/src/main/python/trigger.py

@@ -20,8 +20,8 @@ class Trigger():
         return sp_obj.detailContent(ids)
 
     @staticmethod
-    def searchContent(sp_obj, key, quick):
-        return sp_obj.searchContent(key, quick)
+    def searchContent(sp_obj, key, quick, pg):
+        return sp_obj.searchContent(key, quick, pg)
 
     @staticmethod
     def playerContent(sp_obj, flag, id, vipFlags):