fosslight-dependency 3.15.3__py3-none-any.whl → 3.15.4__py3-none-any.whl

fosslight_dependency/package_manager/Pub.py

@@ -179,17 +179,35 @@ class Pub(PackageManager):
         self.direct_dep = True
         tmp_pub_deps_file = 'tmp_deps.json'
         tmp_no_dev_deps_file = 'tmp_no_dev_deps.txt'
-
+        encoding_list = ['utf8', 'utf16']
         if os.path.exists(tmp_pub_deps_file) and os.path.exists(tmp_no_dev_deps_file):
-            try:
-                with open(tmp_pub_deps_file, 'r', encoding='utf8') as deps_f:
-                    deps_l = json.load(deps_f)
-                    self.parse_pub_deps_file(deps_l)
-                with open(tmp_no_dev_deps_file, 'r', encoding='utf8') as no_dev_f:
-                    self.parse_no_dev_command_file(no_dev_f.read())
-                logger.info('Parse tmp pub deps file.')
-            except Exception as e:
-                logger.error(f'Fail to parse tmp pub deps result file: {e}')
+            for encode in encoding_list:
+                try:
+                    logger.info(f'Try to encode with {encode}.')
+                    with open(tmp_pub_deps_file, 'r+', encoding=encode) as deps_f:
+                        lines = deps_f.readlines()
+                        deps_f.seek(0)
+                        deps_f.truncate()
+                        for num, line in enumerate(lines):
+                            if line.startswith('{'):
+                                first_line = num
+                                break
+                        deps_f.writelines(lines[first_line:])
+                        deps_f.seek(0)
+                        deps_l = json.load(deps_f)
+                        self.parse_pub_deps_file(deps_l)
+                    with open(tmp_no_dev_deps_file, 'r', encoding=encode) as no_dev_f:
+                        self.parse_no_dev_command_file(no_dev_f.read())
+                    logger.info('Parse tmp pub deps file.')
+                except UnicodeDecodeError as e1:
+                    logger.info(f'Fail to encode with {encode}: {e1}')
+                    pass
+                except Exception as e:
+                    logger.error(f'Fail to parse tmp pub deps result file: {e}')
+                    return False
+                else:
+                    logger.info(f'Success to encode with {encode}.')
+                    break
         else:
             try:
                 cmd = "flutter pub get"

{fosslight_dependency-3.15.3.dist-info → fosslight_dependency-3.15.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-dependency
-Version: 3.15.3
+Version: 3.15.4
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics

{fosslight_dependency-3.15.3.dist-info → fosslight_dependency-3.15.4.dist-info}/RECORD

@@ -15,7 +15,7 @@ fosslight_dependency/package_manager/Helm.py,sha256=FjzQilY3GJyX8thwMGY_Rr12kw-d
 fosslight_dependency/package_manager/Maven.py,sha256=-cS3DSFARE9rR0XtBVGvCv6JkmYYRjLtRAmn4TeIY1M,10282
 fosslight_dependency/package_manager/Npm.py,sha256=uuIS0lC8LpKTs8A0fG4mhJfpGno_hMugGW8ss5M_mMI,10395
 fosslight_dependency/package_manager/Nuget.py,sha256=j1zdLykGA6HcvGtdn8Kz1AZZmvK7iKxUERKWBNCfSp0,8948
-fosslight_dependency/package_manager/Pub.py,sha256=EzmdFzyUyL4pYn8mD4y0DK3s8Vp5VB1ErVYQQv4mlZU,8852
+fosslight_dependency/package_manager/Pub.py,sha256=7HlvFu7HXaSDF1_VjFUAM1O4pz1DutbNwNzmzldyLbA,9763
 fosslight_dependency/package_manager/Pypi.py,sha256=hqhvsHwRqcM8bDUNJ6u8LTtEnMSUsRmVLllXZ793w_w,16046
 fosslight_dependency/package_manager/Swift.py,sha256=9r19lSmpFjeOsYcBkvMhgFfFZ4pL4j32YvCFLWWc8Fs,6489
 fosslight_dependency/package_manager/Unity.py,sha256=vGWtAHNtSkU8PxqKhoJNFFcUmNM2NJGRLwBmzeA21Sg,4353
@@ -23,12 +23,12 @@ fosslight_dependency/package_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 fosslight_dependency/third_party/askalono/askalono.exe,sha256=NyngElHbrg3zLFRVwn6fPDZE_EDAEb1N8tiwWoCm4pQ,4743680
 fosslight_dependency/third_party/askalono/askalono_macos,sha256=cYSNXhAQpkdd8lkgnY5skNeDmU_8DIuP84eFi0OXKkE,5589868
 fosslight_dependency/third_party/nomos/nomossa,sha256=oFF9I-fhug6AVNyFnWeVXwDRin6NWSvk1g7mHBotB3Q,866408
-fosslight_dependency-3.15.3.dist-info/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-3.15.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-3.15.3.dist-info/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
-fosslight_dependency-3.15.3.dist-info/METADATA,sha256=encKE5IaS4FYzRxEaa8okrM0H96lGxiLskQ4rGIxjFI,4799
-fosslight_dependency-3.15.3.dist-info/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
-fosslight_dependency-3.15.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-fosslight_dependency-3.15.3.dist-info/entry_points.txt,sha256=e1QZbnCrQvfbwe9L6PxXnkRZMhl-PSo0QyUes0dGjU8,91
-fosslight_dependency-3.15.3.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
-fosslight_dependency-3.15.3.dist-info/RECORD,,
+fosslight_dependency-3.15.4.dist-info/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-3.15.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-3.15.4.dist-info/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
+fosslight_dependency-3.15.4.dist-info/METADATA,sha256=p4Hi0YcyZgvYF5GSBVGud0MHj8WV2FivffLGiYr6q-o,4799
+fosslight_dependency-3.15.4.dist-info/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
+fosslight_dependency-3.15.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+fosslight_dependency-3.15.4.dist-info/entry_points.txt,sha256=e1QZbnCrQvfbwe9L6PxXnkRZMhl-PSo0QyUes0dGjU8,91
+fosslight_dependency-3.15.4.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
+fosslight_dependency-3.15.4.dist-info/RECORD,,