pyeasyphd 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

pyeasyphd/main/pandoc_md_to.py

@@ -1,6 +1,7 @@
 import copy
 import os
 import re
+import subprocess
 import time
 from typing import Dict, List, Optional, Tuple
 
@@ -67,20 +68,20 @@ class PandocMdTo(BasicInput):
         if os.path.exists(self.full_csl_style_pandoc):
             cmd = (
                 f"pandoc {full_md_one} -t {self.markdown_citation} "
-                f'-o {full_md_two} -M reference-section-title="References" '
-                f"-C --bibliography={path_bib} --csl={self.full_csl_style_pandoc} --columns {self.columns_in_md}"
+                f"-o {full_md_two} -M reference-section-title='References' "
+                f"--citeproc --bibliography={path_bib} --csl={self.full_csl_style_pandoc} --columns {self.columns_in_md}"
             )
         else:
             cmd = (
                 f"pandoc {full_md_one} -t {self.markdown_citation} "
-                f'-o {full_md_two} -M reference-section-title="References" '
-                f"-C --bibliography={path_bib} --columns {self.columns_in_md}"
+                f"-o {full_md_two} -M reference-section-title='References' "
+                f"--citeproc --bibliography={path_bib} --columns {self.columns_in_md}"
             )
 
         try:
-            os.system(cmd)
-        except Exception as e:
-            print("pandoc md to md:", e)
+            subprocess.run(cmd, shell=True, check=True, capture_output=True, text=True)
+        except subprocess.CalledProcessError as e:
+            print("Pandoc error in pandoc md to md:", e.stderr)
 
         if not os.path.exists(full_md_two):
             print(f"- pandoc false from md to md: {os.path.basename(full_md_two)}\n")
@@ -114,13 +115,15 @@ class PandocMdTo(BasicInput):
         if not os.path.exists(path_tex := os.path.dirname(full_tex)):
             os.makedirs(path_tex)
 
+        if template_name.lower() == "beamer":
+            cmd = f"pandoc {full_md} -t beamer -o {full_tex} --from markdown "
+        else:
+            cmd = f"pandoc {full_md} -o {full_tex} --from markdown "
+
         try:
-            if template_name.lower() == "beamer":
-                os.system(f"pandoc {full_md} -t beamer -o {full_tex} --from markdown ")
-            else:
-                os.system(f"pandoc {full_md} -o {full_tex} --from markdown ")
-        except Exception as e:
-            print("pandoc md to tex:", e)
+            subprocess.run(cmd, shell=True, check=True, capture_output=True, text=True)
+        except subprocess.CalledProcessError as e:
+            print("Pandoc error in pandoc md to tex:", e.stderr)
 
         if not os.path.exists(full_tex):
             print(f"- pandoc false from md to tex: {os.path.basename(full_md)}\n")
@@ -152,9 +155,9 @@ class PandocMdTo(BasicInput):
         cmd = f"pandoc {full_md} -o {full_html} --from markdown "
 
         try:
-            os.system(cmd)
-        except Exception as e:
-            print("pandoc md to html:", e)
+            subprocess.run(cmd, shell=True, check=True, capture_output=True, text=True)
+        except subprocess.CalledProcessError as e:
+            print("Pandoc error in pandoc md to html:", e.stderr)
 
         if not os.path.exists(full_html):
             return f"- pandoc false from md to html: {os.path.basename(full_md)}\n"
@@ -189,9 +192,9 @@ class PandocMdTo(BasicInput):
             cmd = f"pandoc {full_md} -o {full_pdf} --from markdown  --listings --pdf-engine=xelatex"
 
         try:
-            os.system(cmd)
-        except Exception as e:
-            print("pandoc md to pdf:", e)
+            subprocess.run(cmd, shell=True, check=True, capture_output=True, text=True)
+        except subprocess.CalledProcessError as e:
+            print("Pandoc error in pandoc md to pdf:", e.stderr)
 
         if not os.path.exists(full_pdf):
             return f"- pandoc false from md to pdf: {os.path.basename(full_md)}\n"

