修复sqlite3 ipdata.db.gz导出bug

Author: a76yyyy

IP_Sync/convert.py

@@ -63,7 +63,11 @@ def convert_ip(sql_object, college_tablename, num_config, start_id, correct_list
 
     if result_num == num_config:
         print( "本批次（行：" + str(start_id-1) + " - " + str( next_id - 2 ) + "）已处理完成。共需处理" + str(result_num) + "条，成功转换" + str(i) + "条。\n系统将自动处理下一批IP数据（行：" + str(next_id-1) + " - " + str(next_end_id-1) + "）…… \n---------------处理中, 请稍候---------------" )
-        sql_object.__del__
+        sql_object.__del__()
+        if sqlite3file:
+            sql_object = sqlite3_Database(sqlite3file)
+        else:
+            sql_object = mysql_Database(config['mysql'].ip_database)
         convert_ip(sql_object, college_tablename, num_config, next_id, correct_list, correct_json,sqlite3file=sqlite3file)
     else:
         print( "本批次（行：" + str(start_id-1) + " - " + str( start_id + result_num -2 ) + "）已处理完成。共需处理" + str(result_num) + "条，成功转换" + str(i) + "条。" )

IP_Sync/ip_Sync.py

@@ -268,7 +268,7 @@ def sqldump(sql_file,table_college_info_sql_file,table_iprange_info_sql_file,tab
 def sqlite3dump(sqlite3file):
     print( "将SQLite3数据库压缩为gz文件: \n---------------处理中, 请稍候---------------")
     if default_gz_export:
-        os.system('gzip %s' % ( sqlite3file))
+        os.system('gzip -y %s' % ( sqlite3file))
         print( "SQLite3数据库gz压缩档导出成功! \n")
 
 if __name__ == '__main__':
@@ -313,6 +313,9 @@ def sqlite3dump(sqlite3file):
             convertipv4(sqlite3,sqlite3file=sqlite3file)
         if ipv6update:
             db2SQLite3(sqlite3)
-        sqlite3.__del__
+        try:
+            sqlite3.__del__()
+        except:
+            pass
         if ipv4update or ipv6update:
             sqlite3dump(sqlite3file)