[Python-modules-commits] [python-sabyenc] 02/02: fix conflict
JCF Ploemen
jcfp-guest at moszumanska.debian.org
Tue Jan 2 10:47:40 UTC 2018
This is an automated email from the git hooks/post-receive script.
jcfp-guest pushed a commit to branch upstream
in repository python-sabyenc.
commit 38b49e30cbc80cef4c6cdc2c3e6071bbf247031c
Author: JCF Ploemen (jcfp) <linux at jcf.pm>
Date: Tue Jan 2 11:47:23 2018 +0100
fix conflict
---
setup.py | 122 +++---
src/sabyenc.c | 1245 ++++++++++++++++++++++++++++-----------------------------
src/sabyenc.h | 100 ++---
3 files changed, 733 insertions(+), 734 deletions(-)
diff --git a/setup.py b/setup.py
index 34cd777..f49e15d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,61 +1,61 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-##=============================================================================
- #
- # Copyright (C) 2003, 2011 Alessandro Duca <alessandro.duca at gmail.com>
- # Modified in 2016 by Safihre <safihre at sabnzbd.org> for use within SABnzbd
- #
- # This library is free software; you can redistribute it and/or
- # modify it under the terms of the GNU Lesser General Public
- # License as published by the Free Software Foundation; either
- # version 2.1 of the License, or (at your option) any later version.
- #
- # This library is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- # Lesser General Public License for more details.
- #
- # You should have received a copy of the GNU Lesser General Public
- # License along with this library; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- #=============================================================================
- #
-##=============================================================================
-
-from setuptools import setup, Extension
-
-setup(
- name = "sabyenc",
- version = "3.3.2",
- author = "Safihre",
- author_email = "safihre at sabnzbd.org",
- url = "https://github.com/sabnzbd/sabnzbd-yenc",
- license = "LGPLv3",
- package_dir = {'sabyenc': 'src'},
- ext_modules = [Extension("sabyenc", ["src/sabyenc.c"])],
- classifiers = [
- "Programming Language :: Python",
- "Programming Language :: Python :: 2.7",
- "Programming Language :: C",
- "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
- "Operating System :: Unix",
- "Development Status :: 5 - Production/Stable",
- "Environment :: Plugins",
- "Topic :: Software Development :: Libraries :: Python Modules",
- "Topic :: Communications :: Usenet News"
- ],
- description = "yEnc Module for Python modified for SABnzbd",
- long_description = """
-yEnc Decoding for Python
----------------------------------
-
-Mofied the original yenc module by Alessandro Duca for use within SABnzbd.
-
-The module was extended to do header parsing and full yEnc decoding from a Python
-list of chunks, the way in which data is retrieved from usenet.
-
-Currently CRC-checking of decoded data is disabled to allow for increased performance.
-It can only be re-enabled by locally altering 'sabyenc.h' and setting 'CRC_CHECK 1'.
-"""
-)
-
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+##=============================================================================
+ #
+ # Copyright (C) 2003, 2011 Alessandro Duca <alessandro.duca at gmail.com>
+ # Modified in 2016 by Safihre <safihre at sabnzbd.org> for use within SABnzbd
+ #
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU Lesser General Public
+ # License as published by the Free Software Foundation; either
+ # version 2.1 of the License, or (at your option) any later version.
+ #
+ # This library is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ # Lesser General Public License for more details.
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this library; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ #=============================================================================
+ #
+##=============================================================================
+
+from setuptools import setup, Extension
+
+setup(
+ name = "sabyenc",
+ version = "3.3.2",
+ author = "Safihre",
+ author_email = "safihre at sabnzbd.org",
+ url = "https://github.com/sabnzbd/sabnzbd-yenc",
+ license = "LGPLv3",
+ package_dir = {'sabyenc': 'src'},
+ ext_modules = [Extension("sabyenc", ["src/sabyenc.c"])],
+ classifiers = [
+ "Programming Language :: Python",
+ "Programming Language :: Python :: 2.7",
+ "Programming Language :: C",
+ "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
+ "Operating System :: Unix",
+ "Development Status :: 5 - Production/Stable",
+ "Environment :: Plugins",
+ "Topic :: Software Development :: Libraries :: Python Modules",
+ "Topic :: Communications :: Usenet News"
+ ],
+ description = "yEnc Module for Python modified for SABnzbd",
+ long_description = """
+yEnc Decoding for Python
+---------------------------------
+
+Mofied the original yenc module by Alessandro Duca for use within SABnzbd.
+
+The module was extended to do header parsing and full yEnc decoding from a Python
+list of chunks, the way in which data is retrieved from usenet.
+
+Currently CRC-checking of decoded data is disabled to allow for increased performance.
+It can only be re-enabled by locally altering 'sabyenc.h' and setting 'CRC_CHECK 1'.
+"""
+)
+
diff --git a/src/sabyenc.c b/src/sabyenc.c
index 6131118..a0e4f4d 100644
--- a/src/sabyenc.c
+++ b/src/sabyenc.c
@@ -1,623 +1,622 @@
- /*=============================================================================
- *
- * Copyright (C) 2003, 2011 Alessandro Duca <alessandro.duca at gmail.com>
- * Modified in 2016 by Safihre <safihre at sabnzbd.org> for use within SABnzbd
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *=============================================================================
- */
-
-#include "sabyenc.h"
-
-/* Typedefs */
-typedef struct {
- uInt crc;
- uLong bytes;
-} Crc32;
-
-/* Declarations */
-static uInt crc_tab[256] = {
- 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
- 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
- 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
- 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
- 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
- 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
- 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
- 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
- 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
- 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
- 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
- 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
- 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
- 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
- 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
- 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
- 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
- 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
- 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
- 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
- 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
- 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
- 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
- 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
- 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
- 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
- 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
- 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
- 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
- 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
- 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
- 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
- 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
- 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
- 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
- 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
- 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
- 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
- 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
- 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
- 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
- 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
- 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
-};
-
-/* Function declarations */
-static void crc_init(Crc32 *, uInt);
-static void crc_update(Crc32 *, uInt);
-void initsabyenc(void);
-static int decode_buffer_usenet(PyObject *, char *, int, char **, Crc32 *, uInt *, Bool *);
-static char * find_text_in_pylist(PyObject *, char *, char **, int *);
-int extract_filename_from_pylist(PyObject *, int *, char **, char **, char **);
-int extract_int_from_pylist(PyObject *, int *, char **, char **, int);
-
-/* Python API requirements */
-static char decode_usenet_chunks_doc[] = "decode_usenet_chunks(list_of_chunks, nr_bytes)";
-
-static PyMethodDef funcs[] = {
- {"decode_usenet_chunks", (PyCFunction) decode_usenet_chunks, METH_KEYWORDS | METH_VARARGS, decode_usenet_chunks_doc},
- {NULL, NULL, 0, NULL}
-};
-
-/* Function definitions */
-static void crc_init(Crc32 *crc, uInt value) {
- crc->crc = value;
- crc->bytes = 0UL;
-}
-
-static void crc_update(Crc32 *crc, uInt c) {
- crc->crc = crc_tab[(crc->crc^c)&0xff]^((crc->crc>>8)&0xffffff);
- crc->bytes++;
-}
-
-static int decode_buffer_usenet(PyObject *Py_input_list, char *output_buffer, int num_bytes_reserved,
- char **filename_out, Crc32 *crc, uInt *crc_yenc, Bool *crc_correct) {
- // For the list
- Py_ssize_t num_lines;
- int list_index = 0;
-
- // Search variables
- char *cur_char; // Pointer to search result
- char *start_loc; // Pointer to current char
- char *crc_holder = NULL;
-
- // Other vars
- char byte;
- int part_begin = 0;
- int part_size = 0;
- int decoded_bytes = 0;
- int safe_nr_bytes = 0;
- Bool escape_char = 0;
- int double_point_escape = 0;
-
- /*
- ANALYZE HEADER
- Always in the same format, e.g.:
-
- =ybegin part=41 line=128 size=49152000 name=90E2Sdvsmds0801dvsmds90E.part06.rar
- =ypart begin=15360001 end=15744000
-
- But we only care about the filename and the size
- For single-part yEnc we need to get size from the first line, for
- multi-part we need to substract end-begin from second line
- */
-
- // Get number of lines
- num_lines = PyList_Size(Py_input_list);
-
- // Get first chunk
- cur_char = PyString_AsString(PyList_GetItem(Py_input_list, 0));
-
- // Start of header (which doesn't have to be part of first chunk)
- start_loc = find_text_in_pylist(Py_input_list, "=ybegin", &cur_char, &list_index);
-
- if(start_loc) {
- // First we find the size (for single-part files)
- start_loc = find_text_in_pylist(Py_input_list, "size=", &cur_char, &list_index);
- if(start_loc) {
- // Move over a bit
- part_size = extract_int_from_pylist(Py_input_list, &list_index, &start_loc, &cur_char, 0);
- }
-
- // Find name
- start_loc = find_text_in_pylist(Py_input_list, "name=", &cur_char, &list_index);
- if(start_loc) {
- extract_filename_from_pylist(Py_input_list, &list_index, &start_loc, &cur_char, filename_out);
- } else {
- // Don't go on without a name
- return 0;
- }
-
- // Is there a multi-part indicator?
- start_loc = find_text_in_pylist(Py_input_list, "=ypart", &cur_char, &list_index);
- if(start_loc) {
- // Reset size, so we for sure don't use the previously found "size=" value
- part_size = 0;
-
- // Find part-begin
- start_loc = find_text_in_pylist(Py_input_list, "begin=", &cur_char, &list_index);
- if(start_loc) {
- // Get begin
- part_begin = extract_int_from_pylist(Py_input_list, &list_index, &start_loc, &cur_char, 0);
-
- // Find part-end
- start_loc = find_text_in_pylist(Py_input_list, "end=", &cur_char, &list_index);
- if(start_loc) {
- // Move over a bit
- part_size = extract_int_from_pylist(Py_input_list, &list_index, &start_loc, &cur_char, 0) - part_begin + 1;
- }
- }
-
- // We want to make sure it's a valid value
- if(part_size <= 0 || part_size > num_bytes_reserved) {
- // Set safe value
- part_size = (int)(num_bytes_reserved*0.75);
- }
-
- // Skip over everything untill end of line, where the content starts
- for( ; *cur_char != LF && *cur_char != CR && *cur_char != ZERO; cur_char++);
- }
-
- // How many bytes can be checked safely?
- safe_nr_bytes = part_size ? part_size - 50 : 0;
-
- /*
- During the loop we need to take care of special cases.
- The escape "=" and whatever it escapes might be on the
- next Python-list-item. Also the sequence "\n.." should
- onlyconvert one dot, but this sequence might also be
- split across list items.
- */
- while(1) {
- // Get current char and increment pointer
- cur_char++;
-
- // End of the line of list-item
- if(*cur_char == ZERO) {
- // Are we outside the list?
- list_index++;
- if(list_index == num_lines) {
- break;
- }
-
- // Get reference to the new line
- cur_char = PyString_AsString(PyList_GetItem(Py_input_list, list_index));
- }
-
- // Special charaters
- if(escape_char) {
- *output_buffer++ = (*cur_char - 106);
- escape_char = 0;
- double_point_escape = 0;
- } else if(*cur_char == ESC) {
- // strncmp is expensive, only perform near the end
- if(decoded_bytes > safe_nr_bytes) {
- /*
- Looking for the end, format:
- =yend size=384000 part=41 pcrc32=084e170f
- If a = is followed by an end-of-line, it's very
- likely that the yend part is on the next line
- and thus we would miss it
- */
- if(*(cur_char+1) == ZERO && list_index+1 < num_lines) {
- // Quick and dirty check if it's in next line
- crc_holder = PyString_AsString(PyList_GetItem(Py_input_list, list_index+1));
- // If that's not the case, we don't want to mess with the regular flow!!
- if(!strncmp(crc_holder, "yend", 4)) {
- cur_char = crc_holder;
- }
- }
-
- // Find it!
- if (!strncmp(cur_char, "=y", 2) || !strncmp(cur_char, "yend", 4)) {
-#if CRC_CHECK
- // Find CRC
- start_loc = find_text_in_pylist(Py_input_list, "crc32=", &cur_char, &list_index);
-
- // Process CRC
- if(start_loc) {
- *crc_yenc = extract_int_from_pylist(Py_input_list, &list_index, &start_loc, &cur_char, 1);
-
- // Change format to CRC-style (don't ask me why..)
- *crc_yenc = -1*(*crc_yenc)-1;
-
- // Check if CRC is correct
- if(crc->crc == *crc_yenc) {
- *crc_correct = 1;
- }
- }
-#else
- // Do a simple check based on size, faster than CRC
- if(part_size != decoded_bytes) {
- *crc_correct = 0;
- } else {
- *crc_correct = 1;
- }
-#endif
- break;
- }
- }
-
- // Becaus the escape might be at the end of the chunk
- // we need to do it in the next loop
- escape_char = 1;
- continue;
- } else if(*cur_char == CR) {
- continue;
- } else if(*cur_char == LF) {
- double_point_escape = 1;
- continue;
-
- /*
- "The NNTP-protocol requires to double a dot
- in the first colum when a line is sent"
-
- For some magical reason clang gets 2x slower
- overall when using the second approach.
- It does make things 15% faster for gcc and msvc
- So we take this convoluted approach to be safe.
- */
-#ifdef __clang__
- } else if(double_point_escape == 2 && *cur_char == DOT) {
- //
- // We found "\n.."! Ignore that second dot.
- double_point_escape = 0;
- continue;
- } else if(*cur_char == DOT) {
- // Special case for "\n.." that can be split between list items
- if(double_point_escape == 1) {
- double_point_escape = 2;
- }
-#else
- } else if(*cur_char == DOT) {
- // "The NNTP-protocol requires to double a dot in the first colum when a line is sent"
- // We found "\n.."! Ignore that second dot.
- if(double_point_escape == 2) {
- double_point_escape = 0;
- continue;
- }
- // Special case for "\n.." that can be split between list items
- if(double_point_escape == 1) {
- double_point_escape = 2;
- }
-#endif
- // We do include this dot
- *output_buffer++ = (*cur_char - 42);
- } else {
- *output_buffer++ = (*cur_char - 42);
- // Reset exception
- double_point_escape = 0;
- }
-
- // Increase byte counter for saftey check
- decoded_bytes++;
-
-#if CRC_CHECK
- // Check CRC value
- crc_update(crc, *(output_buffer-1));
-#endif
-
- // Saftey check
- if(decoded_bytes == num_bytes_reserved) {
- break;
- }
- }
- }
- return decoded_bytes;
-}
-
-
-/*
- We need a special function to find the keywords
- because they can be split over multiple chunks.
-*/
-static char * find_text_in_pylist(PyObject *Py_input_list, char *search_term, char **cur_char, int *cur_index) {
- // String holders
- char *next_string = NULL;
- char *start_loc = NULL;
- char *search_placeholder;
- // Size holders
- size_t cur_len;
- int start_index;
- int init_index = *cur_index;
- Py_ssize_t max_extra_lines = PyList_Size(Py_input_list) - 1;
-
- // First we try to do a fast location
- start_loc = strstr(*cur_char, search_term);
-
- // We didn't find it..
- if(!start_loc) {
- // We do maximum of 3 times extra lines, otherwise to slow
- max_extra_lines = (*cur_index+3 >= max_extra_lines) ? max_extra_lines : *cur_index+3;
-
- // Start by adding the current string to the placeholder
- cur_len = strlen(*cur_char)+1;
- search_placeholder = (char *) calloc(cur_len, sizeof(char *));
- strcpy(search_placeholder, *cur_char);
-
- // Add the next item and try again
- while(!start_loc && *cur_index < max_extra_lines) {
- // Need to get the next one
- *cur_index = *cur_index+1;
- next_string = PyString_AsString(PyList_GetItem(Py_input_list, *cur_index));
-
- // Reserve the next bit
- cur_len = cur_len + strlen(next_string);
- search_placeholder = (char *) realloc(search_placeholder, cur_len);
- strcat(search_placeholder, next_string);
-
- // Try to find it again
- start_loc = strstr(search_placeholder, search_term);
- }
-
- /*
- Problem: If we return start_loc now, we will have a memory leak
- because search_placeholder is never free'd. So we need to get
- the correct location in the current string from the list.
- */
- if(start_loc) {
- // How much in the new string are we?
- start_index = (int)(start_loc - search_placeholder) - (int)(strlen(search_placeholder) - strlen(next_string));
- // Just make sure it's valid
- if(start_index < 0 || start_index > (int)strlen(next_string)) {
- start_loc = NULL;
- }
- // Point to the location in the item from the list
- start_loc = next_string + start_index;
- } else {
- // Decrease the index to where we begun
- *cur_index = init_index;
- }
-
- // Cleanup
- free(search_placeholder);
- }
-
- // Did we find it now?
- if(start_loc) {
- start_loc += strlen(search_term);
- *cur_char = start_loc;
- }
-
- // Found it directly
- return start_loc;
-}
-
-
-/*
- Integer values like "begin=1234" or "pcrc=ABCDE" can also
- be split over multiple lines. And thus we need to really
- check that we did not reach the end of a line every time.
-*/
-int extract_int_from_pylist(PyObject *Py_input_list, int *cur_index, char **start_loc, char **cur_char, int crc) {
- char *enc_loc;
- char *item_holder;
- char *combi_holder;
- int part_value = 0;
- Py_ssize_t max_lines = PyList_Size(Py_input_list);
-
- // Crc calculation?
- if(crc) {
- part_value = strtoul(*start_loc, &enc_loc, 16);
- } else {
- part_value = strtol(*start_loc, &enc_loc, 0);
- }
-
- // Did we reach the end of a line?
- if(*enc_loc == ZERO) {
- // Do we even have another item?
- if(*cur_index+1 >= max_lines) return part_value;
-
- // We need to fix things by combining the 2 lines
- combi_holder = (char *) calloc(strlen(*start_loc)+1, sizeof(char *));
- strcpy(combi_holder, *start_loc);
- *cur_index = *cur_index+1;
- item_holder = PyString_AsString(PyList_GetItem(Py_input_list, *cur_index));
- combi_holder = (char *) realloc(combi_holder, strlen(*start_loc)+strlen(item_holder)+1);
- strcat(combi_holder, item_holder);
-
- // Now we do it again
- if(crc) {
- part_value = strtoul(combi_holder, &enc_loc, 16);
- } else {
- part_value = strtol(combi_holder, &enc_loc, 0);
- }
-
- // Free the space
- free(combi_holder);
- // Set the current position
- *cur_char = item_holder;
- } else {
- // Move pointer
- *cur_char = enc_loc;
- }
-
- return part_value;
-}
-
-
-/*
- Filename can also be split over multiple lines
- and thus needs saftey checks!
-*/
-int extract_filename_from_pylist(PyObject *Py_input_list, int *cur_index, char **start_loc, char **cur_char, char **filename_ptr) {
- // Temporary holders
- char *end_loc;
- Py_ssize_t max_lines = PyList_Size(Py_input_list);
-
- // Start at current setting
- end_loc = *start_loc;
- while(1) {
- // Did we reach end of the line but not newline?
- if(*(end_loc+1) == CR || *(end_loc+1) == LF || *(end_loc+1) == ZERO) {
- // Did we allocate yet?
- if(!*filename_ptr) {
- // Reserve space (plus current char and terminator)
- *filename_ptr = (char *)calloc(end_loc - *start_loc + 2, sizeof(char));
- // Allocation check
- if(!filename_ptr) return 0;
- // Copy the text, including the current char
- strncpy(*filename_ptr, *start_loc, end_loc - *start_loc + 1);
- // Add termininator
- (*filename_ptr)[strlen(*filename_ptr)] = ZERO;
- // Was this the end?
- if(*(end_loc+1) == CR || *(end_loc+1) == LF) {
- // Move the pointer and return
- *cur_char = end_loc+1;
- return 1;
- } else {
- // Do we even have another item?
- if(*cur_index+1 >= max_lines) return 0;
- // Need to get the next one
- *cur_index = *cur_index+1;
- *start_loc = end_loc = PyString_AsString(PyList_GetItem(Py_input_list, *cur_index));
- }
- } else {
- // Expand the result to hold this new bit (plus current char and terminator)
- *filename_ptr = (char *)realloc(*filename_ptr, strlen(*filename_ptr) + end_loc - *start_loc + 2);
- // Allocation check
- if(!filename_ptr) return 0;
- // Copy result at the end
- strncat(*filename_ptr, *start_loc, end_loc - *start_loc + 1);
- // Add termininator
- (*filename_ptr)[strlen(*filename_ptr)] = ZERO;
- // Move the pointer and return
- *cur_char = end_loc+1;
- return 1;
- }
- } else {
- // Move 1 char forward, not if we just fetched new chunk
- end_loc++;
- }
- }
-}
-
-
-PyObject* decode_usenet_chunks(PyObject* self, PyObject* args, PyObject* kwds) {
- // The input/output PyObjects
- PyObject *Py_input_list;
- PyObject *Py_output_buffer;
- PyObject *Py_output_filename;
- PyObject *retval = NULL;
-
- // CRC
- Crc32 crc;
- uInt crc_yenc = 0;
- Bool crc_correct = 0;
- uInt crc_value = 0xffffffffll;
-
- // Buffers
- char *output_buffer = NULL;
- char *filename_out = NULL;
- uInt output_len = 0;
- int num_bytes_reserved;
- int lp_max;
- int lp;
-
- // Parse input
- if (!PyArg_ParseTuple(args, "Oi:decode_usenet_chunks", &Py_input_list, &num_bytes_reserved)) {
- return NULL;
- }
-
- // Verify it's a list
- if(!PyList_Check(Py_input_list)) {
- PyErr_SetString(PyExc_TypeError, "Expected list");
- return NULL;
- }
-
- // If we did not get a size, we need to calculate it (slower, but safer)
- if(num_bytes_reserved <= 0) {
- lp_max = (int)PyList_Size(Py_input_list);
- for(lp = 0; lp < lp_max; lp++) {
- num_bytes_reserved += (int)PyString_Size(PyList_GetItem(Py_input_list, lp));
- }
- }
-
- // Reserve the output buffer, 10% more just to be safe
- num_bytes_reserved = (int)(num_bytes_reserved*1.10);
- output_buffer = (char *)malloc(num_bytes_reserved);
- if(!output_buffer) {
- retval = PyErr_NoMemory();
- return NULL;
- }
-
- // Byeeeeeeee GIL!
- Py_BEGIN_ALLOW_THREADS;
-
- // Initial CRC
- crc_init(&crc, crc_value);
-
- // Calculate
- output_len = decode_buffer_usenet(Py_input_list, output_buffer, num_bytes_reserved, &filename_out, &crc, &crc_yenc, &crc_correct);
-
- // Aaah there you are again GIL..
- Py_END_ALLOW_THREADS;
-
- // Catch if there's nothing
- if(!output_len || !filename_out) {
- PyErr_SetString(PyExc_ValueError, "Could not get filename");
- // Saftey free's
- if(output_buffer) free(output_buffer);
- if(filename_out) free(filename_out);
- return NULL;
- }
-
- // Prepare output
- Py_output_buffer = PyString_FromStringAndSize((char *)output_buffer, output_len);
-
- // Use special Python function to go from Latin-1 to Unicode
- Py_output_filename = PyUnicode_DecodeLatin1((char *)filename_out, strlen((char *)filename_out), NULL);
-
- // Build output
- retval = Py_BuildValue("(S,S,L,L,O)", Py_output_buffer, Py_output_filename, (long long)crc.crc, (long long)crc_yenc, crc_correct ? Py_True: Py_False);
-
- // Make sure we free all the buffers!
- Py_XDECREF(Py_output_buffer);
- Py_XDECREF(Py_output_filename);
- free(output_buffer);
- free(filename_out);
- return retval;
-}
-
-
-void initsabyenc(void) {
- // Add module
- PyObject *module;
- module = Py_InitModule3("sabyenc", funcs, "Raw yenc operations");
-
- // Add version
- PyModule_AddStringConstant(module, "__version__", SABYENC_VERSION);
-}
-
+ /*=============================================================================
+ *
+ * Copyright (C) 2003, 2011 Alessandro Duca <alessandro.duca at gmail.com>
+ * Modified in 2016 by Safihre <safihre at sabnzbd.org> for use within SABnzbd
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *=============================================================================
+ */
+
+#include "sabyenc.h"
+
+/* Typedefs */
+typedef struct {
+ uInt crc;
+ uLong bytes;
+} Crc32;
+
+/* Declarations */
+static uInt crc_tab[256] = {
+ 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+ 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+ 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+ 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+ 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+ 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+ 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+ 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+ 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+ 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+ 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+ 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+ 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+ 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+ 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+ 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+ 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+ 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+ 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+ 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+ 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+ 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+ 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+ 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+ 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+ 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+ 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+ 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+ 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
+ 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+ 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+ 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+ 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+ 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+ 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+ 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+ 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
+ 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+ 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+ 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+ 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+ 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+ 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+};
+
+/* Function declarations */
+static void crc_init(Crc32 *, uInt);
+static void crc_update(Crc32 *, uInt);
+void initsabyenc(void);
+static int decode_buffer_usenet(PyObject *, char *, int, char **, Crc32 *, uInt *, Bool *);
+static char * find_text_in_pylist(PyObject *, char *, char **, int *);
+int extract_filename_from_pylist(PyObject *, int *, char **, char **, char **);
+int extract_int_from_pylist(PyObject *, int *, char **, char **, int);
+
+/* Python API requirements */
+static char decode_usenet_chunks_doc[] = "decode_usenet_chunks(list_of_chunks, nr_bytes)";
+
+static PyMethodDef funcs[] = {
+ {"decode_usenet_chunks", (PyCFunction) decode_usenet_chunks, METH_KEYWORDS | METH_VARARGS, decode_usenet_chunks_doc},
+ {NULL, NULL, 0, NULL}
+};
+
+/* Function definitions */
+static void crc_init(Crc32 *crc, uInt value) {
+ crc->crc = value;
+ crc->bytes = 0UL;
+}
+
+static void crc_update(Crc32 *crc, uInt c) {
+ crc->crc = crc_tab[(crc->crc^c)&0xff]^((crc->crc>>8)&0xffffff);
+ crc->bytes++;
+}
+
+static int decode_buffer_usenet(PyObject *Py_input_list, char *output_buffer, int num_bytes_reserved,
+ char **filename_out, Crc32 *crc, uInt *crc_yenc, Bool *crc_correct) {
+ // For the list
+ Py_ssize_t num_lines;
+ int list_index = 0;
+
+ // Search variables
+ char *cur_char; // Pointer to search result
+ char *start_loc; // Pointer to current char
+ char *crc_holder = NULL;
+
+ // Other vars
+ int part_begin = 0;
+ int part_size = 0;
+ int decoded_bytes = 0;
+ int safe_nr_bytes = 0;
+ Bool escape_char = 0;
+ int double_point_escape = 0;
+
+ /*
+ ANALYZE HEADER
+ Always in the same format, e.g.:
+
+ =ybegin part=41 line=128 size=49152000 name=90E2Sdvsmds0801dvsmds90E.part06.rar
+ =ypart begin=15360001 end=15744000
+
+ But we only care about the filename and the size
+ For single-part yEnc we need to get size from the first line, for
+ multi-part we need to substract end-begin from second line
+ */
+
+ // Get number of lines
+ num_lines = PyList_Size(Py_input_list);
+
+ // Get first chunk
+ cur_char = PyString_AsString(PyList_GetItem(Py_input_list, 0));
+
+ // Start of header (which doesn't have to be part of first chunk)
+ start_loc = find_text_in_pylist(Py_input_list, "=ybegin", &cur_char, &list_index);
+
+ if(start_loc) {
+ // First we find the size (for single-part files)
+ start_loc = find_text_in_pylist(Py_input_list, "size=", &cur_char, &list_index);
+ if(start_loc) {
+ // Move over a bit
+ part_size = extract_int_from_pylist(Py_input_list, &list_index, &start_loc, &cur_char, 0);
+ }
+
+ // Find name
+ start_loc = find_text_in_pylist(Py_input_list, "name=", &cur_char, &list_index);
+ if(start_loc) {
+ extract_filename_from_pylist(Py_input_list, &list_index, &start_loc, &cur_char, filename_out);
+ } else {
+ // Don't go on without a name
+ return 0;
+ }
+
+ // Is there a multi-part indicator?
+ start_loc = find_text_in_pylist(Py_input_list, "=ypart", &cur_char, &list_index);
+ if(start_loc) {
+ // Reset size, so we for sure don't use the previously found "size=" value
+ part_size = 0;
+
+ // Find part-begin
+ start_loc = find_text_in_pylist(Py_input_list, "begin=", &cur_char, &list_index);
+ if(start_loc) {
+ // Get begin
+ part_begin = extract_int_from_pylist(Py_input_list, &list_index, &start_loc, &cur_char, 0);
+
+ // Find part-end
+ start_loc = find_text_in_pylist(Py_input_list, "end=", &cur_char, &list_index);
+ if(start_loc) {
+ // Move over a bit
+ part_size = extract_int_from_pylist(Py_input_list, &list_index, &start_loc, &cur_char, 0) - part_begin + 1;
+ }
+ }
+
+ // We want to make sure it's a valid value
+ if(part_size <= 0 || part_size > num_bytes_reserved) {
+ // Set safe value
+ part_size = (int)(num_bytes_reserved*0.75);
+ }
+
+ // Skip over everything untill end of line, where the content starts
+ for( ; *cur_char != LF && *cur_char != CR && *cur_char != ZERO; cur_char++);
+ }
+
+ // How many bytes can be checked safely?
+ safe_nr_bytes = part_size ? part_size - 50 : 0;
+
+ /*
+ During the loop we need to take care of special cases.
+ The escape "=" and whatever it escapes might be on the
+ next Python-list-item. Also the sequence "\n.." should
+ onlyconvert one dot, but this sequence might also be
+ split across list items.
+ */
+ while(1) {
+ // Get current char and increment pointer
+ cur_char++;
+
+ // End of the line of list-item
+ if(*cur_char == ZERO) {
+ // Are we outside the list?
+ list_index++;
+ if(list_index == num_lines) {
+ break;
+ }
+
+ // Get reference to the new line
+ cur_char = PyString_AsString(PyList_GetItem(Py_input_list, list_index));
+ }
+
+ // Special charaters
+ if(escape_char) {
+ *output_buffer++ = (*cur_char - 106);
+ escape_char = 0;
+ double_point_escape = 0;
+ } else if(*cur_char == ESC) {
+ // strncmp is expensive, only perform near the end
+ if(decoded_bytes > safe_nr_bytes) {
+ /*
+ Looking for the end, format:
+ =yend size=384000 part=41 pcrc32=084e170f
+ If a = is followed by an end-of-line, it's very
+ likely that the yend part is on the next line
+ and thus we would miss it
+ */
+ if(*(cur_char+1) == ZERO && list_index+1 < num_lines) {
+ // Quick and dirty check if it's in next line
... 493 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-sabyenc.git
More information about the Python-modules-commits
mailing list