Sourcery refactored main branch by sourcery-ai[bot] · Pull Request #1 · DAcidSolution/Daily_Nutrition

sourcery-ai · 2022-03-21T12:39:35Z

Branch main refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the main branch, then run:

git fetch origin sourcery/main
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai · 2022-03-21T12:39:37Z

check_update.py

-        if total == 0:
-            per = 1
-        else:
-            per = 1.0 * chunk * chunk_num / total
-        if per > 1:
-            per = 1
+        per = 1 if total == 0 else 1.0 * chunk * chunk_num / total
+        per = min(per, 1)


Function py_info.progressbar refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

Replace comparison with min/max call (min-max-identity)

sourcery-ai · 2022-03-21T12:39:37Z

check_update.py

-    faillist = []
-
-    for pyinfo in pylist:
-        if not pyinfo.download(rootdir=dir):
-            faillist.append(pyinfo)
-
-    return faillist
+    return [pyinfo for pyinfo in pylist if not pyinfo.download(rootdir=dir)]


Function downloadpy refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

Convert for loop into list comprehension (list-comprehension)

sourcery-ai · 2022-03-21T12:39:38Z

check_update.py

+    # 遍历获得仓库所有py文件信息
+    github_url = 'https://github.com/JohnWes7/Daily_Nutrition'
    while True:
-        # 遍历获得仓库所有py文件信息
-        github_url = 'https://github.com/JohnWes7/Daily_Nutrition'
        filelist = get_all_githubrepo_py(github_url)

        if type(filelist) == list:
            break
-        # 如果获取不到 返回false 重新获取
        else:
            input('获取仓库信息失败 回车重新尝试连接下载github\n')
-            continue


Function __main refactored with the following changes:

Hoist statements out of for/while loops (hoist-statement-from-loop)

Remove redundant continue statement (remove-redundant-continue)

Remove unnecessary else after guard condition (remove-unnecessary-else)

Use with when opening file to ensure closure (ensure-file-closed)

Simplify sequence comparison (simplify-len-comparison)

This removes the following comments ( why? ):

# 如果获取不到返回false 重新获取 # 成功跳出 # 有失败项目重新尝试 # 打开本地需要替换或者新建的位置

sourcery-ai · 2022-03-21T12:39:38Z

config.py

    def get_cookie_path():
        '''cookie文件路径'''
-        return os.path.dirname(__file__) + '/data/cookies.json'
+        return f'{os.path.dirname(__file__)}/data/cookies.json'


Function path.get_cookie_path refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-03-21T12:39:38Z

config.py

    def get_download_record_path():
        '''下载过的图的记录数据路径'''
-        return os.path.dirname(__file__) + '/data/downloadrecord.json'
+        return f'{os.path.dirname(__file__)}/data/downloadrecord.json'


Function path.get_download_record_path refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-03-21T12:39:39Z

config.py

-        if newcookies == None:
+        if newcookies is None:


Function recordcookie.update_cookies refactored with the following changes:

Use x is None rather than x == None (none-compare)

sourcery-ai · 2022-03-21T12:39:39Z

config.py

-        if oldcookie == None:
+        if oldcookie is None:


Function recordcookie.update_local_cookies refactored with the following changes:

Use x is None rather than x == None (none-compare)

sourcery-ai · 2022-03-21T12:39:39Z

config.py

-        if record == None:
+        if record is None:


Function recordcookie.append_record_pid_local refactored with the following changes:

Use x is None rather than x == None (none-compare)

sourcery-ai · 2022-03-21T12:39:40Z

config.py

-        if record == None:
+        if record is None:


Function recordcookie.contrast_with_localrecord refactored with the following changes:

Use x is None rather than x == None (none-compare)

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2022-03-21T12:39:40Z

config.py

-conf_path = os.path.dirname(__file__) + '/Config.ini'
+conf_path = f'{os.path.dirname(__file__)}/Config.ini'


Lines 266-266 refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-03-21T12:39:43Z

config.py