pyeasyphd/main/python_run_tex.py

@@ -1,5 +1,6 @@
 import os
 import re
+import subprocess
 from typing import Any, Dict, List, Optional
 
 from pyadvtools import (
@@ -133,10 +134,11 @@ class PythonRunTex(BasicInput):
         # run latex
         if self.run_latex:
             os.chdir(path_output)
+            cmd = "latexmk -{} {}".format(self.pdflatex_xelatex, main_name)
             try:
-                os.system("latexmk -{} {}".format(self.pdflatex_xelatex, main_name))
-            except Exception as e:
-                print(e)
+                subprocess.run(cmd, shell=True, check=True, capture_output=True, text=True)
+            except subprocess.CalledProcessError as e:
+                print("Error in Run LaTex:", e.stderr)
 
         # delete cache
         if self.delete_run_latex_cache:

pyeasyphd/tools/search/search_core.py

@@ -305,7 +305,7 @@ class SearchResultsCore(BasicInput):
 
         for d in delete_folder_list:
             for field in self.search_field_list:
-                path_delete = os.path.join(p_separate, rf"{keywords_type}/{field}-md-{d}")
+                path_delete = os.path.join(p_separate, keywords_type, rf"{field}-md-{d}")
                 if os.path.exists(path_delete):
                     shutil.rmtree(path_delete)
 

pyeasyphd/tools/search/search_writers.py

@@ -73,7 +73,7 @@ class WriteInitialResult(object):
             _python_writer.write_to_file(data_list[i], file_name, "w", path_write)
 
         # pandoc md to generate md file
-        path_bib = f"{path_write}/{file_prefix}{mid_list[2]}.bib"  # bib_for_abbr
+        path_bib = os.path.join(path_write, f"{file_prefix}{mid_list[2]}.bib")  # bib_for_abbr
         data_list_pandoc_md = self._pandoc_md_to.pandoc_md_to_md(
             path_bib,
             path_write,

{pyeasyphd-0.0.4.dist-info → pyeasyphd-0.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyeasyphd
-Version: 0.0.4
+Version: 0.0.6
 Summary: pyeasyphd
 License: GPL-3.0-or-later
 Keywords: Python,Markdown,LaTex

{pyeasyphd-0.0.4.dist-info → pyeasyphd-0.0.6.dist-info}/RECORD

@@ -49,10 +49,10 @@ pyeasyphd/bib/core/convert_str_to_library.py,sha256=CNB5UfSOcCqPPypxm9yIY7R7kvLQ
 pyeasyphd/bib/core/convert_str_to_str.py,sha256=jUxXD3v7t042OaMXPFlWGHjNNukpuoel12TpYt1krD4,900
 pyeasyphd/main/__init__.py,sha256=7_x6_RNSeha2zrgIbKjJgEvFWK62btOW9v6RUU1Ygm8,390
 pyeasyphd/main/basic_input.py,sha256=b2ilzgslD2W-10gLM3RM3zBn3-MxFkYeHeTzdILzbAU,6794
-pyeasyphd/main/pandoc_md_to.py,sha256=oC9KXnMqBJKKDvtBBMLkmPmcisWvWD0XiUwv18FUEbY,14828
+pyeasyphd/main/pandoc_md_to.py,sha256=SPbQBlAvfB5hcXmfKlMDc2zoT2nJ_uQNyw8bHeiyy1s,15280
 pyeasyphd/main/python_run_bib.py,sha256=RRVeGXXs1MELpAYex9vT3x97Rqr211TP1aeHhD-8hXU,2891
 pyeasyphd/main/python_run_md.py,sha256=6K4zqYtl298-iS1XVGH4jY9FkDD9ezwpGfZk0NIgk2Q,10353
-pyeasyphd/main/python_run_tex.py,sha256=P5jqnyRfKyUJFvhd7LgASmwlfkHSJ0Br9_jeYwp2Ojg,5786
+pyeasyphd/main/python_run_tex.py,sha256=BNSXp0KnxvYyXr5q43Sr4NwD32EiGaqZJ0QYDwit0tw,5937
 pyeasyphd/main/python_writers.py,sha256=VQpaAbdNNa1s327ADgl8Wy-rKBZy1alqmtmx6E3RDWI,8510
 pyeasyphd/pyeasyphd.py,sha256=vPM4uPmr6jSxVOy0zYetoijc8wUkQdXExUVdJyWynVQ,2875
 pyeasyphd/pyeasyphd.sublime-settings,sha256=6D5SYWsG6xn8OEu6IchIDGGGH7uLX4v451X28yeAevU,8718
@@ -67,14 +67,14 @@ pyeasyphd/tools/py_run_bib_md_tex.py,sha256=lc6JqfXeJSMA8icTJTC7X1pq4tgurOaXq9f0
 pyeasyphd/tools/replace/replace.py,sha256=wXdO72PpqZ-Iyzq5AjVCIpx8h2d1YCTiWY9VSbQAVvs,3337
 pyeasyphd/tools/search/data.py,sha256=7uHXfHTcn88zkfqAGZMNcSd2OjS2LhkpE9paNuSUUqw,10754
 pyeasyphd/tools/search/search_base.py,sha256=Q8IWqVLk-rGZwRZ316WkZNs0qyF7PVHP6lx6Ul5mLKI,4507
-pyeasyphd/tools/search/search_core.py,sha256=16nVB2j3mtrTxUJKgtYg65ux6bI81ofTHn1IAB3twPc,13783
+pyeasyphd/tools/search/search_core.py,sha256=Gn_9vWojSn4Pg5jOaN54Kiv1osW3TM6D3SvZ53Xk9-Y,13782
 pyeasyphd/tools/search/search_keywords.py,sha256=O_ivQzElsjujTHqU0Sxw4w4v3VwcN560HcoBhS1B3WA,10430
-pyeasyphd/tools/search/search_writers.py,sha256=TuQGm9QwHy0bZHNtO_qg-MYEcip_rUPfwHyvPKO-sEg,12551
+pyeasyphd/tools/search/search_writers.py,sha256=qP6UE_oK2LKriP7kfoDR4j8p7MlV09zdK7LnXHHB1_8,12564
 pyeasyphd/tools/search/utils.py,sha256=yLKrMmM2x-fHdm6P8haFZzagd9sLkViTdwJTHyGRgXY,6092
 pyeasyphd/tools/spider/process_spider_bib.py,sha256=p1UNUaLAxMZPYtuwjNi20e1ms--cyjlB7CIZFP3SX6U,10443
 pyeasyphd/tools/spider/process_spider_url.py,sha256=YKG4GER5TiFDjyk94n1ocUQ8bM7ZvXImx0lKNvnyVC4,2970
 pyeasyphd/tools/spider/process_spider_url_bib.py,sha256=1b0FnUlTt5BzaOqFZJmnY5gnAhdD4pbQolHR1e3wiyE,2705
 pyeasyphd/utils/utils.py,sha256=yuHy6D2mTsd2aAwNBSMC7CU4LV-MkWwzKeO_0Iehbyg,1655
-pyeasyphd-0.0.4.dist-info/METADATA,sha256=kyDu0_OV12RDFJ5_w-rfXiO_3ZgtEyadUtwH14GDdac,1043
-pyeasyphd-0.0.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pyeasyphd-0.0.4.dist-info/RECORD,,
+pyeasyphd-0.0.6.dist-info/METADATA,sha256=J-PHRjVLGOppw6rt2GfRSiudrwc8Q-RAs-t-1Tw7oB0,1043
+pyeasyphd-0.0.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pyeasyphd-0.0.6.dist-info/RECORD,,