Небольшая оптимизация чтения для формата конфигуратора при определении защищенности файла

bia-tech · bia-tech · commit d6c7600d2561 · 2024-01-24T09:42:10.000+03:00
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/common/context/MDCReaderContext.java b/src/main/java/com/github/_1c_syntax/bsl/reader/common/context/MDCReaderContext.java
@@ -1,25 +1,25 @@
-/*
- * This file is a part of MDClasses.
- *
- * Copyright (c) 2019 - 2024
- * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
- *
- * SPDX-License-Identifier: LGPL-3.0-or-later
- *
- * MDClasses is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3.0 of the License, or (at your option) any later version.
- *
- * MDClasses is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with MDClasses.
- */
-package com.github._1c_syntax.bsl.reader.common.context;
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright (c) 2019 - 2024
+ * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * MDClasses is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * MDClasses is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with MDClasses.
+ */
+package com.github._1c_syntax.bsl.reader.common.context;
 
 import com.github._1c_syntax.bsl.mdo.MD;
 import com.github._1c_syntax.bsl.mdo.Module;
@@ -217,6 +217,6 @@ private ProtectedModuleInfo getModuleInfo(Path folder, ModuleType moduleType) {
     } else {
       modulePath = EDTPaths.modulePath(folder, MDOType.CONFIGURATION.getName(), moduleType);
     }
-    return new ProtectedModuleInfo(modulePath);
+    return new ProtectedModuleInfo(modulePath, isDesignerFormat);
   }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/common/context/MDReaderContext.java b/src/main/java/com/github/_1c_syntax/bsl/reader/common/context/MDReaderContext.java
@@ -1,25 +1,25 @@
-/*
- * This file is a part of MDClasses.
- *
- * Copyright (c) 2019 - 2024
- * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
- *
- * SPDX-License-Identifier: LGPL-3.0-or-later
- *
- * MDClasses is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3.0 of the License, or (at your option) any later version.
- *
- * MDClasses is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with MDClasses.
- */
-package com.github._1c_syntax.bsl.reader.common.context;
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright (c) 2019 - 2024
+ * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * MDClasses is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * MDClasses is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with MDClasses.
+ */
+package com.github._1c_syntax.bsl.reader.common.context;
 
 import com.github._1c_syntax.bsl.mdo.ChildrenOwner;
 import com.github._1c_syntax.bsl.mdo.Form;
@@ -278,6 +278,6 @@ private ProtectedModuleInfo getModuleInfo(Path folder, ModuleType moduleType) {
     } else {
       modulePath = EDTPaths.modulePath(folder, name, moduleType);
     }
-    return new ProtectedModuleInfo(modulePath);
+    return new ProtectedModuleInfo(modulePath, isDesignerFormat);
   }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/CommonModuleConverter.java b/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/CommonModuleConverter.java
@@ -1,25 +1,25 @@
-/*
- * This file is a part of MDClasses.
- *
- * Copyright (c) 2019 - 2024
- * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
- *
- * SPDX-License-Identifier: LGPL-3.0-or-later
- *
- * MDClasses is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3.0 of the License, or (at your option) any later version.
- *
- * MDClasses is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with MDClasses.
- */
-package com.github._1c_syntax.bsl.reader.common.converter;
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright (c) 2019 - 2024
+ * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * MDClasses is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * MDClasses is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with MDClasses.
+ */
+package com.github._1c_syntax.bsl.reader.common.converter;
 
 import com.github._1c_syntax.bsl.mdo.CommonModule;
 import com.github._1c_syntax.bsl.reader.designer.DesignerPaths;
@@ -54,7 +54,7 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
         ModuleType.CommonModule
       );
     }
-    var protectedModuleInfo = new ProtectedModuleInfo(modulePath);
+    var protectedModuleInfo = new ProtectedModuleInfo(modulePath, readerContext.isDesignerFormat());
     readerContext.setValue(URI_FIELD_NAME, protectedModuleInfo.getModulePath().toUri());
     readerContext.setValue(IS_PROTECTED_FIELD_NAME, protectedModuleInfo.isProtected());
     return readerContext.build();
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/ProtectedModuleInfo.java b/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/ProtectedModuleInfo.java
@@ -1,25 +1,25 @@
-/*
- * This file is a part of MDClasses.
- *
- * Copyright (c) 2019 - 2024
- * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
- *
- * SPDX-License-Identifier: LGPL-3.0-or-later
- *
- * MDClasses is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3.0 of the License, or (at your option) any later version.
- *
- * MDClasses is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with MDClasses.
- */
-package com.github._1c_syntax.bsl.reader.common.converter;
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright (c) 2019 - 2024
+ * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * MDClasses is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * MDClasses is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with MDClasses.
+ */
+package com.github._1c_syntax.bsl.reader.common.converter;
 
 import lombok.Getter;
 import org.apache.commons.io.FilenameUtils;
@@ -48,7 +48,7 @@ public class ProtectedModuleInfo {
    */
   private Path modulePath;
 
-  public ProtectedModuleInfo(Path path) {
+  public ProtectedModuleInfo(Path path, boolean onlyFindBin) {
     modulePath = path;
     isProtected = false;
 
@@ -58,7 +58,7 @@ public ProtectedModuleInfo(Path path) {
         isProtected = true;
         modulePath = prtModulePath;
       }
-    } else {
+    } else if (!onlyFindBin) { // нет смысла читать файлы, если ищем только bin
       var bytes = new byte[PROTECTED_FILE_HEADER.length];
       try (var fis = new FileInputStream(modulePath.toFile())) {
         isProtected = (fis.read(bytes) == PROTECTED_FILE_HEADER.length
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/designer/converter/FormElementConverter.java b/src/main/java/com/github/_1c_syntax/bsl/reader/designer/converter/FormElementConverter.java
@@ -43,7 +43,7 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
     try {
       readerContext.setValue("id", Integer.parseInt(reader.getAttribute("id")));
     } catch (NumberFormatException e) {
-      LOGGER.error("Unknown type {} in file {}", reader.getNodeName(), ExtendXStream.getCurrentPath(reader).toString());
+      LOGGER.warn("Unknown type {} in file {}", reader.getNodeName(), ExtendXStream.getCurrentPath(reader).toString());
       return null;
     }
     readerContext.setValue("type", reader.getNodeName());

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co`
`43`	`43`	`try {`
`44`	`44`	`readerContext.setValue("id", Integer.parseInt(reader.getAttribute("id")));`
`45`	`45`	`} catch (NumberFormatException e) {`
`46`		`- LOGGER.error("Unknown type {} in file {}", reader.getNodeName(), ExtendXStream.getCurrentPath(reader).toString());`
	`46`	`+ LOGGER.warn("Unknown type {} in file {}", reader.getNodeName(), ExtendXStream.getCurrentPath(reader).toString());`
`47`	`47`	`return null;`
`48`	`48`	`}`
`49`	`49`	`readerContext.setValue("type", reader.getNodeName());`