mirror of
https://github.com/xiaoqidun/ofdgo.git
synced 2026-10-29 16:59:27 +08:00
This commit is contained in:
1 parent
d6f70de7be
commit
3927929822
30 files changed
+4707
-1161
No files matched your search
+2
-11
@@ -116,17 +116,7 @@ type PageCapabilities struct {
|
||||
// 页面按需解析,未修改条目直接保留;编辑器及其Reader快照使用期间不得关闭输入Reader
|
||||
// 返回: *Editor 编辑器, error 错误信息
|
||||
func (r *Reader) Editor() (*Editor, error) {
|
||||
if r.Zip != nil {
|
||||
seen := make(map[string]bool)
|
||||
for _, file := range r.Zip.File {
|
||||
name := cleanPackagePath(file.Name)
|
||||
if seen[name] {
|
||||
return nil, fmt.Errorf("ambiguous package entry %q", file.Name)
|
||||
}
|
||||
seen[name] = true
|
||||
}
|
||||
}
|
||||
reader := &Reader{Zip: r.Zip, files: r.files}
|
||||
reader := &Reader{Zip: r.Zip, files: r.files, encryption: r.encryption}
|
||||
if err := reader.initRoot(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -143,6 +133,7 @@ func (r *Reader) Editor() (*Editor, error) {
|
||||
return nil, err
|
||||
}
|
||||
e := NewEditor()
|
||||
e.encryption = r.encryption
|
||||
e.Info, e.maxID = cloneEditorData(*info), maximum
|
||||
directory := cleanPackagePath(reader.RootDir)
|
||||
e.source = &editorSource{reader: reader, document: doc, info: cloneEditorData(*info), directory: directory, pages: make(map[string]*editorSourcePage), origins: make(map[string]*editorObjectOrigin)}
|
||||
|
||||
Reference in new issue
Block a user