Model error fixed

Author: digitaldreams

Crawler/Image.py

@@ -1,14 +1,14 @@
 import urllib.parse
 from Crawler.ImgFinder import ImgFinder
 import Models.Queue.Image
+import Models.Queue.Link
 
 
 class Image:
     def __init__(self, page_url):
 
-        image = Models.Queue.Image.Image
-        image.fetch()
-        self.image = image
+        self.image = Models.Queue.Image.Image()
+        self.link = Models.Queue.Link.Link()
 
         self.page_url = page_url
         urlres = urllib.parse.urlparse(page_url)
@@ -46,6 +46,8 @@ def save(self):
     def save_links(self):
         self.fetch_links()
         self.save()
+        self.update_link()
 
-
-
+    def update_link(self):
+        self.link.remove(self.page_url)
+        self.link.save()

Crawler/Page.py

@@ -8,11 +8,7 @@
 
 class Page:
     def __init__(self, page_url):
-
-        link = Models.Queue.Link.Link
-        link.fetch()
-        self.link = link
-
+        self.link = Models.Queue.Link.Link()
         self.page_url = page_url
         self.link.add(page_url)
         urlres = urllib.parse.urlparse(page_url)

Crawler/__pycache__/Image.cpython-36.pyc

@@ -5,4 +5,6 @@ class Image(Model):
     file_path = 'storage/complete/images.txt'
 
     def __init__(self):
-        pass
+        self.links.clear()
+        self.fetch()
+        Model.__init__(self)

Crawler/__pycache__/Page.cpython-36.pyc

@@ -5,5 +5,7 @@ class Link(Model):
     file_path = 'storage/complete/links.txt'
 
     def __init__(self):
-        pass
+        self.links.clear()
+        self.fetch()
+        Model.__init__(self)
 

Models/Complete/Image.py

@@ -4,54 +4,50 @@
 
 
 class Model:
-    links = set()
     file_path = ''
 
-    @classmethod
-    def fetch(cls):
+    def __init__(self):
+        self.links = set()
+
+    def fetch(self):
         """
             Load links from file and set to Set()
             :return: object
         """
-        cls.init_dir()
-        with open(cls.file_path, 'r') as f:
+        self.init_dir()
+        with open(self.file_path, 'r') as f:
             for line in f:
-                cls.links.add(line.replace('\n', ''))
-        return cls.links
+                self.links.add(line.replace('\n', ''))
+        return self.links
 
-    @classmethod
-    def save(cls):
+    def save(self):
         """
 
         :type links: object
         """
-        with open(cls.file_path, 'w') as f:
-            for line in sorted(cls.links):
+        with open(self.file_path, 'w') as f:
+            for line in sorted(self.links):
                 f.write(line + "\n")
         return True
 
-    @classmethod
-    def has(cls, link):
-        if not link in cls.links:
+    def has(self, link):
+        if not link in self.links:
             return False
         else:
             return True
 
-    @classmethod
-    def add(cls, link):
-        cls.links.add(link)
-        return cls
+    def add(self, link):
+        self.links.add(link)
+        return self
 
-    @classmethod
-    def remove(cls, link):
-        cls.links.discard(link)
-        return cls
+    def remove(self, link):
+        self.links.discard(link)
+        return self
 
-    @classmethod
-    def init_dir(cls):
-        dir_name = os.path.dirname(cls.file_path)
+    def init_dir(self):
+        dir_name = os.path.dirname(self.file_path)
         if not os.path.exists(dir_name):
             os.makedirs(dir_name)
-        if not os.path.isfile(cls.file_path):
-            with open(cls.file_path, 'w') as f:
+        if not os.path.isfile(self.file_path):
+            with open(self.file_path, 'w') as f:
                 f.write('')

Models/Complete/Link.py

@@ -5,5 +5,7 @@ class Image(Model):
     file_path = 'storage/queue/images.txt'
 
     def __init__(self):
-        pass
+        Model.__init__(self)
+        self.fetch()
+
 

Models/Complete/__pycache__/Image.cpython-36.pyc

@@ -5,4 +5,5 @@ class Link(Model):
     file_path = 'storage/queue/links.txt'
 
     def __init__(self):
-        pass
+        Model.__init__(self)
+        self.fetch()