pyeasyphd 0.3.8__py3-none-any.whl → 0.3.10__py3-none-any.whl

pyeasyphd/scripts/__init__.py

@@ -10,11 +10,18 @@ __all__ = [
     "run_generate_j_weekly",
     "run_generate_j_monthly",
     "run_generate_j_yearly",
+    # from pybibtexer
+    "run_compare_bib_with_local",
+    "run_compare_bib_with_zotero",
+    "run_format_bib_to_save_by_entry_type",
+    "run_format_bib_to_abbr_zotero_save"
 ]
 
 from .run_article_md import run_article_md_daily_notes
 from .run_article_tex import run_article_tex_submit
 from .run_beamer_tex import run_beamer_tex_weekly_reports
+from .run_compare import run_compare_bib_with_local, run_compare_bib_with_zotero
+from .run_format import run_format_bib_to_abbr_zotero_save, run_format_bib_to_save_by_entry_type
 from .run_generate import (
     run_generate_c_yearly,
     run_generate_j_e_weekly,

pyeasyphd/scripts/_base.py

@@ -7,6 +7,11 @@ def expand_path(path: str) -> str:
     return os.path.expandvars(os.path.expanduser(path))
 
 
+def expand_paths(*paths):
+    # Expand and normalize file paths
+    return [expand_path(path) for path in paths]
+
+
 def build_base_options(
     include_publisher_list: List[str],
     include_abbr_list: List[str],
@@ -27,6 +32,7 @@ def build_base_options(
     Returns:
         Dictionary containing configured options
     """
+    path_conferences_journals_json = expand_path(path_conferences_journals_json)
     return {
         "include_publisher_list": include_publisher_list,
         "include_abbr_list": include_abbr_list,

pyeasyphd/scripts/run_compare.py

@@ -0,0 +1,45 @@
+from pybibtexer.tools import compare_bibs_with_local, compare_bibs_with_zotero
+
+from ._base import build_base_options, expand_paths
+
+
+def run_compare_bib_with_local(
+    options: dict,
+    need_compare_bib: str,
+    path_output: str,
+    path_spidered_bibs: str,
+    path_spidering_bibs: str,
+    path_conferences_journals_json: str,
+) -> None:
+    # Expand and normalize file paths
+    need_compare_bib, path_output, path_spidered_bibs, path_spidering_bibs = expand_paths(
+        need_compare_bib, path_output, path_spidered_bibs, path_spidering_bibs
+    )
+
+    # Update options
+    options_ = build_base_options([], [], ["arXiv"], [], path_conferences_journals_json)
+    options_["include_early_access"] = True
+    options_.update(options)
+
+    # Compare
+    compare_bibs_with_local(need_compare_bib, path_spidered_bibs, path_spidering_bibs, path_output, options_)
+
+
+def run_compare_bib_with_zotero(
+    options: dict,
+    need_compare_bib: str,
+    zotero_bib: str,
+    path_output: str,
+    path_conferences_journals_json: str,
+) -> None:
+    # Expand and normalize file paths
+    need_compare_bib, zotero_bib, path_output = expand_paths(
+        need_compare_bib, zotero_bib, path_output
+    )
+
+    # Update options
+    options_ = build_base_options([], [], ["arXiv"], [], path_conferences_journals_json)
+    options_.update(options)
+
+    # Compare
+    compare_bibs_with_zotero(zotero_bib, need_compare_bib, path_output, options_)

pyeasyphd/scripts/run_format.py

@@ -0,0 +1,37 @@
+from pathlib import Path
+
+from pybibtexer.tools import format_bib_to_abbr_zotero_save_modes, format_bib_to_save_mode_by_entry_type
+
+from ._base import build_base_options, expand_paths
+
+
+def run_format_bib_to_save_by_entry_type(
+    options: dict,
+    need_format_bib: str,
+    path_output: str,
+    path_conferences_journals_json: str,
+) -> None:
+    # Expand and normalize file paths
+    need_format_bib, path_output = expand_paths(need_format_bib, path_output)
+
+    # Update options
+    options_ = build_base_options([], [], [], [], path_conferences_journals_json)
+    options_.update(options)
+
+    format_bib_to_save_mode_by_entry_type(Path(need_format_bib).stem, path_output, need_format_bib, options=options_)
+
+
+def run_format_bib_to_abbr_zotero_save(
+    options: dict,
+    need_format_bib: str,
+    path_output: str,
+    path_conferences_journals_json: str,
+) -> None:
+    # Expand and normalize file paths
+    need_format_bib, path_output = expand_paths(need_format_bib, path_output)
+
+    # Update options
+    options_ = build_base_options([], [], [], [], path_conferences_journals_json)
+    options_.update(options)
+
+    format_bib_to_abbr_zotero_save_modes(need_format_bib, path_output, options=options_)

pyeasyphd/scripts/run_generate.py

@@ -3,7 +3,7 @@ import os
 from pyeasyphd.tools import PaperLinksGenerator, generate_from_bibs_and_write
 from pyeasyphd.utils.utils import is_last_week_of_month
 
-from ._base import build_base_options, expand_path
+from ._base import build_base_options, expand_paths
 
 
 def run_generate_j_weekly(
@@ -14,11 +14,11 @@ def run_generate_j_weekly(
     path_conferences_journals_json: str,
 ):
     # Expand and normalize file paths
-    path_weekly_docs = expand_path(path_weekly_docs)
+    path_weekly_docs, path_spidering_bibs = expand_paths(path_weekly_docs, path_spidering_bibs)
 
-    _, path_spidering_bibs, path_conferences_journals_json, full_json_c, full_json_j, full_json_k, options_ = (
-        run_generate_base(options, "", path_spidering_bibs, path_conferences_journals_json)
-    )
+    # Update options
+    options_ = build_base_options([], [], ["arXiv"], [], path_conferences_journals_json)
+    options_.update(options)
 
     # Generate md and html files
     for gc in ["generate_data", "combine_data"]:
@@ -33,6 +33,11 @@ def run_generate_j_weekly(
 
     # Generate links
     for keywords_category_name in keywords_category_names:
+        full_json_c, full_json_j, full_json_k = (
+            options_["full_json_c"],
+            options_["full_json_j"],
+            options_["full_json_k"],
+        )
         output_basename = os.path.join("data", "Weekly")
         generator = PaperLinksGenerator(full_json_c, full_json_j, full_json_k, path_weekly_docs, keywords_category_name)
         generator.generate_weekly_links(output_basename)
@@ -47,11 +52,11 @@ def run_generate_j_e_weekly(
     path_conferences_journals_json: str,
 ):
     # Expand and normalize file paths
-    path_weekly_docs = expand_path(path_weekly_docs)
+    path_weekly_docs, path_spidering_bibs = expand_paths(path_weekly_docs, path_spidering_bibs)
 
-    _, path_spidering_bibs, path_conferences_journals_json, full_json_c, full_json_j, full_json_k, options_ = (
-        run_generate_base(options, "", path_spidering_bibs, path_conferences_journals_json)
-    )
+    # Update options
+    options_ = build_base_options([], [], ["arXiv"], [], path_conferences_journals_json)
+    options_.update(options)
     options_["early_access"] = True
 
     # Generate md and html files
@@ -73,6 +78,11 @@ def run_generate_j_e_weekly(
 
     # Generate links
     for keywords_category_name in keywords_category_names:
+        full_json_c, full_json_j, full_json_k = (
+            options_["full_json_c"],
+            options_["full_json_j"],
+            options_["full_json_k"],
+        )
         output_basename = os.path.join("data", "Weekly")
         generator = PaperLinksGenerator(full_json_c, full_json_j, full_json_k, path_weekly_docs, keywords_category_name)
         generator.generate_ieee_early_access_links(output_basename)
@@ -87,11 +97,11 @@ def run_generate_j_monthly(
     path_conferences_journals_json: str,
 ):
     # Expand and normalize file paths
-    path_monthly_docs = expand_path(path_monthly_docs)
+    path_monthly_docs, path_spidering_bibs = expand_paths(path_monthly_docs, path_spidering_bibs)
 
-    _, path_spidering_bibs, path_conferences_journals_json, full_json_c, full_json_j, full_json_k, options_ = (
-        run_generate_base(options, "", path_spidering_bibs, path_conferences_journals_json)
-    )
+    # Update options
+    options_ = build_base_options([], [], ["arXiv"], [], path_conferences_journals_json)
+    options_.update(options)
 
     # Generate md and html files
     for gc in ["generate_data", "combine_data"]:
@@ -110,6 +120,11 @@ def run_generate_j_monthly(
 
     # Generate links
     for keywords_category_name in keywords_category_names:
+        full_json_c, full_json_j, full_json_k = (
+            options_["full_json_c"],
+            options_["full_json_j"],
+            options_["full_json_k"],
+        )
         output_basename = os.path.join("data", "Monthly")
         generator = PaperLinksGenerator(
             full_json_c, full_json_j, full_json_k, path_monthly_docs, keywords_category_name
@@ -127,11 +142,11 @@ def run_generate_j_yearly(
     year_list: list[str],
 ):
     # Expand and normalize file paths
-    path_yearly_docs = expand_path(path_yearly_docs)
+    path_yearly_docs, path_spidered_bibs = expand_paths(path_yearly_docs, path_spidered_bibs)
 
-    path_spidered_bibs, _, path_conferences_journals_json, full_json_c, full_json_j, full_json_k, options_ = (
-        run_generate_base(options, path_spidered_bibs, "", path_conferences_journals_json)
-    )
+    # Update options
+    options_ = build_base_options([], [], ["arXiv"], [], path_conferences_journals_json)
+    options_.update(options)
 
     # Generate md and html files
     for gc in ["generate_data", "combine_data"]:
@@ -146,45 +161,17 @@ def run_generate_j_yearly(
 
     # Generate links
     for keywords_category_name in keywords_category_names:
+        full_json_c, full_json_j, full_json_k = (
+            options_["full_json_c"],
+            options_["full_json_j"],
+            options_["full_json_k"],
+        )
         output_basename = os.path.join("data", "Yearly")
         generator = PaperLinksGenerator(full_json_c, full_json_j, full_json_k, path_yearly_docs, keywords_category_name)
         generator.generate_yearly_links("Journals", output_basename)
         generator.generate_keywords_links_yearly("Journals", output_basename)
 
 
-def run_generate_base(
-    options: dict, path_spidered_bibs: str, path_spidering_bibs: str, path_conferences_journals_json: str
-):
-    # Expand and normalize file paths
-    path_spidered_bibs = expand_path(path_spidered_bibs)
-    path_spidering_bibs = expand_path(path_spidering_bibs)
-    path_conferences_journals_json = expand_path(path_conferences_journals_json)
-
-    # Configure options
-    options_ = build_base_options(
-        include_publisher_list=[],
-        include_abbr_list=[],
-        exclude_publisher_list=["arXiv"],
-        exclude_abbr_list=[],
-        path_conferences_journals_json=path_conferences_journals_json,
-    )
-    options_.update(options)
-
-    full_json_c = options_["full_json_c"]
-    full_json_j = options_["full_json_j"]
-    full_json_k = options_["full_json_k"]
-
-    return (
-        path_spidered_bibs,
-        path_spidering_bibs,
-        path_conferences_journals_json,
-        full_json_c,
-        full_json_j,
-        full_json_k,
-        options_
-    )
-
-
 def run_generate_c_yearly(
     options: dict,
     path_yearly_docs: str,
@@ -194,11 +181,11 @@ def run_generate_c_yearly(
     year_list: list[str],
 ):
     # Expand and normalize file paths
-    path_yearly_docs = expand_path(path_yearly_docs)
+    path_yearly_docs, path_spidered_bibs = expand_paths(path_yearly_docs, path_spidered_bibs)
 
-    path_spidered_bibs, _, path_conferences_journals_json, full_json_c, full_json_j, full_json_k, options_ = (
-        run_generate_base(options, path_spidered_bibs, "", path_conferences_journals_json)
-    )
+    # Update options
+    options_ = build_base_options([], [], ["arXiv"], [], path_conferences_journals_json)
+    options_.update(options)
 
     # Generate md and html files
     for gc in ["generate_data", "combine_data"]:
@@ -213,6 +200,11 @@ def run_generate_c_yearly(
 
     # Generate links
     for keywords_category_name in keywords_category_names:
+        full_json_c, full_json_j, full_json_k = (
+            options_["full_json_c"],
+            options_["full_json_j"],
+            options_["full_json_k"],
+        )
         output_basename = os.path.join("data", "Yearly")
         generator = PaperLinksGenerator(full_json_c, full_json_j, full_json_k, path_yearly_docs, keywords_category_name)
         generator.generate_yearly_links("Conferences", output_basename)

pyeasyphd/scripts/run_search.py

@@ -6,7 +6,7 @@ from pybibtexer.tools import compare_bibs_with_zotero
 
 from pyeasyphd.tools import Searchkeywords
 
-from ._base import build_base_options, build_search_options, expand_path
+from ._base import build_base_options, build_search_options, expand_path, expand_paths
 
 
 def run_search_for_screen(
@@ -29,9 +29,9 @@ def run_search_for_screen(
         path_conferences_journals_json: Path to conferences/journals JSON files
     """
     # Expand and normalize file paths
-    path_spidered_bibs = expand_path(path_spidered_bibs)
-    path_spidering_bibs = expand_path(path_spidering_bibs)
-    path_conferences_journals_json = expand_path(path_conferences_journals_json)
+    path_spidered_bibs, path_spidering_bibs, path_conferences_journals_json = expand_paths(
+        path_spidered_bibs, path_spidering_bibs, path_conferences_journals_json
+    )
 
     # Configure search options
     options = {
@@ -72,9 +72,9 @@ def run_search_for_files(
     """
     # Expand and normalize file paths
     path_main_output = expand_path(path_main_output)
-    path_spidered_bibs = expand_path(path_spidered_bibs)
-    path_spidering_bibs = expand_path(path_spidering_bibs)
-    path_conferences_journals_json = expand_path(path_conferences_journals_json)
+    path_spidered_bibs, path_spidering_bibs, path_conferences_journals_json = expand_paths(
+        path_spidered_bibs, path_spidering_bibs, path_conferences_journals_json
+    )
 
     # Configure search options
     options = {

{pyeasyphd-0.3.8.dist-info → pyeasyphd-0.3.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyeasyphd
-Version: 0.3.8
+Version: 0.3.10
 Summary: pyeasyphd
 License: GPL-3.0-or-later
 License-File: LICENSE

{pyeasyphd-0.3.8.dist-info → pyeasyphd-0.3.10.dist-info}/RECORD

@@ -26,13 +26,15 @@ pyeasyphd/main/python_run_tex.py,sha256=9Syu8qRjPXN3gEabfRUWxwTFBm_izIcB4yFhsz3Q
 pyeasyphd/pyeasyphd.py,sha256=OAwbwq2rSXLSk2AoTAF8hmlOMRSRfvDn1Uqk-zkuqH8,3470
 pyeasyphd/pyeasyphd.sublime-settings,sha256=KcXx3DjyVf8UfnB4FP4u-jaTQU3Cuj24OvxGCZvXAsw,3135
 pyeasyphd/pyeasyphd.sublime-syntax,sha256=pXylbA-tye-K5dCTjEJLFVRqtY1T7AgWZ4laxo-dnaE,73
-pyeasyphd/scripts/__init__.py,sha256=3X112jjcmFaOuklm_5g6PQacPQAnMQtLfBicaDGGr5E,780
-pyeasyphd/scripts/_base.py,sha256=YY8dmqBN8mBW1Opu0A5Usd_j2RSeMIxht5kXHrQaBFo,2232
+pyeasyphd/scripts/__init__.py,sha256=iZ5LfEIdN0IQHD9veiqk9Tooti1CHV0D64Nl3zed-gk,1134
+pyeasyphd/scripts/_base.py,sha256=v4RhrUBZ4Hz-tzhXwoVFSrtzlp6Ps9AL7EkXyWz3TOc,2428
 pyeasyphd/scripts/run_article_md.py,sha256=ZjdO03YRDokSqo-Rffby-1p6_P35N4amERKHe4yS6_0,4127
 pyeasyphd/scripts/run_article_tex.py,sha256=TuTEQk7y-Ykos3a_mlEJzyFnT9RKsAYjGXnwHJa5cjY,4672
 pyeasyphd/scripts/run_beamer_tex.py,sha256=UUOadRfmyWGfK__9NzJIUo1lAiDRB5edxRsfhrS3Ejo,4209
-pyeasyphd/scripts/run_generate.py,sha256=pTLg2Bq-gOnvhwDjCeuLnOFl8T7hPYEC5a7rWEMg3AA,8959
-pyeasyphd/scripts/run_search.py,sha256=DPpFcctEuzHCBZQdoGsETzqtIq_dfcMfEPd5lUTNKHg,8106
+pyeasyphd/scripts/run_compare.py,sha256=dNZxDy_mIqvOpOwB2xkLcF6VF1cf8J2yvWk-wrYJndU,1437
+pyeasyphd/scripts/run_format.py,sha256=-289mzLLNrPeBogQlc36Aw9AWMUkV3KwLc2QwkJtqYM,1215
+pyeasyphd/scripts/run_generate.py,sha256=RZ2683tZ5hi0VtHU_i2HqetHw5AhKSnUsO6clSxytSY,8679
+pyeasyphd/scripts/run_search.py,sha256=KPL-qACo_m20b8YU5MtlWB6Fe8c2IJOHpVUe_wcvV2k,8082
 pyeasyphd/tools/__init__.py,sha256=u1MZu_JjVac3HhEmcSTwroS83UVu0W5Vspy3Wu_-GH8,496
 pyeasyphd/tools/generate/generate_from_bibs.py,sha256=Dp1MyADwIRb9qFTFOkMPJLaeeh7NBjuiSLBN7smP2eo,7640
 pyeasyphd/tools/generate/generate_html.py,sha256=JzUEqgTVCaFzd4hXTYUEf0cVSO1QRe0nVUS72W6oyyU,5349
@@ -46,7 +48,7 @@ pyeasyphd/tools/search/search_keywords.py,sha256=YCurXuoYeU1ftve0cb8Hcn_g2FXCXf7
 pyeasyphd/tools/search/search_writers.py,sha256=Dz6D8m17R7x8NT7_PCjwmzlq29AfUz-N6sjyCguDTo4,15702
 pyeasyphd/tools/search/utils.py,sha256=bo7xtIZu31dQvjol1lwyWq1t6ldbw28oondwK8VbAqk,7562
 pyeasyphd/utils/utils.py,sha256=kWxzzgNwz77K9Q7j-RKTaoPpxqiVLVtaBMMhLuEenwE,3128
-pyeasyphd-0.3.8.dist-info/METADATA,sha256=e_gvZv3rIz0OyESQZ8hsaP9mrfyFL_0k304xmmfqhXc,985
-pyeasyphd-0.3.8.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-pyeasyphd-0.3.8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pyeasyphd-0.3.8.dist-info/RECORD,,
+pyeasyphd-0.3.10.dist-info/METADATA,sha256=6MIQRik0Rs5kQv9u-FM2i7w5jOI8OoBZp7zKJHY8SmE,986
+pyeasyphd-0.3.10.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+pyeasyphd-0.3.10.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pyeasyphd-0.3.10.dist-info/RECORD,,