Refactoring the code,

Author: ProblemFactory

.gitignore

@@ -1,4 +1,6 @@
-
-__pycache__/ArtsInfo.cpython-38.pyc
-__pycache__/ocr.cpython-38.pyc
 artifacts.genshinart.json
+ArtScanner/artifacts.dat
+ArtScanner/artifacts.dat.index
+ArtScanner/artifacts.dat.lock
+ArtScanner/artifacts.dat.tmp
+**/__pycache__/**

ArtsInfo.py ArtScanner/ArtsInfo.pyArtsInfo.py renamed to ArtScanner/ArtsInfo.py

@@ -1,7 +1,7 @@
 import json
 import numpy as np   
 from PIL import ImageFont, Image, ImageDraw
-import ArtsInfo
+from .. import ArtsInfo
 
 MainAttrDatabase = json.load(open('ReliquaryLevelExcelConfigData.json'))
 SubAttrDatabase = json.load(open('ReliquaryAffixExcelConfigData.json'))
@@ -41,7 +41,7 @@ def generate_images(texts, font_size_range=(15, 40)):
         result.append(generate_image(text, font_size_range=font_size_range))
     return np.array(result)
 
-fonts = {i:ImageFont.truetype("genshin2.ttf", i) for i in range(10,100)}
+fonts = {i:ImageFont.truetype("genshin.ttf", i) for i in range(10,100)}
 def generate_image(text, font_size_range=(15, 40)):
     pos = np.random.randint(0, 10), np.random.randint(0, 10)
     backcolor = (

ReliquaryAffixExcelConfigData.json …Tools/ReliquaryAffixExcelConfigData.jsonReliquaryAffixExcelConfigData.json renamed to ArtScanner/Tools/ReliquaryAffixExcelConfigData.json ReliquaryAffixExcelConfigData.json renamed to ArtScanner/Tools/ReliquaryAffixExcelConfigData.json

@@ -0,0 +1,124 @@
+import ArtsInfo
+from utils import decodeValue
+import ZODB, ZODB.FileStorage
+import persistent, transaction
+from enum import IntEnum as Enum
+import json
+
+class ArtifactType(Enum):
+    FLOWER = 0
+    PLUME = 1
+    SANDS = 2
+    GOBLET = 3
+    CIRCLET = 4
+    @classmethod
+    def fromString(cls, s):
+        try:
+            return getattr(cls, s.upper())
+        except:
+            return cls(ArtsInfo.TypeNamesGenshinArt.index(s))
+
+class ArtifactStatType(Enum):
+    FIGHT_PROP_CRITICAL = 0
+    FIGHT_PROP_CRITICAL_HURT = 1
+    FIGHT_PROP_ATTACK = 2
+    FIGHT_PROP_ATTACK_PERCENT = 3
+    FIGHT_PROP_ELEMENT_MASTERY = 4
+    FIGHT_PROP_CHARGE_EFFICIENCY = 5
+    FIGHT_PROP_HP = 6
+    FIGHT_PROP_HP_PERCENT = 7
+    FIGHT_PROP_DEFENSE = 8
+    FIGHT_PROP_DEFENSE_PERCENT = 9
+    FIGHT_PROP_PHYSICAL_ADD_HURT = 10
+    FIGHT_PROP_HEAL_ADD = 11
+    FIGHT_PROP_ROCK_ADD_HURT = 12
+    FIGHT_PROP_WIND_ADD_HURT = 13
+    FIGHT_PROP_ICE_ADD_HURT = 14
+    FIGHT_PROP_WATER_ADD_HURT = 15
+    FIGHT_PROP_FIRE_ADD_HURT = 16
+    FIGHT_PROP_ELEC_ADD_HURT = 17
+    FIGHT_PROP_GRASS_ADD_HURT = 18
+    FIGHT_PROP_FIRE_SUB_HURT = 19
+
+class ArtifactStat:
+    def __init__(self, name, value):
+        name = ArtsInfo.AttrName2Ids[name]
+        value = decodeValue(value)
+        if type(value) == float and (name+'_PERCENT') in ArtsInfo.AttrNamesGensinArt:
+            name += '_PERCENT'
+        self.type = getattr(ArtifactStatType, name)
+        self.value = value
+
+class Artifact(persistent.Persistent):
+    def __init__(self, info, image):
+        '''
+            info: dict with keys:
+                'name': str, name of artifact
+                'type': str, type of artifact 
+                'level': str/int, upgraded level of artifact, example: '+0', '0', 1
+                'star': int, rarity, 1-5
+                'main_attr_name': str, name of main stat
+                'main_attr_value': str/int/float, main stat value, example: '38.5%', '4,760', 144
+                'subattr_{i}': str, substat description, i could be 1-4, example: '暴击率+3.5%', '攻击力+130'
+            image: PIL.Image, screenshot of the artifact, will be shrinked to 300x512 to save space
+        '''
+        typeid = ArtsInfo.TypeNames.index(info['type'])
+        setid = [i for i,v in enumerate(ArtsInfo.ArtNames) if info['name'] in v][0]
+        self.name = info['name'] 
+        self.type = ArtifactType(typeid)
+        self.setname = ArtsInfo.SetNamesGenshinArt[setid]
+        self.level = decodeValue(info['level'])
+        self.rarity = info['star']
+        self.stat = ArtifactStat(info['main_attr_name'], info['main_attr_value'])
+        self.substats = [ArtifactStat(*info[tag].split('+')) for tag in sorted(info.keys()) if "subattr_" in tag]
+        self.image = image.resize((300, 512))
+
+class ArtDatabase:
+    def __init__(self, path='artifacts.dat'):
+        self.storage = ZODB.FileStorage.FileStorage(path)
+        self.db = ZODB.DB(self.storage)
+        self.conn = self.db.open()
+        self.root = self.conn.root()
+        if 'size' not in self.root:
+            self.root['size'] = 0
+
+    def add(self, info, art_img):
+        try:
+            self.root[str(self.root['size'])] = Artifact(info, art_img)
+            self.root['size'] += 1
+            transaction.commit()
+            return True
+        except Exception as e:
+            raise
+            return False
+
+    def exportGenshinArtJSON(self, path):
+        result = {"version":"1", "flower":[], "feather":[], "sand":[], "cup":[], "head":[]}
+        for art_id in range(self.root['size']):
+            art = self.root[str(art_id)]
+            result[ArtsInfo.TypeNamesGenshinArt[art.type]].append(
+                {
+                    "setName": art.setname,
+                    "position": ArtsInfo.TypeNamesGenshinArt[art.type],
+                    "detailName": art.name,
+                    "mainTag": {
+                        'name': ArtsInfo.AttrNamesGensinArt[art.stat.type.name], 
+                        'value': art.stat.value
+                        },
+                    "normalTags": [
+                        {
+                            'name': ArtsInfo.AttrNamesGensinArt[stat.type.name], 
+                            'value': stat.value
+                        }
+                        for stat in art.substats
+                    ],
+                    "omit": False,
+                    "id":art_id,
+                    'level': art.level,
+                    'star': art.rarity
+                }
+            )
+        f = open(path, "wb")
+        s = json.dumps(result, ensure_ascii=False)
+        f.write(s.encode('utf-8'))
+        f.close()

ReliquaryLevelExcelConfigData.json …Tools/ReliquaryLevelExcelConfigData.jsonReliquaryLevelExcelConfigData.json renamed to ArtScanner/Tools/ReliquaryLevelExcelConfigData.json ReliquaryLevelExcelConfigData.json renamed to ArtScanner/Tools/ReliquaryLevelExcelConfigData.json

@@ -0,0 +1,156 @@
+
+import time
+import win32gui
+import mouse, math
+from utils import captureWindow
+
+class GameInfo:
+    def __init__(self, hwnd, force_rect=None):
+        self.hwnd = hwnd
+        self.w, self.h = win32gui.GetClientRect(self.hwnd)[2:]
+        self.left, self.top = win32gui.ClientToScreen(self.hwnd, (0,0))
+    
+    def calculateCoordinates(self):
+        self.scale_ratio = min(self.w/2560, self.h/1440)
+
+        self.art_width = 164.39*self.scale_ratio
+        self.art_height = 203.21*self.scale_ratio
+        self.art_expand = 6*self.scale_ratio
+
+        self.art_gap_x = 30.89*self.scale_ratio
+        self.art_gap_y = 30.35*self.scale_ratio
+
+        self.art_info_width = 656*self.scale_ratio
+        self.art_info_height = 1119*self.scale_ratio
+
+        self.left_margin = (199.33 if self.w<2*self.h else 295.33)*self.scale_ratio
+        self.right_margin = (871.33 if self.w<2*self.h else 967.33)*self.scale_ratio
+        self.info_margin = 0 if self.w<2*self.h else 96*self.scale_ratio
+
+        self.art_cols = int(math.floor((self.w-self.left_margin-self.right_margin+self.art_gap_x)/(self.art_width+self.art_gap_x)))
+
+        self.art_shift = ((self.w-self.left_margin-self.right_margin+self.art_gap_x) - self.art_cols*(self.art_width+self.art_gap_x))/2
+
+        self.first_art_x = self.left_margin + self.art_shift
+        self.first_art_y = 161*self.scale_ratio
+
+        self.art_info_top = 160*self.scale_ratio
+        self.art_info_left = self.w-837*self.scale_ratio - self.info_margin
+        # scroll_keypt_x = left_margin + art_shift + 158*scale_ratio
+        # scroll_keypt_y = 1270*scale_ratio+h-1440*scale_ratio
+        self.scroll_fin_keypt_x = self.left_margin + self.art_shift + 10*self.scale_ratio
+        self.scroll_fin_keypt_y = 335*self.scale_ratio
+
+        self.art_rows = int(round((1270*self.scale_ratio+self.h-1440*self.scale_ratio-self.first_art_y+self.art_gap_y)/(self.art_height+self.art_gap_y)))
+        self.incomplete_lastrow = (1270*self.scale_ratio+self.h-1440*self.scale_ratio-self.first_art_y+self.art_gap_y)/(self.art_height+self.art_gap_y)-self.art_rows<0.7
+
+
+
+class ArtScannerLogic:
+    def __init__(self, game_info):
+        self.game_info = game_info
+        self.stopped = False
+    
+    def interrupt(self):
+        self.stopped = True
+
+
+    def waitSwitched(self, art_center_x, art_center_y, min_wait=0.1, max_wait=3):
+        total_wait = 0
+        while True:
+            pix = captureWindow(self.game_info.hwnd, (
+                art_center_x-self.game_info.art_width/2-self.game_info.art_expand, 
+                art_center_y, 
+                art_center_x-self.game_info.art_width/2-self.game_info.art_expand+1.5, 
+                art_center_y+1.5))
+            if sum(pix.getpixel((0,0)))/3>200:
+                return True
+            else:
+                time.sleep(min_wait)
+                total_wait += min_wait
+            if total_wait>max_wait:
+                return False
+
+    def getArtCenter(self, row, col):
+        art_center_x = self.game_info.first_art_x+(self.game_info.art_width+self.game_info.art_gap_x)*col+self.game_info.art_width/2
+        art_center_y = self.game_info.first_art_y +(self.game_info.art_height+self.game_info.art_gap_y)*row+self.game_info.art_height/5
+        return art_center_x, art_center_y
+
+    def scanRows(self, rows, callback):
+        '''
+        callback: function to take in artifact image and do what ever you want
+        '''
+        rows = list(rows)
+        if len(rows)<1:
+            return True
+        art_center_x, art_center_y = self.getArtCenter(rows[0], 0)
+        mouse.move(self.game_info.left+art_center_x, self.game_info.top+art_center_y)
+        mouse.click()
+        for art_row in rows:
+            for art_col in range(self.game_info.art_cols):
+                if self.stopped:
+                    return False
+                if self.waitSwitched(art_center_x, art_center_y, min_wait=0.1, max_wait=3):
+                    art_img = captureWindow(self.game_info.hwnd, (
+                        self.game_info.art_info_left, 
+                        self.game_info.art_info_top, 
+                        self.game_info.art_info_left+self.game_info.art_info_width, 
+                        self.game_info.art_info_top+self.game_info.art_info_height))
+                    if art_col==self.game_info.art_cols-1:
+                        art_row += 1
+                        art_col = 0
+                    else:
+                        art_col += 1
+                    if art_row in rows:
+                        art_center_x, art_center_y = self.getArtCenter(art_row, art_col)
+                        mouse.move(self.game_info.left+art_center_x, self.game_info.top+art_center_y)
+                        mouse.click()
+                    callback(art_img)
+                else:
+                    return False
+        return True
+
+    def alignFirstRow(self):
+        mouse.move(self.game_info.left+self.game_info.first_art_x, self.game_info.top+self.game_info.first_art_y)
+        pix = captureWindow(self.game_info.hwnd, (
+            self.game_info.scroll_fin_keypt_x, 
+            self.game_info.scroll_fin_keypt_y, 
+            self.game_info.scroll_fin_keypt_x+1.5, 
+            self.game_info.scroll_fin_keypt_y+1.5))
+        if pix.getpixel((0,0))[0]!=233 or pix.getpixel((0,0))[1]!=229 or pix.getpixel((0,0))[2]!=220:
+            for _ in range(3):
+                mouse.wheel(1)
+            time.sleep(0.1)
+            self.scrollToRow(0)
+        
+
+    def scrollToRow(self, target_row, max_scrolls=20, extra_scroll=0):
+        in_between_row = False
+        rows_scrolled = 0
+        lines_scrolled = 0
+        while True:
+            pix = captureWindow(self.game_info.hwnd, (
+                self.game_info.scroll_fin_keypt_x, 
+                self.game_info.scroll_fin_keypt_y, 
+                self.game_info.scroll_fin_keypt_x+1.5, 
+                self.game_info.scroll_fin_keypt_y+1.5))
+            if pix.getpixel((0,0))[0]!=233 or pix.getpixel((0,0))[1]!=229 or pix.getpixel((0,0))[2]!=220:
+                # if in_between_row==False:
+                #     print('到行之间了')
+                in_between_row = True
+            elif in_between_row:
+                in_between_row = False
+                rows_scrolled += 1
+                lines_scrolled = 0
+                # print(f'已翻{rows_scrolled}行')
+                if rows_scrolled >= target_row:
+                    for _ in range(extra_scroll):
+                        mouse.wheel(-1)
+                    return rows_scrolled
+            if lines_scrolled > max_scrolls:
+                return rows_scrolled
+            for _ in range(6 if lines_scrolled==0 and target_row>0 else 1):
+                mouse.wheel(-1)
+                lines_scrolled += 1
+                # print('翻一下')
+            time.sleep(0.05)