markdown-img-icexmoon 0.4.0__tar.gz → 2.0.0__tar.gz

{markdown-img-icexmoon-0.4.0 → markdown_img_icexmoon-2.0.0}/PKG-INFO

@@ -1,17 +1,46 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: markdown-img-icexmoon
-Version: 0.4.0
+Version: 2.0.0
 Summary: A program for find and upload images in markdown file and will replace them.
 Home-page: https://github.com/icexmoon/markdown-img
 Author: icexmoon
 Author-email: icexmoon@qq.com
-Project-URL: Bug Tracker, https://github.com/icexmoon/markdown-img/issues
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
+License: Copyright (c) 2018 The Python Packaging Authority
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+Project-URL: homepage, https://github.com/icexmoon/markdown-img
+Project-URL: documentation, https://github.com/icexmoon/markdown-img
+Project-URL: repository, https://github.com/icexmoon/markdown-img
+Project-URL: changelog, https://github.com/icexmoon/markdown-img
+Keywords: markdown,image
+Classifier: Programming Language :: Python
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
+Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: cos-python-sdk-v5>=1.9.41
+Requires-Dist: pillow>=12.1.0
+Requires-Dist: qiniu>=7.17.0
+Requires-Dist: requests>=2.32.5
+Requires-Dist: tinify>=1.7.1
+Requires-Dist: upyun>=2.5.5
+Dynamic: license-file
 
 # Markdown-img User's Guide
 
@@ -257,6 +286,17 @@ pymdimg -m relative_img
 > - In order to avoid the corruption of the original MD file caused by program errors, one original file will be kept and backed up in the backup subdirectory.
 > - Because of the difference between Windows and Linux platform separators, there is no guarantee that the relative directories of both will behave properly.
 
