d4rktg 1.1.7__tar.gz → 1.1.9__tar.gz

{d4rktg-1.1.7/d4rktg.egg-info → d4rktg-1.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: d4rktg
-Version: 1.1.7
+Version: 1.1.9
 Summary: A module for create with easy and fast
 Author: D4rkShell
 Author-email: premiumqtrst@gmail.com

d4rktg-1.1.9/VERSION.txt

@@ -0,0 +1 @@
+1.1.9

{d4rktg-1.1.7 → d4rktg-1.1.9}/d4rk/Utils/_decorators.py

@@ -72,7 +72,7 @@ def round_robin():
 
             if isinstance(message, ChatMemberUpdated):
                 chat_id = message.chat.id
-                msg_id = message.from_user.id
+                msg_id = message.date
             else:
                 chat_id = message.chat.id
                 msg_id = message.id

{d4rktg-1.1.7 → d4rktg-1.1.9}/d4rk/Utils/_movie_parser.py

@@ -17,13 +17,27 @@ class Movie:
     split: bool = False
     part: Optional[int] = None
 
+@dataclass
+class TV:
+    title: str
+    normalized_title: str
+    season: Optional[int]
+    episode: Optional[int]
+    resolution: Optional[str]
+    quality: Optional[str]
+    codec: Optional[str]
+    extra: List[str] = field(default_factory=list)
+    split: bool = False
+    part: Optional[int] = None
+
 class MovieParser:
     def __parse_file_name(self, file_name: str):
         file_name = re.sub(r'@[\w_]+', '', file_name.lower()).strip()
         file_name = file_name.replace('_', ' ')
         self.file_name = file_name
         self.extension = self.file_name.split('.')[-1]
-        self.movie = PTN.parse(self.file_name)
+        self.data = PTN.parse(self.file_name)
+        self.tv, self.movie = (self.data, None) if "season" in self.data else (None, self.data)
         self.tags = []
 
     def fallback_title(self, file_name):
@@ -45,18 +59,23 @@ class MovieParser:
         roman_pattern = r'\b(i{1,3}|iv|v|vi{0,3}|ix|x{1,3}|xl|l|li{0,3}|lx|xc|c|ci{0,3}|cd|d|dc|cm|m|m{1,3})\b'
         return re.sub(roman_pattern, lambda m: m.group(0).upper(), text, flags=re.IGNORECASE)
 
-    def extract(self, file_name: str) -> Movie:
+
+    def _handle_movie(self):
+        pass
+
+    def extract(self, file_name: str) -> Union[Movie, TV]:
         self.__parse_file_name(file_name)
-        title = self.movie.get('title', '').replace('.', ' ').strip()
+        
+        title = str(self.data.get('title', '')).replace('.', ' ').strip()
         if not title:title = self.fallback_title(self.file_name)
         else:title = title.replace('.', ' ').strip()
 
-        year = self.movie.get('year') or self.fallback_year(self.file_name)
+        year = self.data.get('year',None) or self.fallback_year(self.file_name)
         if year and str(year) in title:title = title.replace(str(year), '').strip()
 
-        resolution = self.movie.get('resolution')
-        quality = self.movie.get('quality')
-        codec = self.movie.get('codec')
+        resolution = self.data.get('resolution')
+        quality = self.data.get('quality')
+        codec = self.data.get('codec')
         if codec:codec = codec.replace('H', 'x').replace('.', '')
 
         extra = []
@@ -167,18 +186,30 @@ class MovieParser:
         match = re.search(r'\.(\d{3})$', file_name)
         split = match is not None
         part = int(match.group(1)) if split else None
-
-        return Movie(
-            title=self._fix_roman_numerals(title.title()),
-            normalized_title=re.sub(r'[^a-z0-9&\+]+', ' ', title.lower()).strip(),
-            year=year,
-            resolution=resolution,
-            quality=quality,
-            codec=codec,
-            extra=extra,
-            split=split,
-            part=part
-        )
-
-parser = MovieParser()
-
+        if self.movie:
+            return Movie(
+                title=self._fix_roman_numerals(title.title()),
+                normalized_title=re.sub(r'[^a-z0-9&\+]+', ' ', title.lower()).strip(),
+                year=year,
+                resolution=resolution,
+                quality=quality,
+                codec=codec,
+                extra=extra,
+                split=split,
+                part=part
+            )
+        else:
+            return TV(
+                title=self._fix_roman_numerals(title.title()),
+                normalized_title=re.sub(r'[^a-z0-9&\+]+', ' ', title.lower()).strip(),
+                season=self.data.get('season'),
+                episode=self.data.get('episode'),
+                resolution=resolution,
+                quality=quality,
+                codec=codec,
+                extra=extra,
+                split=split,
+                part=part
+            )
+
+parser = MovieParser()

{d4rktg-1.1.7 → d4rktg-1.1.9/d4rktg.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: d4rktg
-Version: 1.1.7
+Version: 1.1.9
 Summary: A module for create with easy and fast
 Author: D4rkShell
 Author-email: premiumqtrst@gmail.com

d4rktg-1.1.7/VERSION.txt

@@ -1 +0,0 @@
-1.1.7