linkarchivetools 0.1.14__py3-none-any.whl → 0.1.16__py3-none-any.whl

linkarchivetools/dbfilter.py

@@ -13,6 +13,7 @@ import argparse
 
 from sqlalchemy import create_engine
 from .utils.reflected import *
+from .tableconfig import get_tables
 
 
 class DbFilter(object):
@@ -53,7 +54,12 @@ class DbFilter(object):
             self.connection = None
 
     def truncate(self):
-        table = ReflectedEntryTable(self.engine, self.connection)
+        """
+        TODO remove these hardcoded tables
+        with something from table_config
+        though it seems it should not clear linkdatamodel
+        """
+        table = ReflectedTable(self.engine, self.connection)
 
         table.truncate_table("userentrytransitionhistory")
         table.truncate_table("userentryvisithistory")
@@ -78,7 +84,7 @@ class DbFilter(object):
         table.truncate_table("blockentrylist")
 
     def filter(self, conditions):
-        table = ReflectedEntryTable(self.engine, self.connection)
+        table = ReflectedTable(self.engine, self.connection)
 
         sql_text = f"DELETE FROM linkdatamodel WHERE {conditions};"
         # TODO delete depnded things
@@ -87,7 +93,7 @@ class DbFilter(object):
         table.close()
 
     def filter_bookmarks(self):
-        table = ReflectedEntryTable(self.engine, self.connection)
+        table = ReflectedTable(self.engine, self.connection)
 
         sql_text = f"DELETE FROM linkdatamodel WHERE bookmarked=False;"
         # TODO delete depnded things
@@ -96,7 +102,7 @@ class DbFilter(object):
         table.close()
 
     def filter_votes(self):
-        table = ReflectedEntryTable(self.engine, self.connection)
+        table = ReflectedTable(self.engine, self.connection)
 
         sql_text = f"DELETE FROM linkdatamodel WHERE page_rating_votes=0;"
         table.run_sql(sql_text)
@@ -107,7 +113,7 @@ class DbFilter(object):
         """
         Not bookmarked AND without votes are redundant
         """
-        table = ReflectedEntryTable(self.engine, self.connection)
+        table = ReflectedTable(self.engine, self.connection)
 
         sql_text = f"DELETE FROM linkdatamodel WHERE bookmarked=False AND page_rating_votes=0;"
         table.run_sql(sql_text)

linkarchivetools/utils/reflected.py

@@ -106,6 +106,8 @@ class ReflectedGenericTable(object):
         self.engine = engine
         self.connection = connection
         self.table_name = table_name
+        self.table = None
+
         if self.table_name is None:
             self.table_name = self.get_table_name()
 
@@ -113,11 +115,14 @@ class ReflectedGenericTable(object):
         return self.table_name
 
     def get_table(self):
+        if self.table is not None:
+            return self.table
+
         destination_metadata = MetaData()
-        destination_table = Table(
+        self.table = Table(
             self.table_name, destination_metadata, autoload_with=self.engine
         )
-        return destination_table
+        return self.table
 
     def truncate(self):
         sql_text = f"DELETE FROM {self.table_name};"

{linkarchivetools-0.1.14.dist-info → linkarchivetools-0.1.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: linkarchivetools
-Version: 0.1.14
+Version: 0.1.16
 Summary: Link Archive Tools
 License: GPL3
 Author: Iwan Grozny

{linkarchivetools-0.1.14.dist-info → linkarchivetools-0.1.16.dist-info}/RECORD

@@ -5,14 +5,14 @@ linkarchivetools/backup.py,sha256=xUDpC0YZou0y2X1aa-Js8pS_3TnC_NmVfKSrVihQd8A,24
 linkarchivetools/db2feeds.py,sha256=P5ZvvyLoEEOPPU_a50VlWw9FNMw8MyFg1TBR_ftdgQ4,8871
 linkarchivetools/db2json.py,sha256=gCuCVqn4n40i1-6-k_Hb809bq2q8VgfIEHrFWp6nBT8,5666
 linkarchivetools/dbanalyzer.py,sha256=BD59Ieg7Xv9pMgLZzWlN--8uReEYovfJ2XMbTsV5-Jg,10125
-linkarchivetools/dbfilter.py,sha256=yE3FK80dRs7c5mzrvZG4NHh24UhvysbAiZkrVIKU2bI,4520
+linkarchivetools/dbfilter.py,sha256=n_yzMRt-exS3jkyiWcpUSy7B37RkzXEyUTH7-DWdUD0,4697
 linkarchivetools/dbmerge.py,sha256=dEkvnYfiRDV3Od8qVQJWP_qJ7SKOYqKCndeX2HAJKFE,2510
 linkarchivetools/json2db.py,sha256=IF01_KhMmHcdm4jfagU_kuJGCEtRwgwjZDuxLtlT7EQ,7607
 linkarchivetools/tableconfig.py,sha256=TsYYl2kbAkP035XElHUmeJqH5Kugl7bwi4ClIwJ6MSA,1731
 linkarchivetools/utils/alchemysearch.py,sha256=voUDEBP4RShlGj8E0iHg83jP8JYJQKLOaJjCZNi4LMY,5689
 linkarchivetools/utils/omnisearch.py,sha256=7HVzz8LesS3Yo6exdlPf4WdPbi2DQekPR2CmkJcfBbI,10115
-linkarchivetools/utils/reflected.py,sha256=2UcNfzzdh7Gbjxmr5KOMgrXO7nVhDJv02bmrAUOHNv8,15661
-linkarchivetools-0.1.14.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-linkarchivetools-0.1.14.dist-info/METADATA,sha256=iNhQRkA5Eagm2JvQ94owsNtDTZtaNyzd3NQ3GWCSgy4,1203
-linkarchivetools-0.1.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-linkarchivetools-0.1.14.dist-info/RECORD,,
+linkarchivetools/utils/reflected.py,sha256=bK4hgNmVUUer4BKTQbq732bXSgBJrHlzg11Wa1v0iYI,15740
+linkarchivetools-0.1.16.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+linkarchivetools-0.1.16.dist-info/METADATA,sha256=WZ9TeZVvbu2lRr1fWSDZAq001p1MRyilS3g4vuVNXz0,1203
+linkarchivetools-0.1.16.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+linkarchivetools-0.1.16.dist-info/RECORD,,