v1.1 release

jackzhenguo · jackzhenguo · commit 979e3f741aee · 2019-12-22T18:44:04.000+08:00
diff --git a/README.md b/README.md
diff --git a/data/test_excel.xlsx b/data/test_excel.xlsx
diff --git a/md/README.md b/md/README.md
@@ -70,6 +70,7 @@
 7. [文件批量压缩](文件批量压缩.md)
 8. [文件读写操作](文件读写操作.md)
 9. [字符串32位加密](字符串32位加密.md)
+10. [寻找前10大的文件](找出前10大的文件.md)
 
 
 #### 七、字符串、正则和爬虫
@@ -83,6 +84,7 @@
 8. [字符串32位加密](字符串32位加密.md)
 9. [反转字符串](反转字符串1.md)
 10. [分词并保存结果](分词并保存结果.md)
+11. [求字符串的字节长度](求字符串的字节长度.md)
 
 ####  八、绘图
 
diff --git a/md/使用calendar.md b/md/使用calendar.md
@@ -0,0 +1,33 @@
+```python
+from datetime import date, datetime
+import calendar
+
+
+def print_mydate(mydate):
+    print(f'输入的日期:{mydate}\n')
+
+    year_calendar_str = calendar.calendar(mydate.year)
+    print(f"{mydate.year}年的日历图：{year_calendar_str}\n")
+
+    is_leap = calendar.isleap(mydate.year)
+    print_leap_str = "%s年是闰年" if is_leap else "%s年不是闰年\n"
+    print(print_leap_str % mydate.year)
+
+    month_calendar_str = calendar.month(mydate.year, mydate.month)
+    print(f"{mydate.year}年-{mydate.month}月的日历图：{month_calendar_str}\n")
+
+    weekday, days = calendar.monthrange(mydate.year, mydate.month)
+    print(f'{mydate.year}年-{mydate.month}月的第一天是那一周的第{weekday}天\n')
+    print(f'{mydate.year}年-{mydate.month}月共有{days}天\n')
+
+    month_first_day = date(mydate.year, mydate.month, 1)
+    print(f"当月第一天:{month_first_day}\n")
+
+    month_last_day = date(mydate.year, mydate.month, days)
+    print(f"当月最后一天:{month_last_day}\n")
+
+
+print_mydate(date.today())
+
+
+```
diff --git a/md/求字符串的字节长度.md b/md/求字符串的字节长度.md
@@ -9,3 +9,4 @@ def str_byte_len(mystr):
 
 str_byte_len('i love python')  # 13(个字节)
 str_byte_len('字符')  # 6(个字节)
