pyeasyphd 0.0.4__tar.gz → 0.0.6__tar.gz

{pyeasyphd-0.0.4 → pyeasyphd-0.0.6}/PKG-INFO

@@ -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 → pyeasyphd-0.0.6}/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-0.0.4 → pyeasyphd-0.0.6}/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-0.0.4 → pyeasyphd-0.0.6}/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-0.0.4 → pyeasyphd-0.0.6}/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 → pyeasyphd-0.0.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyeasyphd"
-version = "0.0.4"
+version = "0.0.6"
 description = "pyeasyphd"
 license = "GPL-3.0-or-later"
 authors = ["NextAI <nextartifintell@gmail.com>"]