-        is_cover = conf.getboolean(
+        return conf.getboolean(
            ads, 'is_cover', fallback=default_setting.get('is_cover'))
-        return is_cover


Function config.get_is_cover refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2022-03-21T12:39:43Z

config.py

-        forcelogin = conf.getboolean(
+        return conf.getboolean(
            ads, 'forcelogin', fallback=default_setting.get('forcelogin'))
-        return forcelogin


Function config.get_forcelogin refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2022-03-21T12:39:43Z

config.py

-            if path[path.__len__() - 1].__eq__('/'):
-                return path
-            return path + '/'
+            return path if path[path.__len__() - 1].__eq__('/') else f'{path}/'


Function config.get_ads_download_path refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-03-21T12:39:43Z

config.py

-        is_proxies = conf.getboolean(
+        return conf.getboolean(
            link, 'is_proxies', fallback=default_setting.get('is_proxies'))
-        return is_proxies


Function config.get_is_proxies refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2022-03-21T12:39:43Z

config.py

-        proxies_dict = {
+        return {
            'http': http,
            'https': https
        }
-        return proxies_dict


Function config.get_proxies_dict refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2022-03-21T12:39:45Z

downloads.py

-            result = filename, headers
-            bs = 1024*8
-            size = -1
            read = 0
            blocknum = 0
-            if "content-length" in headers:
-                size = int(headers["Content-Length"])
-
+            result = filename, headers
+            size = int(headers["Content-Length"]) if "content-length" in headers else -1
+            bs = 1024*8


Function custom_urlretrieve refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

Move setting of default value for variable into else branch (introduce-default-else)

Move assignment closer to its usage within a block (move-assign-in-block)

sourcery-ai · 2022-03-21T12:39:45Z

downloads.py

-    if head == None:
+    if head is None:


Function dicovery_json refactored with the following changes:

Use x is None rather than x == None (none-compare)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2022-03-21T12:39:45Z

downloads.py

-    if opener == None:
-        if _opener == None:
+    if opener is None:
+        if _opener is None:
            opener = _opener = request.build_opener()
        else:
            opener = _opener
-        if head == None:
+        if head is None:


Function download_idlist refactored with the following changes:

Use x is None rather than x == None (none-compare)

sourcery-ai · 2022-03-21T12:39:45Z

downloads.py

-    if opener == None:
-        if _opener == None:
+    if opener is None:
+        if _opener is None:
            opener = _opener = request.build_opener()
        else:
            opener = _opener
-        if headers == None:
+        if headers is None:


Function download_id refactored with the following changes:

Use x is None rather than x == None (none-compare)

sourcery-ai · 2022-03-21T12:39:45Z

downloads.py

-    id_list = []
-
    re_list = jsondata.get('body').get('recommendedIllusts')
-    for item in re_list:
-        id_list.append(item.get('illustId'))
-
-    return id_list
+    return [item.get('illustId') for item in re_list]


Function parsing_tutu_data2 refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

Move assignment closer to its usage within a block (move-assign-in-block)

Convert for loop into list comprehension (list-comprehension)

sourcery-ai · 2022-03-21T12:39:46Z

Sourcery Code Quality Report

❌ Merging this PR will decrease code quality in the affected files by 0.70%.

Quality metrics	Before	After	Change
Complexity	13.37 🙂	13.70 🙂	0.33 👎
Method Length	64.26 🙂	62.84 🙂	-1.42 👍
Working memory	9.08 🙂	9.16 🙂	0.08 👎
Quality	58.72% 🙂	58.02% 🙂	-0.70% 👎

Other metrics	Before	After	Change
Lines	1489	1420	-69

Changed files	Quality Before	Quality After	Quality Change
check_update.py	53.45% 🙂	52.99% 🙂	-0.46% 👎
config.py	83.03% ⭐	83.72% ⭐	0.69% 👍
discovery.py	50.85% 🙂	49.63% 😞	-1.22% 👎
downloads.py	46.60% 😞	46.05% 😞	-0.55% 👎
src/custom_driver.py	78.43% ⭐	81.77% ⭐	3.34% 👍

Here are some functions in these files that still need a tune-up:

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
downloads.py	download_id	47 ⛔	547 ⛔	20 ⛔	8.18% ⛔	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
check_update.py	__main	25 😞	304 ⛔	10 😞	31.91% 😞	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
discovery.py	analysis_log	21 😞	214 ⛔	12 😞	35.17% 😞	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
downloads.py	illustration.download	16 🙂	195 😞	13 😞	38.72% 😞	Try splitting into smaller methods. Extract out complex expressions
downloads.py	custom_urlretrieve	15 🙂	184 😞	11 😞	43.73% 😞	Try splitting into smaller methods. Extract out complex expressions

Legend and Explanation

The emojis denote the absolute quality of the code:

⭐ excellent
🙂 good
😞 poor
⛔ very poor

The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request.

Please see our documentation here for details on how these metrics are calculated.

We are actively working on this report - lots more documentation and extra metrics to come!

Help us improve this quality report!

sourcery-ai · 2022-03-21T12:39:49Z

downloads.py

-    if dicovery_json == None:
+    if dicovery_json is None:


Lines 543-543 refactored with the following changes:

Use x is None rather than x == None (none-compare)

sourcery-ai · 2022-03-21T12:39:49Z

src/custom_driver.py

    'desired_capabilities' : desired_capabilities\n
    'options' : options\n
    '''
-    od_dict = {}


Function options_desired_capabilities_chrome refactored with the following changes:

Merge dictionary assignment with declaration (merge-dict-assign)

Inline variable that is immediately returned (inline-immediately-returned-variable)

Move assignment closer to its usage within a block (move-assign-in-block)

sourcery-ai · 2022-03-21T12:39:49Z

src/custom_driver.py

-    od_dict = {}
    caps = None
    opt = webdriver.FirefoxOptions()

-    if is_proxy:
-        pass
-
-    if is_getlog:
-        pass
-
-    od_dict['desired_capabilities'] = caps
-    od_dict['options'] = opt
-
-    return od_dict
+    return {'desired_capabilities': caps, 'options': opt}


Function options_desired_capabilities_firefox refactored with the following changes:

Merge dictionary assignment with declaration (merge-dict-assign)

Inline variable that is immediately returned (inline-immediately-returned-variable)

Move assignment closer to its usage within a block (move-assign-in-block)

Remove redundant conditional (remove-redundant-if)

sourcery-ai · 2022-03-21T12:39:49Z

src/custom_driver.py

    'desired_capabilities' : desired_capabilities\n
    'options' : options\n
    '''
-    od_dict = {}


Function options_desired_capabilities_edge refactored with the following changes:

Merge dictionary assignment with declaration (merge-dict-assign)

Inline variable that is immediately returned (inline-immediately-returned-variable)

Move assignment closer to its usage within a block (move-assign-in-block)

sourcery-ai · 2022-03-21T12:39:50Z

src/custom_driver.py

-        driver = webdriver.Chrome(executable_path=driver_path,
+        return webdriver.Chrome(executable_path=driver_path,
            options=options, desired_capabilities=desired_capabilities)
-        return driver


Function custom_chrome refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2022-03-21T12:39:50Z

src/custom_driver.py

-        driver = webdriver.Firefox(executable_path=driver_path,
-                                   options=options, desired_capabilities=desired_capabilities)
-        return driver
+        return webdriver.Firefox(
+            executable_path=driver_path,
+            options=options,
+            desired_capabilities=desired_capabilities,
+        )
+


Function custom_firefox refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2022-03-21T12:39:50Z

src/custom_driver.py

-        driver = webdriver.Edge(executable_path=driver_path, options=options, capabilities=desired_capabilities)
-        return driver
+        return webdriver.Edge(
+            executable_path=driver_path,
+            options=options,
+            capabilities=desired_capabilities,
+        )
+


Function custom_edge refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2022-03-21T12:39:50Z

src/custom_driver.py

-    driver = name_driver_func.get(name)(options, desired_capabilities)
-    return driver
+    return name_driver_func.get(name)(options, desired_capabilities)


Function get_custom_driver refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

'Refactored by Sourcery'

a061c39

sourcery-ai bot requested a review from DAcidSolution March 21, 2022 12:39

sourcery-ai bot commented Mar 21, 2022

View reviewed changes

		conf_path = os.path.dirname(__file__) + '/Config.ini'
		conf_path = f'{os.path.dirname(__file__)}/Config.ini'

Conversation

sourcery-ai bot commented Mar 21, 2022

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot commented Mar 21, 2022

Sourcery Code Quality Report

Legend and Explanation

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Mar 21, 2022