+```
diff --git a/src/convert.py b/src/convert.py
@@ -13,18 +13,18 @@ def convert(input_file):
     print(f'begin to convert {filename}...')
     process = api.convert({
         'inputformat': 'md',
-        'outputformat': 'rst',
+        'outputformat': 'pdf',
         'input': 'upload',
-        'file': open('./md2/{}'.format(input_file), 'rb')
+        'file': open('./{}'.format(input_file), 'rb')
     })
     process.wait()  # wait until conversion finished
     # download output file
 
     process.download(
-        "./rst/tmp/{}.rst".format(filename))
+        "./tmp/{}.pdf".format(filename))
     print(f"convert {filename} success")
 
 
-for input_file in os.listdir('./md2'):
+for input_file in os.listdir('.'):
     convert(input_file)
-    time.sleep(1)
+    # time.sleep(1)
diff --git a/src/datetime2_cal.py b/src/datetime2_cal.py
@@ -0,0 +1,16 @@
+from datetime import date, datetime
+from time import localtime, strftime, strptime
+
+
+today_date = date.today()
+print(today_date)  # 2019-12-22
+
+today_time = datetime.today()
+print(today_time)  # 2019-12-22 18:02:33.398894
+
+local_time = localtime()
+print(strftime("%Y-%m-%d %H:%M:%S", local_time))  # 转化为定制的格式
+
+# parse str time to struct time
+struct_time = strptime('2019-12-22 10:10:08', "%Y-%m-%d %H:%M:%S")
+print(strftime("%m-%d-%Y %H:%M:%S", struct_time))  # 转化为定制的格式
diff --git a/src/datetime_cal.py b/src/datetime_cal.py
@@ -0,0 +1,29 @@
+from datetime import date, datetime
+import calendar
+
+
+def print_mydate(mydate):
+    print(f'输入的日期:{mydate}\n')
+
+    year_calendar_str = calendar.calendar(mydate.year)
+    print(f"{mydate.year}年的日历图：{year_calendar_str}\n")
+
+    is_leap = calendar.isleap(mydate.year)
+    print_leap_str = "%s年是闰年" if is_leap else "%s年不是闰年\n"
+    print(print_leap_str % mydate.year)
+
+    month_calendar_str = calendar.month(mydate.year, mydate.month)
+    print(f"{mydate.year}年-{mydate.month}月的日历图：{month_calendar_str}\n")
+
+    weekday, days = calendar.monthrange(mydate.year, mydate.month)
+    print(f'{mydate.year}年-{mydate.month}月的第一天是那一周的第{weekday}天\n')
+    print(f'{mydate.year}年-{mydate.month}月共有{days}天\n')
+
+    month_first_day = date(mydate.year, mydate.month, 1)
+    print(f"当月第一天:{month_first_day}\n")
+
+    month_last_day = date(mydate.year, mydate.month, days)
+    print(f"当月最后一天:{month_last_day}\n")
+
+
+print_mydate(date.today())
diff --git a/src/walk_dir.py b/src/walk_dir.py
@@ -0,0 +1,21 @@
+# 获取目录下文件的修改时间
+import os
+from datetime import datetime
+print(f"当前时间：{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}")
+
+
+def get_modify_datetime(indir):
+    for root, _, files in os.walk(indir):  # 循环D:\works目录和子目录
+        for file in files:
+            absfile = os.path.join(root, file)
+            modtime = datetime.fromtimestamp(os.path.getmtime(absfile))
+            now = datetime.now()
+            difftime = now-modtime
+            if difftime.days < 20:  # 条件筛选超过指定时间的文件
+                print(f"""{absfile}
+                    修改时间[{modtime.strftime('%Y-%m-%d %H:%M:%S')}]
+                    距今[{difftime.days:3d}天{difftime.seconds//3600:2d}时{difftime.seconds%3600//60:2d}]"""
+                      )  # 打印相关信息
+
+
+get_modify_datetime('./data')
diff --git a/src/xls_to_xlsx.py b/src/xls_to_xlsx.py
@@ -0,0 +1,26 @@
+import os
+
+
+def xls_to_xlsx(work_dir):
+    """
+    传递当前目录，原来后缀名，新的后缀名后，批量重命名后缀
+    """
+    old_ext, new_ext = '.xls', '.xlsx'
+    for filename in os.listdir(work_dir):
+        # 获取得到文件后缀
+        split_file = os.path.splitext(filename)
+        file_ext = split_file[1]
+        # 定位后缀名为old_ext 的文件
+        if old_ext == file_ext:
+            # 修改后文件的完整名称
+            newfile = split_file[0] + new_ext
+            # 实现重命名操作
+            os.rename(
+                os.path.join(work_dir, filename),
+                os.path.join(work_dir, newfile)
+            )
+    print("完成重命名")
+    print(os.listdir(work_dir))
+
+
+xls_to_xlsx('./data')

Original file line number	Diff line number	Diff line change
`@@ -9,3 +9,4 @@ def str_byte_len(mystr):`
`9`	`9`
`10`	`10`	`str_byte_len('i love python') # 13(个字节)`
`11`	`11`	`str_byte_len('字符') # 6(个字节)`
	`12`	+```