Merge commit '59c4678d1a79b0facc1550ac81134b9cb5263fc0'

src/components/AndroidADBPullInstruction/AndroidADBPullInstruction.tsx

@@ -7,7 +7,6 @@ import {
   Box,
   Code,
   Heading,
-  Link,
   ListItem,
   OrderedList,
   Text,
@@ -19,6 +18,7 @@ import hljsStyleGitHub from 'react-syntax-highlighter/dist/esm/styles/hljs/githu
 
 import PowerShellAdbDumpCommandTemplate from './adb_dump.ps1?raw';
 import ShellAdbDumpCommandTemplate from './adb_dump.sh?raw';
+import { ExtLink } from '../ExtLink';
 
 const applyTemplate = (tpl: string, values: Record<string, unknown>) => {
   return tpl.replace(/\{\{\s*(\w+)\s*\}\}/g, (_, key) => (Object.hasOwn(values, key) ? String(values[key]) : '<nil>'));
@@ -36,10 +36,19 @@ export function AndroidADBPullInstruction({ dir, file }: AndroidADBPullInstructi
   return (
     <>
       <Text>
-        你需要 <code>root</code> 访问权限来访问安卓应用的私有数据。
+        你需要
+        <ruby>
+          超级管理员
+          <rp> (</rp>
+          <rt>
+            <code>root</code>
+          </rt>
+          <rp>)</rp>
+        </ruby>
+        访问权限来访问安卓应用的私有数据。
       </Text>
       <Text>
-        ⚠️ 请注意，获取 <code>root</code> 通常意味着你的安卓设备
+        ⚠️ 请注意，获取管理员权限通常意味着你的安卓设备
         <chakra.span color="red.400">将失去保修资格</chakra.span>。
       </Text>
 
@@ -92,13 +101,13 @@ export function AndroidADBPullInstruction({ dir, file }: AndroidADBPullInstructi
             <OrderedList>
               <ListItem>
                 <Text>
-                  确保 <code>adb</code> 命令可用。
+                  确保 <Code>adb</Code> 命令可用。
                 </Text>
                 <Text>
                   💡 如果没有，可以
-                  <Link href="https://scoop.sh/#/apps?q=adb" isExternal>
+                  <ExtLink href="https://scoop.sh/#/apps?q=adb">
                     使用 Scoop 安装 <ExternalLinkIcon />
-                  </Link>
+                  </ExtLink>
                   。
                 </Text>
               </ListItem>
@@ -134,6 +143,11 @@ export function AndroidADBPullInstruction({ dir, file }: AndroidADBPullInstructi
           </Heading>
           <AccordionPanel pb={4}>
             <OrderedList>
+              <ListItem>
+                <Text>
+                  确保 <Code>adb</Code> 命令可用。
+                </Text>
+              </ListItem>
               <ListItem>
                 <Text>将安卓设备连接到电脑，并允许调试。</Text>
               </ListItem>

src/components/ExtLink.tsx

@@ -0,0 +1,12 @@
+import type { AnchorHTMLAttributes } from 'react';
+import { ExternalLinkIcon } from '@chakra-ui/icons';
+import { Link } from '@chakra-ui/react';
+
+export function ExtLink({ children, ...props }: AnchorHTMLAttributes<HTMLAnchorElement>) {
+  return (
+    <Link isExternal {...props} rel="noreferrer noopener nofollow">
+      {children}
+      <ExternalLinkIcon />
+    </Link>
+  );
+}

src/components/ImportSecretModal.tsx

@@ -35,7 +35,9 @@ export function ImportSecretModal({ clientName, children, show, onClose, onImpor
             <FileInput onReceiveFiles={handleFileReceived}>拖放或点我选择含有密钥的数据库文件</FileInput>
           </Center>
 
-          <Text mt={2}>选择你的{clientName && <>「{clientName}」</>}客户端平台以查看对应说明：</Text>
+          <Text as="div" mt={2}>
+            选择你的{clientName && <>「{clientName}」</>}客户端平台以查看对应说明：
+          </Text>
           <Flex as={Tabs} variant="enclosed" flexDir="column" flex={1} minH={0}>
             {children}
           </Flex>

src/faq/OtherFAQ.tsx

@@ -1,5 +1,5 @@
-import { ExternalLinkIcon } from '@chakra-ui/icons';
-import { Link, Text } from '@chakra-ui/react';
+import { Text } from '@chakra-ui/react';
+import { ExtLink } from '~/components/ExtLink';
 import { Header4 } from '~/components/HelpText/Header4';
 import { ProjectIssue } from '~/components/ProjectIssue';
 
@@ -17,10 +17,7 @@ export function OtherFAQ() {
       <Header4>有更多问题？</Header4>
       <Text>
         {'欢迎进入 '}
-        <Link href={'https://t.me/unlock_music_chat'} isExternal>
-          Telegram “音乐解锁-交流” 交流群
-          <ExternalLinkIcon />
-        </Link>
+        <ExtLink href={'https://t.me/unlock_music_chat'}>Telegram “音乐解锁-交流” 交流群</ExtLink>
         {' 一起探讨。'}
       </Text>
     </>

src/faq/QQMusicFAQ.tsx

@@ -1,8 +1,9 @@
-import { Alert, AlertIcon, Container, Flex, List, ListItem, Text, chakra } from '@chakra-ui/react';
+import { Alert, AlertIcon, Container, Flex, List, ListItem, Text, UnorderedList, chakra } from '@chakra-ui/react';
 import { Header4 } from '~/components/HelpText/Header4';
 import { SegmentTryOfficialPlayer } from './SegmentTryOfficialPlayer';
-import { QMCv2AllInstructions } from '~/features/settings/panels/QMCv2/QMCv2AllInstructions';
+import { QMCv2QQMusicAllInstructions } from '~/features/settings/panels/QMCv2/QMCv2QQMusicAllInstructions';
 import { SegmentKeyImportInstructions } from './SegmentKeyImportInstructions';
+import { ExtLink } from '~/components/ExtLink';
 
 export function QQMusicFAQ() {
   return (
@@ -16,7 +17,26 @@ export function QQMusicFAQ() {
           <Text>
             <chakra.strong>2、检查您的平台</chakra.strong>
           </Text>
-          <Text>日前，仅Windows客户端下载的歌曲无需密钥，其余平台的官方正式版本均需要提取密钥。</Text>
+          <Text>
+            日前，仅 Windows 客户端 19.43 或更低版本下载的歌曲文件无需密钥，其余平台的官方正式版本均需要提取密钥。
+            你可以通过下方的链接获取 QQ 音乐 Windows 客户端 v19.43 的安装程序：
+          </Text>
+          <UnorderedList pl={3}>
+            <ListItem>
+              <Text>
+                <ExtLink href="https://dldir1v6.qq.com/music/clntupate/QQMusic_Setup_1943.exe">
+                  <code>qq.com</code> 官方下载地址（推荐）
+                </ExtLink>
+              </Text>
+            </ListItem>
+            <ListItem>
+              <Text>
+                <ExtLink href="https://web.archive.org/web/2023/https://dldir1v6.qq.com/music/clntupate/QQMusic_Setup_1943.exe">
+                  <code>Archive.org</code> 存档
+                </ExtLink>
+              </Text>
+            </ListItem>
+          </UnorderedList>
 
           <Container p={2}>
             <Alert status="warning" borderRadius={5}>
@@ -35,7 +55,7 @@ export function QQMusicFAQ() {
             </Alert>
           </Container>
 
-          <SegmentKeyImportInstructions tab="QMCv2 密钥" clientInstructions={<QMCv2AllInstructions />} />
+          <SegmentKeyImportInstructions tab="QMCv2 密钥" clientInstructions={<QMCv2QQMusicAllInstructions />} />
         </ListItem>
       </List>
     </>

src/features/file-listing/FileRow.tsx

@@ -92,7 +92,7 @@ export function FileRow({ id, file }: FileRowProps) {
                       </WrapItem>
                       <WrapItem>
                         {file.decrypted && (
-                          <Link isExternal href={file.decrypted} download={decryptedName}>
+                          <Link href={file.decrypted} download={decryptedName}>
                             <Button as="span">下载</Button>
                           </Link>
                         )}

src/features/settings/panels/PanelQMCv2Key.tsx

@@ -14,6 +14,7 @@ import {
   MenuDivider,
   MenuItem,
   MenuList,
+  Select,
   Text,
   Tooltip,
   useToast,
@@ -30,13 +31,15 @@ import { StagingQMCv2Key } from '../keyFormats';
 import { DatabaseKeyExtractor } from '~/util/DatabaseKeyExtractor';
 import { MMKVParser } from '~/util/MMKVParser';
 import { getFileName } from '~/util/pathHelper';
-import { QMCv2AllInstructions } from './QMCv2/QMCv2AllInstructions';
+import { QMCv2QQMusicAllInstructions } from './QMCv2/QMCv2QQMusicAllInstructions';
+import { QMCv2DoubanAllInstructions } from './QMCv2/QMCv2DoubanAllInstructions';
 
 export function PanelQMCv2Key() {
   const toast = useToast();
   const dispatch = useDispatch();
   const { keys: qmc2Keys, allowFuzzyNameSearch } = useSelector(selectStagingQMCv2Settings);
   const [showImportModal, setShowImportModal] = useState(false);
+  const [secretType, setSecretType] = useState<'qm' | 'douban'>('qm');
 
   const addKey = () => dispatch(qmc2AddKey());
   const clearAll = () => dispatch(qmc2ClearKeys());
@@ -51,11 +54,11 @@ export function PanelQMCv2Key() {
 
       let qmc2Keys: null | Omit<StagingQMCv2Key, 'id'>[] = null;
 
-      if (/[_.]db$/i.test(file.name)) {
+      if (/(player_process[_.]db|music_audio_play)(\.db)?$/i.test(file.name)) {
         const extractor = await DatabaseKeyExtractor.getInstance();
-        qmc2Keys = extractor.extractQmAndroidDbKeys(fileBuffer);
+        qmc2Keys = extractor.extractQmcV2KeysFromSqliteDb(fileBuffer);
         if (!qmc2Keys) {
-          alert(`不是支持的 SQLite 数据库文件。\n表名：${qmc2Keys}`);
+          alert(`不是支持的 SQLite 数据库文件。`);
           return;
         }
       } else if (/MMKVStreamEncryptId|filenameEkeyMap/i.test(file.name)) {
@@ -96,8 +99,8 @@ export function PanelQMCv2Key() {
       </Heading>
 
       <Text>
-        QQ 音乐目前采用的加密方案（QMCv2）。在使用「QQ 音乐」安卓、Mac 或 iOS
-        客户端的情况下，其「离线加密文件」对应的「密钥」储存在独立的数据库文件内。
+        QQ 音乐、豆瓣 FM 目前采用的加密方案（QMCv2）。在使用「QQ 音乐」安卓、Mac 或 iOS 客户端，以及在使用「豆瓣
+        FM」安卓客户端的情况下，其「离线加密文件」对应的「密钥」储存在独立的数据库文件内。
       </Text>
 
       <HStack pb={2} pt={2}>
@@ -155,16 +158,28 @@ export function PanelQMCv2Key() {
             <QMCv2EKeyItem key={id} id={id} ekey={ekey} name={name} i={i} />
           ))}
         </List>
-        {qmc2Keys.length === 0 && <Text>还没有添加密钥。</Text>}
+        {qmc2Keys.length === 0 && <Text>还没有密钥。</Text>}
       </Box>
 
       <ImportSecretModal
-        clientName="QQ 音乐"
+        clientName={
+          <Select
+            value={secretType}
+            onChange={(e) => setSecretType(e.target.value as 'qm' | 'douban')}
+            variant="flushed"
+            display="inline"
+            css={{ paddingLeft: '0.75rem', width: 'auto' }}
+          >
+            <option value="qm">QQ 音乐</option>
+            <option value="douban">豆瓣 FM</option>
+          </Select>
+        }
         show={showImportModal}
         onClose={() => setShowImportModal(false)}
         onImport={handleSecretImport}
       >
-        <QMCv2AllInstructions />
+        {secretType === 'qm' && <QMCv2QQMusicAllInstructions />}
+        {secretType === 'douban' && <QMCv2DoubanAllInstructions />}
       </ImportSecretModal>
     </Flex>
   );

src/features/settings/panels/QMCv2/QMCv2DoubanAllInstructions.tsx

@@ -0,0 +1,17 @@
+import { Tab, TabList, TabPanel, TabPanels } from '@chakra-ui/react';
+import { AndroidADBPullInstruction } from '~/components/AndroidADBPullInstruction/AndroidADBPullInstruction';
+
+export function QMCv2DoubanAllInstructions() {
+  return (
+    <>
+      <TabList>
+        <Tab>安卓</Tab>
+      </TabList>
+      <TabPanels flex={1} overflow="auto">
+        <TabPanel>
+          <AndroidADBPullInstruction dir="/data/data/com.douban.radio/databases" file="music_audio_play" />
+        </TabPanel>
+      </TabPanels>
+    </>
+  );
+}

src/features/settings/panels/QMCv2/QMCv2QQMusicAllInstructions.tsx

@@ -4,7 +4,7 @@ import { InstructionsIOS } from './InstructionsIOS';
 import { InstructionsMac } from './InstructionsMac';
 import { InstructionsPC } from './InstructionsPC';
 
-export function QMCv2AllInstructions() {
+export function QMCv2QQMusicAllInstructions() {
   return (
     <>
       <TabList>

src/util/DatabaseKeyExtractor.ts

@@ -23,16 +23,21 @@ export class DatabaseKeyExtractor {
     return tables.includes(name);
   }
 
-  extractQmAndroidDbKeys(buffer: ArrayBuffer): null | QMAndroidKeyEntry[] {
+  extractQmcV2KeysFromSqliteDb(buffer: ArrayBuffer): null | QMAndroidKeyEntry[] {
     let db: SQLDatabase | null = null;
 
     try {
       db = new this.SQL.Database(new Uint8Array(buffer));
-      if (!this.hasTable(db, 'audio_file_ekey_table')) {
-        return null;
-      }
 
-      const result = db.exec('select file_path, ekey from audio_file_ekey_table');
+      let sql: undefined | string;
+      if (this.hasTable(db, 'audio_file_ekey_table')) {
+        sql = 'select file_path, ekey from audio_file_ekey_table';
+      } else if (this.hasTable(db, 'EKeyFileInfo')) {
+        sql = 'select filePath, eKey from EKeyFileInfo';
+      }
+      if (!sql) return null;
+
+      const result = db.exec(sql);
       if (result.length === 0) {
         return [];
       }