Delete code lines of archive function (#141)

Author: sheepzh

src/app/locale/components/data-manage.ts

@@ -18,7 +18,6 @@ export type DataManageMessage = {
     filterTime: string
     filterDate: string
     unlimited: string
-    archiveAlert: string
     dateShortcut: {
         tillYesterday: string
         till7DaysAgo: string
@@ -27,8 +26,6 @@ export type DataManageMessage = {
     paramError: string
     deleteConfirm: string
     deleteSuccess: string
-    archiveConfirm: string
-    archiveSuccess: string
     migrationAlert: string
     importError: string
     migrated: string
@@ -48,7 +45,6 @@ const _default: Messages<DataManageMessage> = {
         filterTime: '当日打开次数在 {start} 次至 {end} 次之间。',
         filterDate: '{picker} 产生的数据。',
         unlimited: '无限',
-        archiveAlert: '归档后的数据不再按天统计，将累加至域名的归档数据中。',
         dateShortcut: {
             tillYesterday: '直到昨天',
             till7DaysAgo: '直到7天前',
@@ -57,8 +53,6 @@ const _default: Messages<DataManageMessage> = {
         paramError: '参数错误，请检查！',
         deleteConfirm: '共筛选出 {count} 条数据，是否全部删除？',
         deleteSuccess: '删除成功',
-        archiveConfirm: '共筛选出 {count} 条数据，是否全部归档？',
-        archiveSuccess: '归档成功',
         migrationAlert: '使用导入/导出在不同浏览器之间迁移数据',
         importError: '文件格式错误',
         migrated: '成功导入',
@@ -76,7 +70,6 @@ const _default: Messages<DataManageMessage> = {
         filterTime: '當日打開次數在 {start} 次至 {end} 次之間。',
         filterDate: '{picker} 産生的數據。',
         unlimited: '無限',
-        archiveAlert: '歸檔後的數據不再按天統計，將累加至域名的歸檔數據中。',
         dateShortcut: {
             tillYesterday: '直到昨天',
             till7DaysAgo: '直到7天前',
@@ -85,8 +78,6 @@ const _default: Messages<DataManageMessage> = {
         paramError: '參數錯誤，請檢查！',
         deleteConfirm: '共篩選出 {count} 條數據，是否全部刪除？',
         deleteSuccess: '刪除成功',
-        archiveConfirm: '共篩選出 {count} 條數據，是否全部歸檔？',
-        archiveSuccess: '歸檔成功',
         migrationAlert: '使用導入/導出在不同瀏覽器之間遷移數據',
         importError: '文件格式錯誤',
         migrated: '成功導入',
@@ -104,7 +95,6 @@ const _default: Messages<DataManageMessage> = {
         filterTime: 'The number of visits for the day is between {start} and {end}',
         filterDate: 'Recorded between {picker}',
         unlimited: '∞',
-        archiveAlert: 'Archived records are cumulative, not daily.',
         dateShortcut: {
             tillYesterday: 'Until yesterday',
             till7DaysAgo: 'Until 7 days ago',
@@ -113,8 +103,6 @@ const _default: Messages<DataManageMessage> = {
         paramError: 'The parameter is wrong, please check!',
         deleteConfirm: 'A total of {count} records have been filtered out. Do you want to delete them all?',
         deleteSuccess: 'Deleted successfully!',
-        archiveConfirm: 'A total of {count} records have been filtered out. Do you want to archive them all?',
-        archiveSuccess: 'Archived successfully!',
         migrationAlert: 'Migrate data between browsers using import and export',
         importError: 'Wrong file extension',
         migrated: 'Imported successfully!',
@@ -132,7 +120,6 @@ const _default: Messages<DataManageMessage> = {
         filterTime: '当日のオープン数は {start} から {end} の間です。',
         filterDate: '{picker} までに生成されたデータ',
         unlimited: '無制限',
-        archiveAlert: 'アーカイブされたデータは毎日カウントされなくなり、ドメイン名のアーカイブされたデータに追加されます。',
         dateShortcut: {
             tillYesterday: '昨日まで',
             till7DaysAgo: '7日前まで',
@@ -141,8 +128,6 @@ const _default: Messages<DataManageMessage> = {
         paramError: 'パラメータエラー、確認してください！',
         deleteConfirm: '合計 {count} 個のデータが除外されました。すべて削除しますか？',
         deleteSuccess: '正常に削除されました',
-        archiveConfirm: '合計 {count} 個のデータが除外されました。それらはすべてアーカイブされていますか？',
-        archiveSuccess: '正常にアーカイブされました',
         migrationAlert: 'インポート/エクスポートを使用して、異なるブラウザ間でデータを移行します',
         importError: 'ファイル形式エラー',
         migrated: '正常にインポートされました',

src/background/version-manager/1-3-0/archived-data-cleaner.ts

@@ -8,7 +8,6 @@
 import IVersionProcessor from "./i-version-processor"
 import HostMergeInitializer from "./0-1-2/host-merge-initializer"
 import LocalFileInitializer from "./0-7-0/local-file-initializer"
-import ArchivedDataCleaner from "./1-3-0/archived-data-cleaner"
 
 /**
  * Version manager
@@ -22,7 +21,6 @@ class VersionManager {
         this.processorChain.push(
             new HostMergeInitializer(),
             new LocalFileInitializer(),
-            new ArchivedDataCleaner(),
         )
         this.processorChain = this.processorChain.sort((a, b) => a.since() >= b.since() ? 1 : 0)
     }

src/background/version-manager/index.ts

@@ -5,13 +5,6 @@
  * https://opensource.org/licenses/MIT
  */
 
-/**
- * The prefix of archived data
- * 
- * @since 0.0.9
- */
-export const ARCHIVED_PREFIX = '_a_'
-
 /**
  * Prefix of remain words
  * 

src/database/archived-database.ts

@@ -8,7 +8,7 @@
 import { log } from "../common/logger"
 import { formatTime } from "@util/time"
 import BaseDatabase from "./common/base-database"
-import { ARCHIVED_PREFIX, DATE_FORMAT, REMAIN_WORD_PREFIX } from "./common/constant"
+import { DATE_FORMAT, REMAIN_WORD_PREFIX } from "./common/constant"
 import { createZeroResult, mergeResult, isNotZeroResult } from "@util/stat"
 
 export type TimerCondition = {
@@ -131,7 +131,12 @@ class TimerDatabase extends BaseDatabase {
         const result = await this.storage.get(null)
         const items = {}
         Object.entries(result)
-            .filter(([key]) => !key.startsWith(REMAIN_WORD_PREFIX) && !key.startsWith(ARCHIVED_PREFIX))
+            .filter(([key]) =>
+                !key.startsWith(REMAIN_WORD_PREFIX)
+                // The prefix of archived data, historical issues
+                // todo: delete this line
+                && !key.startsWith('_a_')
+            )
             .forEach(([key, value]) => items[key] = value)
         return Promise.resolve(items)
     }

src/database/common/constant.ts

@@ -6,7 +6,6 @@
  */
 
 import TimerDatabase, { TimerCondition } from "@db/timer-database"
-import ArchivedDatabase from "@db/archived-database"
 import { log } from "../common/logger"
 import CustomizedHostMergeRuler from "./components/host-merge-ruler"
 import MergeRuleDatabase from "@db/merge-rule-database"
@@ -22,7 +21,6 @@ import { getBirthday } from "@util/time"
 const storage = chrome.storage.local
 
 const timerDatabase = new TimerDatabase(storage)
-const archivedDatabase = new ArchivedDatabase(storage)
 const iconUrlDatabase = new IconUrlDatabase(storage)
 const hostAliasDatabase = new HostAliasDatabase(storage)
 const mergeRuleDatabase = new MergeRuleDatabase(storage)
@@ -126,18 +124,6 @@ class TimerService {
         return { origin, merged }
     }
 
-    /**
-     * Archive the data and delete all of them
-     * 
-     * @param rows rows
-     * @since 0.0.9
-     * @deprecated 1.2.0
-     */
-    async archive(rows: timer.stat.Row[]): Promise<void> {
-        await archivedDatabase.updateArchived(rows)
-        return timerDatabase.delete(rows)
-    }
-
     /**
      * Count the items
      * 

src/database/timer-database.ts

@@ -22,7 +22,6 @@ export type ItemMessage = {
         delete: string
         add2Whitelist: string
         removeFromWhitelist: string
-        archive: string
         deleteConfirmMsgAll: string
         deleteConfirmMsgRange: string
         deleteConfirmMsg: string
@@ -45,7 +44,6 @@ const _default: Messages<ItemMessage> = {
             delete: '删除',
             add2Whitelist: '白名单',
             removeFromWhitelist: '启用',
-            archive: '归档',
             jumpToTrend: '趋势',
             deleteConfirmMsgAll: '{url} 的所有访问记录将被删除',
             deleteConfirmMsgRange: '{url} 在 {start} 到 {end} 的访问记录将被删除',
@@ -66,7 +64,6 @@ const _default: Messages<ItemMessage> = {
             delete: '刪除',
             add2Whitelist: '白名單',
             removeFromWhitelist: '啟用',
-            archive: '歸檔',
             jumpToTrend: '趨勢',
             deleteConfirmMsgAll: '{url} 的所有拜訪記錄將被刪除',
             deleteConfirmMsgRange: '{url} 在 {start} 到 {end} 的拜訪記錄將被刪除',
@@ -87,7 +84,6 @@ const _default: Messages<ItemMessage> = {
             delete: 'Delete',
             add2Whitelist: 'Whitelist',
             removeFromWhitelist: 'Enable',
-            archive: 'Archive',
             jumpToTrend: 'Trend',
             deleteConfirmMsgAll: 'All records of {url} will be deleted!',
             deleteConfirmMsgRange: 'All records of {url} between {start} and {end} will be deleted!',
@@ -108,7 +104,6 @@ const _default: Messages<ItemMessage> = {
             delete: '削除',
             add2Whitelist: 'ホワイトリスト',
             removeFromWhitelist: '有効にする',
-            archive: 'アーカイブ',
             jumpToTrend: '傾向',
             deleteConfirmMsgAll: '{url} のすべての拜訪記録が削除されます',
             deleteConfirmMsgRange: '{url} {start} から {end} までの拜訪記録は削除されます',