+## Secondary Development
+
+The development toolchain has been migrated to uv. For the installation and usage of uv, you can refer to [Python Package Management Tool UV](https://blog.icexmoon.cn/archives/805.html).
+
+You can run the test code in the project's root directory using the following command:
+
+```
+uv run test.py
+```
+
+The test directory is located at `tests`, and you need to prepare the test files and data yourself. For reference, you can look at the `tests example`.
 
 ## Acknowledgements
 
@@ -317,3 +357,9 @@ Added the function to modify the absolute path image in the MD file to relative
 ### 0.4.0
 
 Added the support to fengzhen image bed.
+
+### 2.0.0
+
+Migrate the development workflow to uv.
+
+Optimize the display performance of the terminal on Windows, show the filenames before and after processing, and allow clicking on the filenames to jump to the corresponding files.

markdown-img-icexmoon-0.4.0/src/markdown_img_icexmoon.egg-info/PKG-INFO → markdown_img_icexmoon-2.0.0/README.md

@@ -1,18 +1,3 @@
-Metadata-Version: 2.1
-Name: markdown-img-icexmoon
-Version: 0.4.0
-Summary: A program for find and upload images in markdown file and will replace them.
-Home-page: https://github.com/icexmoon/markdown-img
-Author: icexmoon
-Author-email: icexmoon@qq.com
-Project-URL: Bug Tracker, https://github.com/icexmoon/markdown-img/issues
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
 # Markdown-img User's Guide
 
 English | [**简体中文**](https://github.com/icexmoon/markdown-img/blob/master/README_cn.md)
@@ -257,6 +242,17 @@ pymdimg -m relative_img
 > - In order to avoid the corruption of the original MD file caused by program errors, one original file will be kept and backed up in the backup subdirectory.
 > - Because of the difference between Windows and Linux platform separators, there is no guarantee that the relative directories of both will behave properly.
 
+## Secondary Development
+
+The development toolchain has been migrated to uv. For the installation and usage of uv, you can refer to [Python Package Management Tool UV](https://blog.icexmoon.cn/archives/805.html).
+
+You can run the test code in the project's root directory using the following command:
+
+```
+uv run test.py
+```
+
+The test directory is located at `tests`, and you need to prepare the test files and data yourself. For reference, you can look at the `tests example`.
 
 ## Acknowledgements
 
@@ -317,3 +313,9 @@ Added the function to modify the absolute path image in the MD file to relative
 ### 0.4.0
 
 Added the support to fengzhen image bed.
+
+### 2.0.0
+
+Migrate the development workflow to uv.
+
+Optimize the display performance of the terminal on Windows, show the filenames before and after processing, and allow clicking on the filenames to jump to the corresponding files.

markdown_img_icexmoon-2.0.0/pyproject.toml

@@ -0,0 +1,33 @@
+[project]
+name = "markdown-img-icexmoon"
+version = "2.0.0"
+description = "A program for find and upload images in markdown file and will replace them."
+readme = "README.md"
+requires-python = ">=3.13"
+license = {file = "LICENSE"}
+keywords = ["markdown", "image"]
+authors = [
+  {email = "icexmoon@qq.com"},
+  {name = "icexmoon"}
+]
+classifiers = [
+  "Programming Language :: Python",
+  "Operating System :: OS Independent"
+]
+dependencies = [
+    "cos-python-sdk-v5>=1.9.41",
+    "pillow>=12.1.0",
+    "qiniu>=7.17.0",
+    "requests>=2.32.5",
+    "tinify>=1.7.1",
+    "upyun>=2.5.5",
+]
+
+[project.scripts]
+pymdimg = "markdown_img.__main__:main"
+
+[project.urls]
+homepage = "https://github.com/icexmoon/markdown-img"
+documentation = "https://github.com/icexmoon/markdown-img"
+repository = "https://github.com/icexmoon/markdown-img"
+changelog = "https://github.com/icexmoon/markdown-img"

{markdown-img-icexmoon-0.4.0 → markdown_img_icexmoon-2.0.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = markdown-img-icexmoon
-version = 0.4.0
+version = 1.0.0
 author = icexmoon
 author_email = icexmoon@qq.com
 description = A program for find and upload images in markdown file and will replace them.

{markdown-img-icexmoon-0.4.0 → markdown_img_icexmoon-2.0.0}/src/markdown_img/globalization.py

@@ -36,6 +36,7 @@ class Globalization:
               "tencent_oss_info_saved": "腾讯云OSS信息已保存，请重新运行程序",
               "undefined_error_info": "未定义错误，请联系开发者",
               "deal_success": "已成功处理markdown文件",
+              "deal_success_with_detail": "已成功处理markdown文件，原文件{}，处理后的文件{}",
               "all_file_done": "所有markdown文档已处理完毕",
               "recove_markdown_file": "已成功还原markdown文件{}的本地图库",
               "images_number_is_not_equal": "文件{}中的图片数目与备份中的数目不相符，请自行确认",
@@ -135,6 +136,7 @@ class Globalization:
               "tencent_oss_info_saved": "Tencent Cloud OSS information has been saved, please re-run the program",
               "undefined_error_info": "Undefined error, please contact the developer",
               "deal_success": "Successfully processed markdown files",
+              "deal_success_with_detail": "Successfully processed markdown files, old file {}, new file {}",
               "all_file_done": "All markdown documents have been processed",
               "recove_markdown_file": "The local gallery of markdown file {} has been successfully restored",
               "images_number_is_not_equal": "The number of images in file {} does not match the number in the backup, please check yourself",

{markdown-img-icexmoon-0.4.0 → markdown_img_icexmoon-2.0.0}/src/markdown_img/main.py

@@ -12,6 +12,7 @@ from .compress.compress_manager import CompressManager
 from .config_backup import ConfigBackup
 from .tools.file_tools import FileTools
 import shutil
+import sys
 
 
 class Main():
@@ -152,7 +153,8 @@ class Main():
                             shutil.copyfile(localImg, relativeLocalImage)
                         # 替换图片路径为相对路径
                         line = line.replace(
-                            localImg, "."+sysConfig.getPathSplit()+"images"+sysConfig.getPathSplit()+imgName)
+                            # 改为使用/而非\
+                            localImg, "."+"/"+"images"+"/"+imgName)
                 copyFileOpen.write(line)
         copyFileOpen.close()
         # 保存原始文件备份
@@ -224,7 +226,15 @@ class Main():
                         self.dealMdFile(dir, self.__createWebImgCopy)
                     except UserException as e:
                         self.dealUserException(e)
-                    print(self.globalization.getText("deal_success"), dir)
+                    # 如果是 windows 平台，优化终端显示，让显示包含文件链接
+                    if sys.platform == 'win32':
+                        absSourcePath = FileTools.getAbsolutePath(dir)
+                        sourceLink = FileTools.getWindowsTerminalPathLink(dir, absSourcePath)
+                        targetFileName = FileTools.getFileName(copyFilePath)
+                        targetLink = FileTools.getWindowsTerminalPathLink(targetFileName, copyFilePath)
+                        print(self.globalization.getText("deal_success_with_detail").format(sourceLink, targetLink))
+                    else:
+                        print(self.globalization.getText("deal_success"), dir)
         print(self.globalization.getText("all_file_done"))
 
     def outputHelpInfo(self):

{markdown-img-icexmoon-0.4.0 → markdown_img_icexmoon-2.0.0}/src/markdown_img/smms_img.py

@@ -39,6 +39,10 @@ class SmmsImg():
                 images[MAX_SAME_TIME_DEAL:len(images)], results)
 
     def uploadOne(self, localImg):
+        # 如果是 gif 而非静态图片，不压缩
+        if (localImg.endswith(".gif")):
+            imgService = ImgServiceManager.getImgService()
+            return imgService.upload(localImg)
         # 如果设置了压缩选项，进行压缩
         info = self.sysConfig.getCompressInfo()
         if(info[Config.COMPRESS_INFO_STATUS] == "on"):

{markdown-img-icexmoon-0.4.0 → markdown_img_icexmoon-2.0.0}/src/markdown_img/tools/file_tools.py

@@ -18,9 +18,9 @@ class FileTools:
         if unit == cls.SIZE_KB:
             size = size / 1024
         elif unit == cls.SIZE_MB:
-            size = size/1024/1024
+            size = size / 1024 / 1024
         elif unit == cls.SIZE_GB:
-            size = size/1024/1024/1024
+            size = size / 1024 / 1024 / 1024
         return size
 
     @classmethod
@@ -34,11 +34,26 @@ class FileTools:
 
     @classmethod
     def getFileName(cls, path: str) -> str:
-        '''返回路径中的文件名
+        """返回路径中的文件名
         path: 绝对路径或相对路径
-        '''
+        """
         if path is None:
             return None
         config = Config()
         parts = path.split(config.getPathSplit())
         return parts[-1]
+
+    @classmethod
+    def getWindowsTerminalPathLink(cls, name: str, path: str) -> str:
+        """返回Windows终端的快捷方式路径
+        name: 路径名称
+        path: 路径
+        """
+        return "\033]8;;{}\033\\{}\033]8;;\033\\".format(path, name)
+    
+    @classmethod
+    def getAbsolutePath(cls, path: str) -> str:
+        """返回绝对路径
+        path: 相对路径
+        """
+        return os.path.abspath(path)

markdown-img-icexmoon-0.4.0/README.md → markdown_img_icexmoon-2.0.0/src/markdown_img_icexmoon.egg-info/PKG-INFO

@@ -1,3 +1,47 @@
+Metadata-Version: 2.4
+Name: markdown-img-icexmoon
+Version: 2.0.0
+Summary: A program for find and upload images in markdown file and will replace them.
+Home-page: https://github.com/icexmoon/markdown-img
+Author: icexmoon
+Author-email: icexmoon@qq.com
+License: Copyright (c) 2018 The Python Packaging Authority
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+Project-URL: homepage, https://github.com/icexmoon/markdown-img
+Project-URL: documentation, https://github.com/icexmoon/markdown-img
+Project-URL: repository, https://github.com/icexmoon/markdown-img
+Project-URL: changelog, https://github.com/icexmoon/markdown-img
+Keywords: markdown,image
+Classifier: Programming Language :: Python
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.13
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: cos-python-sdk-v5>=1.9.41
+Requires-Dist: pillow>=12.1.0
+Requires-Dist: qiniu>=7.17.0
+Requires-Dist: requests>=2.32.5
+Requires-Dist: tinify>=1.7.1
+Requires-Dist: upyun>=2.5.5
+Dynamic: license-file
+
 # Markdown-img User's Guide
 
 English | [**简体中文**](https://github.com/icexmoon/markdown-img/blob/master/README_cn.md)
@@ -242,6 +286,17 @@ pymdimg -m relative_img
 > - In order to avoid the corruption of the original MD file caused by program errors, one original file will be kept and backed up in the backup subdirectory.
 > - Because of the difference between Windows and Linux platform separators, there is no guarantee that the relative directories of both will behave properly.
 
+## Secondary Development
+
+The development toolchain has been migrated to uv. For the installation and usage of uv, you can refer to [Python Package Management Tool UV](https://blog.icexmoon.cn/archives/805.html).
+
+You can run the test code in the project's root directory using the following command:
+
+```
+uv run test.py
+```
+
+The test directory is located at `tests`, and you need to prepare the test files and data yourself. For reference, you can look at the `tests example`.
 
 ## Acknowledgements
 
@@ -301,4 +356,10 @@ Added the function to modify the absolute path image in the MD file to relative
 
 ### 0.4.0
 
-Added the support to fengzhen image bed.
+Added the support to fengzhen image bed.
+
+### 2.0.0
+
+Migrate the development workflow to uv.
+
+Optimize the display performance of the terminal on Windows, show the filenames before and after processing, and allow clicking on the filenames to jump to the corresponding files.

{markdown-img-icexmoon-0.4.0 → markdown_img_icexmoon-2.0.0}/src/markdown_img_icexmoon.egg-info/SOURCES.txt

@@ -45,4 +45,5 @@ src/markdown_img_icexmoon.egg-info/SOURCES.txt
 src/markdown_img_icexmoon.egg-info/dependency_links.txt
 src/markdown_img_icexmoon.egg-info/entry_points.txt
 src/markdown_img_icexmoon.egg-info/requires.txt
-src/markdown_img_icexmoon.egg-info/top_level.txt
+src/markdown_img_icexmoon.egg-info/top_level.txt
+tests/test.py

markdown_img_icexmoon-2.0.0/src/markdown_img_icexmoon.egg-info/requires.txt

@@ -0,0 +1,6 @@
+cos-python-sdk-v5>=1.9.41
+pillow>=12.1.0
+qiniu>=7.17.0
+requests>=2.32.5
+tinify>=1.7.1
+upyun>=2.5.5

markdown_img_icexmoon-2.0.0/tests/test.py

@@ -0,0 +1,13 @@
+import sys
+sys.path.insert(-2, "D:\software\coding\python\Lib\site-packages")
+sys.path.insert(-3, "D:\\workspace\\markdown-img\\src")
+print(sys.path)
+from markdown_img.main import Main
+import os
+testFile = '.\\markdown_img\\test_image.md'
+if os.path.exists(testFile):
+    os.remove(testFile)
+main = Main()
+main.changeImgService("upyun")
+main.changeMainPrams({"compress_engine": "tinyPNG"})
+main.main(True)

markdown-img-icexmoon-0.4.0/pyproject.toml

@@ -1,6 +0,0 @@
-[build-system]
-requires = [
-    "setuptools>=42",
-    "wheel"
-]
-build-backend = "setuptools.build_meta"

markdown-img-icexmoon-0.4.0/src/markdown_img_icexmoon.egg-info/requires.txt

@@ -1,6 +0,0 @@
-requests
-cos-python-sdk-v5
-qiniu
-upyun
-Pillow
-tinify