Merge pull request #14 from moul/dev/moul/fix-parser

fix: use alternate method to get all manifest fields

main.go

@@ -24,16 +24,9 @@ func run(args []string) error {
 	root := &ffcli.Command{
 		ShortUsage: `pkgman SUBCOMMAND`,
 		Subcommands: []*ffcli.Command{
-			{
-				Name:       "ipa-plist-json",
-				ShortUsage: "ipa-plist-json PATH",
-				Exec:       runIpaPlistJSON,
-			},
-			{
-				Name:       "apk-manifest",
-				ShortUsage: "apk-manifest",
-				Exec:       runApkManifest,
-			},
+			{Name: "ipa-plist-json", ShortUsage: "ipa-plist-json PATH", Exec: runIpaPlistJSON},
+			{Name: "apk-manifest", ShortUsage: "apk-manifest PATH", Exec: runApkManifest},
+			{Name: "apk-manifest-xml", ShortUsage: "apk-manifest-xml PATH", Exec: runApkManifestXML},
 		},
 		Exec: func(context.Context, []string) error { return flag.ErrHelp },
 	}
@@ -81,3 +74,23 @@ func runApkManifest(_ context.Context, args []string) error {
 	}
 	return nil
 }
+
+func runApkManifestXML(_ context.Context, args []string) error {
+	if len(args) < 1 {
+		return flag.ErrHelp
+	}
+	for _, arg := range args {
+		pkg, err := apk.Open(arg)
+		if err != nil {
+			return err
+		}
+		defer pkg.Close()
+
+		manifest, err := pkg.ManifestXML()
+		if err != nil {
+			return err
+		}
+		fmt.Println(manifest)
+	}
+	return nil
+}

pkg/apk/apk.go

@@ -14,15 +14,16 @@ import (
 )
 
 type Package struct {
-	r *zip.ReadCloser
+	r    *zip.ReadCloser
+	path string
 }
 
 func Open(path string) (*Package, error) {
 	r, err := zip.OpenReader(path)
 	if err != nil {
 		return nil, fmt.Errorf("open path: %w", err)
 	}
-	return &Package{r: r}, nil
+	return &Package{r: r, path: path}, nil
 }
 
 func (p *Package) Close() error {
@@ -57,17 +58,24 @@ func (p Package) FileBytes(name string) ([]byte, error) {
 }
 
 func (p Package) ManifestXML() (string, error) {
-	b, err := p.FileBytes("AndroidManifest.xml")
+	// this method is a little bit stupid, since it reopens a new zip,
+	// but when using apkparser.ParseXML on bytes, we lose some fields.
+	apkReader, err := apkparser.OpenZip(p.path)
 	if err != nil {
 		return "", err
 	}
-	binbuf := bytes.NewBuffer(b)
+	defer apkReader.Close()
 
 	xmlbuf := bytes.Buffer{}
 	xmlwriter := bufio.NewWriter(&xmlbuf)
 	enc := xml.NewEncoder(xmlwriter)
-	enc.Indent("  ", "    ")
-	err = apkparser.ParseXml(binbuf, enc, nil)
+	enc.Indent("", "    ")
+	parser, err := apkparser.NewParser(apkReader, enc)
+	if err != nil {
+		return "", err
+	}
+
+	err = parser.ParseXml("AndroidManifest.xml")
 	if err != nil {
 		return "", err
 	}