markdown-img-icexmoon 0.3.9__tar.gz → 1.0.0__tar.gz

{markdown-img-icexmoon-0.3.9 → markdown_img_icexmoon-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: markdown-img-icexmoon
-Version: 0.3.9
+Version: 1.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
@@ -12,6 +12,13 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: requests
+Requires-Dist: cos-python-sdk-v5
+Requires-Dist: qiniu
+Requires-Dist: upyun
+Requires-Dist: Pillow
+Requires-Dist: tinify
+Dynamic: license-file
 
 # Markdown-img User's Guide
 
@@ -35,6 +42,10 @@ English | [**简体中文**](https://github.com/icexmoon/markdown-img/blob/maste
   - [**Update the image bed acess token**](https://github.com/icexmoon/markdown-img#update-the-image-bed-access-token)
   - [**Scan images and create indexes**](https://github.com/icexmoon/markdown-img#scan-images-and-create-indexes)
   - [**Refreshing a copy of the image bed**](https://github.com/icexmoon/markdown-img#refreshing-a-copy-of-the-image-bed)
+  - [**Backing up the system configuration**](https://github.com/icexmoon/markdown-img#backing-up-the-system-configuration)
+  - [**List saved configurations**](https://github.com/icexmoon/markdown-img#list-saved-configurations)
+  - [**Replacing configurations**](https://github.com/icexmoon/markdown-img#replacing-configurations)
+  - [**Relative path image**](https://github.com/icexmoon/markdown-img#relative-path-image)
 - [**Acknowledgements**](https://github.com/icexmoon/markdown-img#acknowledgements)
 - [**Update Log**](https://github.com/icexmoon/markdown-img#update-log)
 
@@ -240,6 +251,19 @@ pymdimg --change_config xxx
 
 where `xxx` is the file name of the saved configuration you want to replace. To see what saved configurations are available, please use [Function: List saved configurations]. In addition, it is better to save the current configuration before using this function.
 
+### Relative path image
+
+You can process the MD file using absolute path pictures to use relative path pictures, and the program will copy the original pictures to the images subdirectory of the current directory as relative path pictures.
+
+The purpose of this function is to provide convenience for some cross-platform, multi-device users, using relative paths, raw images and MD files can be easily moved, or using a synchronization service similar to Nut Cloud for multi-device synchronization.
+
+```shell
+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.
+
 
 ## Acknowledgements
 
@@ -296,3 +320,7 @@ Fix the bug that can't create img dir normally in Linux.
 ### 0.3.9
 
 Added the function to modify the absolute path image in the MD file to relative path.
+
+### 0.4.0
+
+Added the support to fengzhen image bed.

markdown-img-icexmoon-0.3.9/src/markdown_img_icexmoon.egg-info/PKG-INFO → markdown_img_icexmoon-1.0.0/README.md

@@ -1,18 +1,3 @@
-Metadata-Version: 2.1
-Name: markdown-img-icexmoon
-Version: 0.3.9
-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)
@@ -35,6 +20,10 @@ English | [**简体中文**](https://github.com/icexmoon/markdown-img/blob/maste
   - [**Update the image bed acess token**](https://github.com/icexmoon/markdown-img#update-the-image-bed-access-token)
   - [**Scan images and create indexes**](https://github.com/icexmoon/markdown-img#scan-images-and-create-indexes)
   - [**Refreshing a copy of the image bed**](https://github.com/icexmoon/markdown-img#refreshing-a-copy-of-the-image-bed)
+  - [**Backing up the system configuration**](https://github.com/icexmoon/markdown-img#backing-up-the-system-configuration)
+  - [**List saved configurations**](https://github.com/icexmoon/markdown-img#list-saved-configurations)
+  - [**Replacing configurations**](https://github.com/icexmoon/markdown-img#replacing-configurations)
+  - [**Relative path image**](https://github.com/icexmoon/markdown-img#relative-path-image)
 - [**Acknowledgements**](https://github.com/icexmoon/markdown-img#acknowledgements)
 - [**Update Log**](https://github.com/icexmoon/markdown-img#update-log)
 
@@ -240,6 +229,19 @@ pymdimg --change_config xxx
 
 where `xxx` is the file name of the saved configuration you want to replace. To see what saved configurations are available, please use [Function: List saved configurations]. In addition, it is better to save the current configuration before using this function.
 
+### Relative path image
+
+You can process the MD file using absolute path pictures to use relative path pictures, and the program will copy the original pictures to the images subdirectory of the current directory as relative path pictures.
+
+The purpose of this function is to provide convenience for some cross-platform, multi-device users, using relative paths, raw images and MD files can be easily moved, or using a synchronization service similar to Nut Cloud for multi-device synchronization.
+
+```shell
+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.
+
 
 ## Acknowledgements
 
@@ -296,3 +298,7 @@ Fix the bug that can't create img dir normally in Linux.
 ### 0.3.9
 
 Added the function to modify the absolute path image in the MD file to relative path.
+
+### 0.4.0
+
+Added the support to fengzhen image bed.

{markdown-img-icexmoon-0.3.9 → markdown_img_icexmoon-1.0.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = markdown-img-icexmoon
-version = 0.3.9
+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.3.9 → markdown_img_icexmoon-1.0.0}/src/markdown_img/config.py

@@ -16,6 +16,7 @@ class Config():
     PARAM_QCLOUD_INFO = 'qcloud_info'
     PARAM_QINIU_INFO = "qiniu_info"
     PARAM_UPYUN_INFO = "upyun_info"
+    PARAM_FZ_INFO = "fz_info"
     PARAM_URL_ENCODE_MODE = 'url_encode_mode'
     PARAM_LANGUAGE = 'language'
     PARAM_COMPRESS = "compress"
@@ -42,6 +43,8 @@ class Config():
     UPYUN_INFO_PASSWORD = "password"
     UPYUN_INFO_DIR = "dir"
     UPYUN_INFO_DOMAIN = "domain"
+    FZ_INFO_PHONE = 'phone'
+    FZ_INFO_PWD = 'pwd'
     IMG_SERVICE_YUJIAN = 'yujian'
     IMG_SERVICE_SMMS = 'smms'
     IMG_SERVICE_RRUU = 'rruu'
@@ -61,6 +64,7 @@ class Config():
     IMG_SERVICE_BKIMG = "bkimg"
     IMG_SERVICE_MUKE = "muke"
     IMG_SERVICE_UPYUN = "upyun"
+    IMG_SERVICE_FZ = "fz"
     # 图片压缩相关配置
     COMPRESS_INFO_STATUS = "status"
     COMPRESS_INFO_LIMIT = "limit"
@@ -255,7 +259,7 @@ class Config():
         if info == '':
             raise UserException(UserException.CODE_NO_QINIU_INFO)
         return info
-
+    
     def writeSmmsToken(self, token: str):
         with open(file=self.getSmmsTokenFile(), mode='w') as configFileOpen:
             print(token, file=configFileOpen)

{markdown-img-icexmoon-0.3.9 → markdown_img_icexmoon-1.0.0}/src/markdown_img/globalization.py

@@ -49,6 +49,9 @@ class Globalization:
               "image_web_configs_changed": "图床配置已更新",
               "input_error_and_hint": "输入的值{}不合法，请阅读帮助文档。",
               "related_configs_changed": "相关配置已更新",
+              "fz_info_required": "缺少风筝图床相关配置，请输入",
+              "fz_info_phone":"手机号",
+              "fz_info_pwd":"密码",
               "qiniu_info_saved": "七牛云的相关信息已保存，请重新运行程序",
               "qiniu_info_required": "缺少七牛云的相关配置，请按提示输入",
               "qiniu_access_key_input": "请输入七牛云存储的access_key",
@@ -195,6 +198,9 @@ class Globalization:
               "current_operation_success": "Current operation executed successfully",
               "config_name": "Config name",
               "create_time": "Create time",
+              "fz_info_required": "Requre FZ image bed config, please enter",
+              "fz_info_phone":"phone",
+              "fz_info_pwd":"password",
               }
 
     def __new__(cls) -> Any:

{markdown-img-icexmoon-0.3.9 → markdown_img_icexmoon-1.0.0}/src/markdown_img/help.info

@@ -18,6 +18,7 @@
     qcloud  腾讯云对象存储（需要提供必要连接信息）
     qiniu   七牛云（需要提供必要连接信息）
     upyun   又拍云（需要提供必要连接信息）
+    fz      风筝图床（需要提供必要的连接信息）
     bilibili,sougou,huluxia,catbox,360,postimages,ai58,gtimg,bkimg,muke
 -c  --change_token 替换图床访问令牌
     this    当前图床

{markdown-img-icexmoon-0.3.9 → markdown_img_icexmoon-1.0.0}/src/markdown_img/help_en.info

@@ -18,6 +18,7 @@
     qcloud  Tencent Cloud Object Storage (required to provide necessary connection information)
     qiniu   Qiniu Cloud (required to provide necessary connection information)
     upyun   UPYun Cloud (required to provide necessary connection information)
+    fz      fengzhen image bed (required to provide necessary connection information)
     bilibili,sougou,huluxia,catbox,360,postimages,ai58,gtimg,bkimg,muke
 -c  --change_token Replace the image bed access token.
     this    current image bed.

markdown_img_icexmoon-1.0.0/src/markdown_img/img_service/fz_img_service.py

@@ -0,0 +1,107 @@
+from .img_service import ImgService
+import requests
+from ..config import Config
+from ..user_exception import UserException
+import json
+from typing import Any
+
+
+class FzImgService(ImgService):
+    '''风筝图床'''
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.sysConfig = Config.getInstance()
+
+    def __getToken(self):
+        if hasattr(self, "__token"):
+            return self.__token
+        phone = self.__getInfo('phone')
+        pwd = self.__getInfo('pwd')
+        self.__token = self.__login(phone, pwd)
+        return self.__token
+
+    def __login(self, phone: str, pwd: str) -> str:
+        '''登录并获取token'''
+        r = requests.post('https://imgbed.link/imgbed/user/login',
+                          data={'phoneNum': phone, 'pwd': pwd})
+        try:
+            respJson = r.json()
+        except json.decoder.JSONDecodeError as e:
+            self.sysConfig.writeErrorLog("接口解析错误："+str(e)+"\n返回信息："+r.text)
+            raise UserException(UserException.CODE_UPLOAD_ERROR)
+        except Exception as e:
+            self.sysConfig.writeErrorLog("未知的接口调用错误:"+str(e))
+            raise UserException(UserException.CODE_UPLOAD_ERROR)
+        if respJson['code'] != 0:
+            raise UserException(
+                UserException.CODE_UPLOAD_ERROR, '接口调用出错：'+respJson['msg'])
+        return respJson['token']
+
+    def __getInfo(self, key: str) -> Any:
+        info = self.getConfigInfo()
+        if key in info:
+            return info[key]
+        raise UserException(UserException.CODE_OTHER, '缺少图床配置：'+key)
+
+    def getConfigInfo(self) -> dict:
+        sysConfig = Config.getInstance()
+        info = sysConfig.getConfigParam(Config.PARAM_FZ_INFO)
+        if info == '':
+            raise UserException(UserException.CODE_NO_IMG_SERVICE_CONFIG)
+        return info
+
+    def upload(self, localImg: str) -> str:
+        url = "https://imgbed.link/imgbed/file/upload"
+        payload = {}
+        imgOpen = open(localImg, 'rb')
+        files = {'file': imgOpen}
+        headers = {
+            'User-Agent': 'Apifox/1.0.0 (https://www.apifox.cn)',
+            'token': self.__getToken()
+        }
+
+        r = requests.request("POST", url, headers=headers,
+                             data=payload, files=files)
+        imgOpen.close()
+        try:
+            respJson = r.json()
+        except json.decoder.JSONDecodeError as e:
+            self.sysConfig.writeErrorLog("接口解析错误："+str(e)+"\n返回信息："+r.text)
+            raise UserException(UserException.CODE_UPLOAD_ERROR)
+        except Exception as e:
+            self.sysConfig.writeErrorLog("未知的接口调用错误:"+str(e))
+            raise UserException(UserException.CODE_UPLOAD_ERROR)
+        return respJson['rows'][0]['url']
+    
+    def inputConfig(self) -> None:
+        info = {}
+        print(self.globalization.getTextWithColon("fz_info_required"))
+        info[Config.FZ_INFO_PHONE] = input(
+            self.globalization.getTextWithColon("fz_info_phone"))
+        info[Config.FZ_INFO_PWD] = input(
+            self.globalization.getTextWithColon("fz_info_pwd"))
+        sysConfig = self.sysConfig
+        sysConfig.setConfigParam(Config.PARAM_FZ_INFO, info)
+        sysConfig.writeMainConfig()
+        print(self.globalization.getText("config_info_saved"))
+
+    def inputNewConfig(self) -> None:
+        info = {}
+        info[Config.FZ_INFO_PHONE] = input(
+            self.globalization.getTextWithColon("fz_info_phone"))
+        info[Config.FZ_INFO_PWD] = input(
+            self.globalization.getTextWithColon("fz_info_pwd"))
+        sysConfig = self.sysConfig
+        sysConfig.setConfigParam(Config.PARAM_FZ_INFO, info)
+        sysConfig.writeMainConfig()
+        print(self.globalization.getText("config_info_saved"))
+
+    def getConfigInfoText(self) -> tuple:
+        lines = list()
+        info = self.getConfigInfo()
+        lines.append(self.globalization.getTextWithParam(
+            "fz_info_phone", info[Config.FZ_INFO_PHONE]))
+        lines.append(self.globalization.getTextWithParam(
+            "fz_info_pwd", info[Config.FZ_INFO_PWD]))
+        return tuple(lines)

{markdown-img-icexmoon-0.3.9 → markdown_img_icexmoon-1.0.0}/src/markdown_img/img_service_manager.py

@@ -7,6 +7,7 @@ from .img_service.qcloud_img_service import QcloudImgService
 from .img_service.qiniu_img_service import QiniuImgService
 from .img_service.smms_img_service import SmmsImgService
 from .img_service.Upyun_img_service import UpyunImgService
+from .img_service.fz_img_service import FzImgService
 
 
 class ImgServiceManager:
@@ -72,6 +73,8 @@ class ImgServiceManager:
             webImage = YujianImgService(YujianImgService.API_TYPE_MUKE)
         elif imgService == Config.IMG_SERVICE_UPYUN:
             webImage = UpyunImgService()
+        elif imgService == Config.IMG_SERVICE_FZ:
+            webImage = FzImgService()
         else:
             webImage = SmmsImgService()
         return webImage
@@ -86,7 +89,8 @@ class ImgServiceManager:
                             Config.IMG_SERVICE_QCLOUD, Config.IMG_SERVICE_QINIU, Config.IMG_SERVICE_BILIBILI,
                             Config.IMG_SERVICE_SOUGOU, Config.IMG_SERVICE_HULUXIA, Config.IMG_SERVICE_CATBOX,
                             Config.IMG_SERVICE_360, Config.IMG_SERVICE_POSTIMAGES, Config.IMG_SERVICE_AI58,
-                            Config.IMG_SERVICE_GTIMG, Config.IMG_SERVICE_BKIMG, Config.IMG_SERVICE_MUKE, Config.IMG_SERVICE_UPYUN}
+                            Config.IMG_SERVICE_GTIMG, Config.IMG_SERVICE_BKIMG, Config.IMG_SERVICE_MUKE, Config.IMG_SERVICE_UPYUN,
+                            Config.IMG_SERVICE_FZ}
         if flag in supportedService:
             return True
         return False

{markdown-img-icexmoon-0.3.9 → markdown_img_icexmoon-1.0.0}/src/markdown_img/main.py

@@ -152,7 +152,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()
         # 保存原始文件备份

{markdown-img-icexmoon-0.3.9 → markdown_img_icexmoon-1.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.3.9/README.md → markdown_img_icexmoon-1.0.0/src/markdown_img_icexmoon.egg-info/PKG-INFO

@@ -1,3 +1,25 @@
+Metadata-Version: 2.4
+Name: markdown-img-icexmoon
+Version: 1.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
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: requests
+Requires-Dist: cos-python-sdk-v5
+Requires-Dist: qiniu
+Requires-Dist: upyun
+Requires-Dist: Pillow
+Requires-Dist: tinify
+Dynamic: license-file
+
 # Markdown-img User's Guide
 
 English | [**简体中文**](https://github.com/icexmoon/markdown-img/blob/master/README_cn.md)
@@ -20,6 +42,10 @@ English | [**简体中文**](https://github.com/icexmoon/markdown-img/blob/maste
   - [**Update the image bed acess token**](https://github.com/icexmoon/markdown-img#update-the-image-bed-access-token)
   - [**Scan images and create indexes**](https://github.com/icexmoon/markdown-img#scan-images-and-create-indexes)
   - [**Refreshing a copy of the image bed**](https://github.com/icexmoon/markdown-img#refreshing-a-copy-of-the-image-bed)
+  - [**Backing up the system configuration**](https://github.com/icexmoon/markdown-img#backing-up-the-system-configuration)
+  - [**List saved configurations**](https://github.com/icexmoon/markdown-img#list-saved-configurations)
+  - [**Replacing configurations**](https://github.com/icexmoon/markdown-img#replacing-configurations)
+  - [**Relative path image**](https://github.com/icexmoon/markdown-img#relative-path-image)
 - [**Acknowledgements**](https://github.com/icexmoon/markdown-img#acknowledgements)
 - [**Update Log**](https://github.com/icexmoon/markdown-img#update-log)
 
@@ -225,6 +251,19 @@ pymdimg --change_config xxx
 
 where `xxx` is the file name of the saved configuration you want to replace. To see what saved configurations are available, please use [Function: List saved configurations]. In addition, it is better to save the current configuration before using this function.
 
+### Relative path image
+
+You can process the MD file using absolute path pictures to use relative path pictures, and the program will copy the original pictures to the images subdirectory of the current directory as relative path pictures.
+
+The purpose of this function is to provide convenience for some cross-platform, multi-device users, using relative paths, raw images and MD files can be easily moved, or using a synchronization service similar to Nut Cloud for multi-device synchronization.
+
+```shell
+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.
+
 
 ## Acknowledgements
 
@@ -280,4 +319,8 @@ Fix the bug that can't create img dir normally in Linux.
 
 ### 0.3.9
 
-Added the function to modify the absolute path image in the MD file to relative path.
+Added the function to modify the absolute path image in the MD file to relative path.
+
+### 0.4.0
+
+Added the support to fengzhen image bed.

{markdown-img-icexmoon-0.3.9 → markdown_img_icexmoon-1.0.0}/src/markdown_img_icexmoon.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ src/markdown_img/compress/tinypng_compress_service.py
 src/markdown_img/img_service/Upyun_img_service.py
 src/markdown_img/img_service/__init__.py
 src/markdown_img/img_service/bilibili_img_service.py
+src/markdown_img/img_service/fz_img_service.py
 src/markdown_img/img_service/img_service.py
 src/markdown_img/img_service/none_img_service.py
 src/markdown_img/img_service/qcloud_img_service.py
@@ -44,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-1.0.0/tests/test.py

@@ -0,0 +1,12 @@
+import sys
+sys.path.insert(-2, "D:\\workspace\\markdown-img2\\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)