ninjajiraiya
/
devine
forked from DRMTalks/devine
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #27 from varyg1001/master 

Fix cookie import across drives in `auth add`
This commit is contained in:
rlaphoenix 2023-02-13 18:36:07 +00:00 committed by GitHub
parent b25e6c5ce5 f06ca768c3
commit 0c02b1513a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -291,6 +291,7 @@ Please refrain from spam or asking for questions that infringe upon a Service's
<a href="https://github.com/nyuszika7h"><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/482367?v=4&h=25&w=25&fit=cover&mask=circle&maxage=7d" alt=""/></a> <a href="https://github.com/nyuszika7h"><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/482367?v=4&h=25&w=25&fit=cover&mask=circle&maxage=7d" alt=""/></a>
<a href="https://github.com/bccornfo"><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/98013276?v=4&h=25&w=25&fit=cover&mask=circle&maxage=7d" alt=""/></a> <a href="https://github.com/bccornfo"><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/98013276?v=4&h=25&w=25&fit=cover&mask=circle&maxage=7d" alt=""/></a>
<a href="https://github.com/Arias800"><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/24809312?v=4&h=25&w=25&fit=cover&mask=circle&maxage=7d" alt=""/></a> <a href="https://github.com/Arias800"><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/24809312?v=4&h=25&w=25&fit=cover&mask=circle&maxage=7d" alt=""/></a>
<a href="https://github.com/varyg1001"><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/88599103?v=4&h=25&w=25&fit=cover&mask=circle&maxage=7d" alt=""/></a>
## License ## License

3
devine/commands/auth.py
View File

@ -1,5 +1,6 @@
import logging import logging
import sys import sys
import shutil
import tkinter.filedialog import tkinter.filedialog
from collections import defaultdict from collections import defaultdict
from pathlib import Path from pathlib import Path
@ -243,7 +244,7 @@ def add(ctx: click.Context, profile: str, service: str, cookie: Optional[str] =
if final_path.exists(): if final_path.exists():
log.error(f"A Cookie file for the Profile {profile} on {service} already exists.") log.error(f"A Cookie file for the Profile {profile} on {service} already exists.")
sys.exit(1) sys.exit(1)
cookie = cookie.rename(final_path) shutil.move(cookie, final_path)
log.info(f"Moved Cookie file to: {cookie}") log.info(f"Moved Cookie file to: {cookie}")
if credential: if credential:

3
devine/commands/dl.py
View File

@ -5,6 +5,7 @@ import logging
import math import math
import random import random
import re import re
import shutil
import sys import sys
import time import time
import traceback import traceback
@ -674,7 +675,7 @@ class dl:
final_dir.mkdir(parents=True, exist_ok=True) final_dir.mkdir(parents=True, exist_ok=True)
final_path = final_dir / f"{final_filename}{muxed_path.suffix}" final_path = final_dir / f"{final_filename}{muxed_path.suffix}"
muxed_path.rename(final_path) shutil.move(muxed_path, final_path)
self.log.info(f" + Moved to {final_path}") self.log.info(f" + Moved to {final_path}")
@staticmethod @staticmethod

6
devine/core/tracks/track.py
View File

@ -1,6 +1,7 @@
import asyncio import asyncio
import logging import logging
import re import re
import shutil
import subprocess import subprocess
from enum import Enum from enum import Enum
from pathlib import Path from pathlib import Path
@ -312,7 +313,8 @@ class Track:
if not self.path: if not self.path:
return False return False
target = Path(target) target = Path(target)
ok = self.path.rename(target).resolve() == target.resolve()
ok = Path(shutil.move(self.path, target)).resolve() == target.resolve()
if ok: if ok:
self.path = target self.path = target
return ok return ok
@ -326,7 +328,7 @@ class Track:
if not target.exists() or not self.path: if not target.exists() or not self.path:
return False return False
self.path.unlink() self.path.unlink()
ok = target.rename(self.path) == self.path ok = Path(shutil.move(target, self.path)).resolve() == self.path.resolve()
if not ok: if not ok:
return False return False
return self.move(target) return self.move(target)