Some cleanups

Remove old commented out code from manual mysql solution

lib/redpage.py

@@ -30,8 +30,7 @@ import mwparserfromhell as mwparser
 
 import jogobot  # noqa
 
-#~ from lib.mysqlred import Column, Integer, String, Text, DateTime, ForeignKey, ColumnList, Status
-from lib.mysqlred import MysqlRedPage, relationship, MutableSet #MysqlRedFam, Base, composite,
+from lib.mysqlred import MysqlRedPage, relationship
 from lib.redfam import RedFam, RedFamParser
 from sqlalchemy.orm.collections import attribute_mapped_collection
 
@@ -60,7 +59,6 @@ class RedPage( MysqlRedPage ):
         # Safe the pywikibot page object
         if page:
             self._page = page
-            pageid = self._page.pageid
 
         super().__init__(
             pageid=pageid,
@@ -69,48 +67,15 @@ class RedPage( MysqlRedPage ):
             status=MutableSet() ) #TODO EMPTY MutableSet() necessary?
         #~ self._status = set()
 
-        if archive:
-            self.status.add("archived")
-
-        #~ self._archive = archive
-
-        #~ self.pageid = pageid
-        #~ self.revid = self.page._revid
-        #~ self.p
-        #~ self.status = MutableSet()
-
-#        self.__handle_db( )
-        #~ self.is_page_changed()
-
-        #~ self._parsed = None
+        self.is_archive()
 
         self.session.add(self)
 
-    #~ def __handle_db( self ):
-        #~ """
-        #~ Handles opening of db connection
-        #~ """
-
-        #~ # We need a connection to our mysqldb
-        #~ if self.page:
-            #~ self.__mysql = MysqlRedPage( self.page._pageid )
-            #~ self.pageid = self.page._pageid
-        #~ elif self.pageid:
-            #~ self.__mysql = MysqlRedPage( self.pageid )
-            #~ self.page = pywikibot.Page( pywikibot.Site(),
-                                        #~ self.pagetitle )
-            #~ self.page.exists()
-        #~ else:
-            #~ raise ValueError( "Page NOR pagid provided!" )
-
-        #~ if not self.__mysql.data:
-            #~ self.__mysql.add_page( self.page.title(), self.page._revid )
-
     def update( self, page ):
-
         self._page = page
         self.revid = page._revid
         self.pagetitle = page.title()
+        self.is_archive()
 
     @property
     def page(self):
@@ -123,24 +88,10 @@ class RedPage( MysqlRedPage ):
     def archive(self):
         return self.has_status("archived")
 
-    def is_page_changed( self ):
-        """
-        Check wether the page was changed since last run
-        """
-        self._changed = self.changedp()
-        #~ if( self.__mysql.data != { 'pageid': self.page._pageid,
-                                   #~ 'revid': self.page._revid,
-                                   #~ 'pagetitle': self.page.title(),
-                                   #~ 'status': self.__mysql.data[ 'status' ] } ):
-            #~ self._changed = True
-        #~ else:
-            #~ self._changed = False
-
     def is_archive( self ):
         """
         Detects wether current page is an archive of discussions
         """
-
         if( self.archive or ( u"/Archiv" in self.page.title() ) or
             ( "{{Archiv}}" in self.page.text ) or
             ( "{{Archiv|" in self.page.text ) ):
@@ -153,10 +104,7 @@ class RedPage( MysqlRedPage ):
         """
         Decides wether current RedPage needs to be parsed or not
         """
-        if( self.changedp() or not self.has_status("parsed") ):
-            return True
-        else:
-            return False
+        return self.changedp() or not self.has_status("parsed")
 
     def parse( self ):
         """
@@ -183,24 +131,6 @@ class RedPage( MysqlRedPage ):
         else:
             self.status.add("parsed")
             self._parsed = True
-            #~ self.__update_db()
-
-    #~ def __update_db( self ):
-        #~ """
-        #~ Updates the page meta data in mysql db
-        #~ """
-        #~ if( self._parsed or not self._changed ):
-            #~ self.add_status( "open" )
-
-            #~ if( self.is_archive() ):
-                #~ self.remove_status( "open" )
-                #~ self.add_status( "archived" )
-        #~ else:
-            #~ pass
-            #~ self._status = set()
-
-        #~ self.__mysql.update_page( self.page._revid, self.page.title(),
-                                  #~ self._raw_status() )
 
     @classmethod
     def flush_db_cache( cls ):
@@ -208,7 +138,6 @@ class RedPage( MysqlRedPage ):
         Calls flush method of Mysql Interface class
         """
         cls.session.commit()
-        #~ MysqlRedPage.flush()
 
     def add_status(self, status):
         """
@@ -246,21 +175,3 @@ class RedPage( MysqlRedPage ):
             return True
         else:
             return False
-
-    #~ def _parse_status(self, raw_status ):
-        #~ """
-        #~ Sets status based on comma separated list
-
-        #~ @param  raw_status  Commaseparated string of stati (from DB)
-        #~ @type  raw_status  str
-        #~ """
-        #~ self._status = set( raw_status.strip().split(","))
-
-    #~ def _raw_status( self ):
-        #~ """
-        #~ Returns status as commaseparated string (to save in DB)
-
-        #~ @returns  Raw status string
-        #~ @rtype  str
-        #~ """
-        #~ return ",".join( self._status )